lkml.org 
[lkml]   [2020]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 18/51] mm: Support THPs in zero_user_segments
    Date
    From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

    We can only kmap() one subpage of a THP at a time, so loop over all
    relevant subpages, skipping ones which don't need to be zeroed. This is
    too large to inline when THPs are enabled and we actually need highmem,
    so put it in highmem.c.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    ---
    include/linux/highmem.h | 11 ++++++--
    mm/highmem.c | 62 +++++++++++++++++++++++++++++++++++++++--
    2 files changed, 68 insertions(+), 5 deletions(-)

    diff --git a/include/linux/highmem.h b/include/linux/highmem.h
    index d6e82e3de027..f05589513103 100644
    --- a/include/linux/highmem.h
    +++ b/include/linux/highmem.h
    @@ -284,13 +284,17 @@ static inline void clear_highpage(struct page *page)
    kunmap_atomic(kaddr);
    }

    +#if defined(CONFIG_HIGHMEM) && defined(CONFIG_TRANSPARENT_HUGEPAGE)
    +void zero_user_segments(struct page *page, unsigned start1, unsigned end1,
    + unsigned start2, unsigned end2);
    +#else /* !HIGHMEM || !TRANSPARENT_HUGEPAGE */
    static inline void zero_user_segments(struct page *page,
    - unsigned start1, unsigned end1,
    - unsigned start2, unsigned end2)
    + unsigned start1, unsigned end1,
    + unsigned start2, unsigned end2)
    {
    void *kaddr = kmap_atomic(page);

    - BUG_ON(end1 > PAGE_SIZE || end2 > PAGE_SIZE);
    + BUG_ON(end1 > thp_size(page) || end2 > thp_size(page));

    if (end1 > start1)
    memset(kaddr + start1, 0, end1 - start1);
    @@ -301,6 +305,7 @@ static inline void zero_user_segments(struct page *page,
    kunmap_atomic(kaddr);
    flush_dcache_page(page);
    }
    +#endif /* !HIGHMEM || !TRANSPARENT_HUGEPAGE */

    static inline void zero_user_segment(struct page *page,
    unsigned start, unsigned end)
    diff --git a/mm/highmem.c b/mm/highmem.c
    index 64d8dea47dd1..686cae2f1ba5 100644
    --- a/mm/highmem.c
    +++ b/mm/highmem.c
    @@ -367,9 +367,67 @@ void kunmap_high(struct page *page)
    if (need_wakeup)
    wake_up(pkmap_map_wait);
    }
    -
    EXPORT_SYMBOL(kunmap_high);
    -#endif
    +
    +#ifdef CONFIG_TRANSPARENT_HUGEPAGE
    +void zero_user_segments(struct page *page, unsigned start1, unsigned end1,
    + unsigned start2, unsigned end2)
    +{
    + unsigned int i;
    +
    + BUG_ON(end1 > thp_size(page) || end2 > thp_size(page));
    +
    + for (i = 0; i < thp_nr_pages(page); i++) {
    + void *kaddr;
    + unsigned this_end;
    +
    + if (end1 == 0 && start2 >= PAGE_SIZE) {
    + start2 -= PAGE_SIZE;
    + end2 -= PAGE_SIZE;
    + continue;
    + }
    +
    + if (start1 >= PAGE_SIZE) {
    + start1 -= PAGE_SIZE;
    + end1 -= PAGE_SIZE;
    + if (start2) {
    + start2 -= PAGE_SIZE;
    + end2 -= PAGE_SIZE;
    + }
    + continue;
    + }
    +
    + kaddr = kmap_atomic(page + i);
    +
    + this_end = min_t(unsigned, end1, PAGE_SIZE);
    + if (end1 > start1)
    + memset(kaddr + start1, 0, this_end - start1);
    + end1 -= this_end;
    + start1 = 0;
    +
    + if (start2 >= PAGE_SIZE) {
    + start2 -= PAGE_SIZE;
    + end2 -= PAGE_SIZE;
    + } else {
    + this_end = min_t(unsigned, end2, PAGE_SIZE);
    + if (end2 > start2)
    + memset(kaddr + start2, 0, this_end - start2);
    + end2 -= this_end;
    + start2 = 0;
    + }
    +
    + kunmap_atomic(kaddr);
    +
    + if (!end1 && !end2)
    + break;
    + }
    + flush_dcache_page(page);
    +
    + BUG_ON((start1 | start2 | end1 | end2) != 0);
    +}
    +EXPORT_SYMBOL(zero_user_segments);
    +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
    +#endif /* CONFIG_HIGHMEM */

    #if defined(HASHED_PAGE_VIRTUAL)

    --
    2.26.2
    \
     
     \ /
      Last update: 2020-06-10 22:17    [W:4.051 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site