From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + mm-hugetlb-make-hugetlb-migration-callback-cma-aware.patch added to -mm tree Date: Wed, 24 Jun 2020 15:06:15 -0700 Message-ID: <20200624220615.ZBo6l%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:51382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389279AbgFXWGS (ORCPT ); Wed, 24 Jun 2020 18:06:18 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org, vbabka@suse.cz, n-horiguchi@ah.jp.nec.com, mike.kravetz@oracle.com, mhocko@suse.com, mgorman@techsingularity.net, hch@infradead.org, guro@fb.com, iamjoonsoo.kim@lge.com The patch titled Subject: mm/hugetlb: make hugetlb migration callback CMA aware has been added to the -mm tree. Its filename is mm-hugetlb-make-hugetlb-migration-callback-cma-aware.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-hugetlb-make-hugetlb-migration-callback-cma-aware.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-hugetlb-make-hugetlb-migration-callback-cma-aware.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Joonsoo Kim Subject: mm/hugetlb: make hugetlb migration callback CMA aware new_non_cma_page() in gup.c which try to allocate migration target page requires to allocate the new page that is not on the CMA area. new_non_cma_page() implements it by removing __GFP_MOVABLE flag. This way works well for THP page or normal page but not for hugetlb page. hugetlb page allocation process consists of two steps. First is dequeing from the pool. Second is, if there is no available page on the queue, allocating from the page allocator. new_non_cma_page() can control allocation from the page allocator by specifying correct gfp flag. However, dequeing cannot be controlled until now, so, new_non_cma_page() skips dequeing completely. It is a suboptimal since new_non_cma_page() cannot utilize hugetlb pages on the queue so this patch tries to fix this situation. This patch makes the deque function on hugetlb CMA aware and skip CMA pages if newly added skip_cma argument is passed as true. Link: http://lkml.kernel.org/r/1592892828-1934-5-git-send-email-iamjoonsoo.kim@lge.com Acked-by: Mike Kravetz Signed-off-by: Joonsoo Kim Cc: Christoph Hellwig Cc: Michal Hocko Cc: Naoya Horiguchi Cc: Roman Gushchin Cc: Vlastimil Babka Cc: Mel Gorman Signed-off-by: Andrew Morton --- include/linux/hugetlb.h | 6 ++---- mm/gup.c | 3 ++- mm/hugetlb.c | 31 ++++++++++++++++++++++--------- mm/mempolicy.c | 2 +- mm/migrate.c | 2 +- 5 files changed, 28 insertions(+), 16 deletions(-) --- a/include/linux/hugetlb.h~mm-hugetlb-make-hugetlb-migration-callback-cma-aware +++ a/include/linux/hugetlb.h @@ -505,11 +505,9 @@ struct huge_bootmem_page { struct page *alloc_huge_page(struct vm_area_struct *vma, unsigned long addr, int avoid_reserve); struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask); + nodemask_t *nmask, gfp_t gfp_mask, bool skip_cma); struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, unsigned long address); -struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask, - int nid, nodemask_t *nmask); int huge_add_to_page_cache(struct page *page, struct address_space *mapping, pgoff_t idx); @@ -760,7 +758,7 @@ static inline struct page *alloc_huge_pa static inline struct page * alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask) + nodemask_t *nmask, gfp_t gfp_mask, bool skip_cma) { return NULL; } --- a/mm/gup.c~mm-hugetlb-make-hugetlb-migration-callback-cma-aware +++ a/mm/gup.c @@ -1630,11 +1630,12 @@ static struct page *new_non_cma_page(str #ifdef CONFIG_HUGETLB_PAGE if (PageHuge(page)) { struct hstate *h = page_hstate(page); + /* * We don't want to dequeue from the pool because pool pages will * mostly be from the CMA region. */ - return alloc_migrate_huge_page(h, gfp_mask, nid, NULL); + return alloc_huge_page_nodemask(h, nid, NULL, gfp_mask, true); } #endif if (PageTransHuge(page)) { --- a/mm/hugetlb.c~mm-hugetlb-make-hugetlb-migration-callback-cma-aware +++ a/mm/hugetlb.c @@ -1033,13 +1033,18 @@ static void enqueue_huge_page(struct hst h->free_huge_pages_node[nid]++; } -static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) +static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid, bool skip_cma) { struct page *page; - list_for_each_entry(page, &h->hugepage_freelists[nid], lru) + list_for_each_entry(page, &h->hugepage_freelists[nid], lru) { + if (skip_cma && is_migrate_cma_page(page)) + continue; + if (!PageHWPoison(page)) break; + } + /* * if 'non-isolated free hugepage' not found on the list, * the allocation fails. @@ -1054,7 +1059,7 @@ static struct page *dequeue_huge_page_no } static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask, int nid, - nodemask_t *nmask) + nodemask_t *nmask, bool skip_cma) { unsigned int cpuset_mems_cookie; struct zonelist *zonelist; @@ -1079,7 +1084,7 @@ retry_cpuset: continue; node = zone_to_nid(zone); - page = dequeue_huge_page_node_exact(h, node); + page = dequeue_huge_page_node_exact(h, node, skip_cma); if (page) return page; } @@ -1124,7 +1129,7 @@ static struct page *dequeue_huge_page_vm gfp_mask = htlb_alloc_mask(h); nid = huge_node(vma, address, gfp_mask, &mpol, &nodemask); - page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask); + page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask, false); if (page && !avoid_reserve && vma_has_reserves(vma, chg)) { SetPagePrivate(page); h->resv_huge_pages--; @@ -1937,7 +1942,7 @@ out_unlock: return page; } -struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask, +static struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask, int nid, nodemask_t *nmask) { struct page *page; @@ -1980,7 +1985,7 @@ struct page *alloc_buddy_huge_page_with_ /* page migration callback function */ struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask) + nodemask_t *nmask, gfp_t gfp_mask, bool skip_cma) { gfp_mask |= htlb_alloc_mask(h); @@ -1988,7 +1993,8 @@ struct page *alloc_huge_page_nodemask(st if (h->free_huge_pages - h->resv_huge_pages > 0) { struct page *page; - page = dequeue_huge_page_nodemask(h, gfp_mask, preferred_nid, nmask); + page = dequeue_huge_page_nodemask(h, gfp_mask, + preferred_nid, nmask, skip_cma); if (page) { spin_unlock(&hugetlb_lock); return page; @@ -1996,6 +2002,13 @@ struct page *alloc_huge_page_nodemask(st } spin_unlock(&hugetlb_lock); + /* + * To skip the memory on CMA area, we need to clear __GFP_MOVABLE. + * Clearing __GFP_MOVABLE at the top of this function would also skip + * the proper allocation candidates for dequeue so clearing it here. + */ + if (skip_cma) + gfp_mask &= ~__GFP_MOVABLE; return alloc_migrate_huge_page(h, gfp_mask, preferred_nid, nmask); } @@ -2011,7 +2024,7 @@ struct page *alloc_huge_page_vma(struct gfp_mask = htlb_alloc_mask(h); node = huge_node(vma, address, gfp_mask, &mpol, &nodemask); - page = alloc_huge_page_nodemask(h, node, nodemask, 0); + page = alloc_huge_page_nodemask(h, node, nodemask, 0, false); mpol_cond_put(mpol); return page; --- a/mm/mempolicy.c~mm-hugetlb-make-hugetlb-migration-callback-cma-aware +++ a/mm/mempolicy.c @@ -1071,7 +1071,7 @@ struct page *alloc_new_node_page(struct if (PageHuge(page)) { return alloc_huge_page_nodemask( page_hstate(compound_head(page)), node, - NULL, __GFP_THISNODE); + NULL, __GFP_THISNODE, false); } else if (PageTransHuge(page)) { struct page *thp; --- a/mm/migrate.c~mm-hugetlb-make-hugetlb-migration-callback-cma-aware +++ a/mm/migrate.c @@ -1523,7 +1523,7 @@ struct page *new_page_nodemask(struct pa if (PageHuge(page)) { return alloc_huge_page_nodemask( page_hstate(compound_head(page)), - preferred_nid, nodemask, 0); + preferred_nid, nodemask, 0, false); } if (PageTransHuge(page)) { _ Patches currently in -mm which might be from iamjoonsoo.kim@lge.com are mm-swap-fix-for-mm-workingset-age-nonresident-information-alongside-anonymous-pages.patch mm-memory-fix-io-cost-for-anonymous-page.patch mm-page_isolation-prefer-the-node-of-the-source-page.patch mm-migrate-move-migration-helper-from-h-to-c.patch mm-hugetlb-unify-migration-callbacks.patch mm-hugetlb-make-hugetlb-migration-callback-cma-aware.patch mm-migrate-make-a-standard-migration-target-allocation-function.patch mm-gup-use-a-standard-migration-target-allocation-callback.patch mm-mempolicy-use-a-standard-migration-target-allocation-callback.patch mm-page_alloc-remove-a-wrapper-for-alloc_migration_target.patch