The patch titled
Subject: mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many-fix
has been removed from the -mm tree. Its filename was
mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many-fix.patch
This patch was dropped because it was folded into mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many.patch
------------------------------------------------------
From: Ben Widawsky <ben.widawsky@xxxxxxxxx>
Subject: mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many-fix
add helpers to avoid ifdefs
Link: https://lore.kernel.org/r/20200630212517.308045-12-ben.widawsky@xxxxxxxxx
Link: https://lkml.kernel.org/r/1627970362-61305-4-git-send-email-feng.tang@xxxxxxxxx
Link: https://lkml.kernel.org/r/20210809024430.GA46432@xxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Ben Widawsky <ben.widawsky@xxxxxxxxx>
Suggested-by: Michal Hocko <mhocko@xxxxxxxx>
Co-developed-by: Feng Tang <feng.tang@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mempolicy.h | 12 ++++++++++++
mm/hugetlb.c | 34 +++++++++++++---------------------
2 files changed, 25 insertions(+), 21 deletions(-)
--- a/include/linux/mempolicy.h~mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many-fix
+++ a/include/linux/mempolicy.h
@@ -187,6 +187,12 @@ extern void mpol_put_task_policy(struct
extern bool numa_demotion_enabled;
+static inline bool mpol_is_preferred_many(struct mempolicy *pol)
+{
+ return (pol->mode == MPOL_PREFERRED_MANY);
+}
+
+
#else
struct mempolicy {};
@@ -297,5 +303,11 @@ static inline nodemask_t *policy_nodemas
}
#define numa_demotion_enabled false
+
+static inline bool mpol_is_preferred_many(struct mempolicy *pol)
+{
+ return false;
+}
+
#endif /* CONFIG_NUMA */
#endif
--- a/mm/hugetlb.c~mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many-fix
+++ a/mm/hugetlb.c
@@ -1145,7 +1145,7 @@ static struct page *dequeue_huge_page_vm
unsigned long address, int avoid_reserve,
long chg)
{
- struct page *page;
+ struct page *page = NULL;
struct mempolicy *mpol;
gfp_t gfp_mask;
nodemask_t *nodemask;
@@ -1166,20 +1166,17 @@ static struct page *dequeue_huge_page_vm
gfp_mask = htlb_alloc_mask(h);
nid = huge_node(vma, address, gfp_mask, &mpol, &nodemask);
-#ifdef CONFIG_NUMA
- if (mpol->mode == MPOL_PREFERRED_MANY) {
+
+ if (mpol_is_preferred_many(mpol)) {
page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask);
- if (page)
- goto check_reserve;
- /* Fallback to all nodes */
+
+ /* Fallback to all nodes if page==NULL */
nodemask = NULL;
}
-#endif
- page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask);
-#ifdef CONFIG_NUMA
-check_reserve:
-#endif
+ if (!page)
+ page = dequeue_huge_page_nodemask(h, gfp_mask, nid, nodemask);
+
if (page && !avoid_reserve && vma_has_reserves(vma, chg)) {
SetHPageRestoreReserve(page);
h->resv_huge_pages--;
@@ -2162,24 +2159,19 @@ struct page *alloc_buddy_huge_page_with_
nodemask_t *nodemask;
nid = huge_node(vma, addr, gfp_mask, &mpol, &nodemask);
-#ifdef CONFIG_NUMA
- if (mpol->mode == MPOL_PREFERRED_MANY) {
+ if (mpol_is_preferred_many(mpol)) {
gfp_t gfp = gfp_mask | __GFP_NOWARN;
gfp &= ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL);
page = alloc_surplus_huge_page(h, gfp, nid, nodemask, false);
- if (page) {
- mpol_cond_put(mpol);
- return page;
- }
- /* Fallback to all nodes */
+ /* Fallback to all nodes if page==NULL */
nodemask = NULL;
}
-#endif
- page = alloc_surplus_huge_page(h, gfp_mask, nid, nodemask, false);
- mpol_cond_put(mpol);
+ if (!page)
+ page = alloc_surplus_huge_page(h, gfp_mask, nid, nodemask, false);
+ mpol_cond_put(mpol);
return page;
}
_
Patches currently in -mm which might be from ben.widawsky@xxxxxxxxx are
mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many.patch
mm-mempolicy-advertise-new-mpol_preferred_many.patch
