The quilt patch titled
Subject: mm: replace VM_WARN_ON to pr_warn if the node is offline with __GFP_THISNODE
has been removed from the -mm tree. Its filename was
mm-replace-vm_warn_on-to-pr_warn-if-the-node-is-offline-with-__gfp_thisnode-v4.patch
This patch was dropped because it was folded into mm-replace-vm_warn_on-to-pr_warn-if-the-node-is-offline-with-__gfp_thisnode.patch
------------------------------------------------------
From: Yang Shi <shy828301@xxxxxxxxx>
Subject: mm: replace VM_WARN_ON to pr_warn if the node is offline with __GFP_THISNODE
Date: Wed, 23 Nov 2022 11:30:14 -0800
renamed nid to this_node and gfp to warn_gfp to make the code more
readable per Michal.
Link: https://lkml.kernel.org/r/20221123193014.153983-1-shy828301@xxxxxxxxx
Reported-by: syzbot+0044b22d177870ee974f@xxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Yang Shi <shy828301@xxxxxxxxx>
Suggested-by: Michal Hocko <mhocko@xxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Zach O'Keefe <zokeefe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/gfp.h | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
--- a/include/linux/gfp.h~mm-replace-vm_warn_on-to-pr_warn-if-the-node-is-offline-with-__gfp_thisnode-v4
+++ a/include/linux/gfp.h
@@ -210,14 +210,18 @@ alloc_pages_bulk_array_node(gfp_t gfp, i
return __alloc_pages_bulk(gfp, nid, NULL, nr_pages, NULL, page_array);
}
-static inline void warn_if_node_offline(int nid, gfp_t gfp_mask)
+static inline void warn_if_node_offline(int this_node, gfp_t gfp_mask)
{
- gfp_t gfp = gfp_mask & (__GFP_THISNODE|__GFP_NOWARN);
+ gfp_t warn_gfp = gfp_mask & (__GFP_THISNODE|__GFP_NOWARN);
- if ((gfp == (__GFP_THISNODE|__GFP_NOWARN)) && !node_online(nid)) {
- pr_warn("%pGg allocation from offline node %d\n", &gfp, nid);
- dump_stack();
- }
+ if (warn_gfp != (__GFP_THISNODE|__GFP_NOWARN))
+ return;
+
+ if(node_online(this_node))
+ return;
+
+ pr_warn("%pGg allocation from offline node %d\n", &warn_gfp, this_node);
+ dump_stack();
}
/*
_
Patches currently in -mm which might be from shy828301@xxxxxxxxx are
mm-replace-vm_warn_on-to-pr_warn-if-the-node-is-offline-with-__gfp_thisnode.patch
