The quilt patch titled
Subject: mm-fix-missing-handler-for-__gfp_nowarn-v2
has been removed from the -mm tree. Its filename was
mm-fix-missing-handler-for-__gfp_nowarn-v2.patch
This patch was dropped because it was folded into mm-fix-missing-handler-for-__gfp_nowarn.patch
------------------------------------------------------
From: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
Subject: mm-fix-missing-handler-for-__gfp_nowarn-v2
- add comment to WARN_ON_ONCE_GFP
- handle __alloc_contig_migrate_range() case
- do not deal with:
WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
Link: https://lkml.kernel.org/r/20220511061951.1114-1-zhengqi.arch@xxxxxxxxxxxxx
Signed-off-by: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
Cc: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Jiri Slaby <jirislaby@xxxxxxxxxx>
Cc: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/internal.h | 4 ++++
mm/page_alloc.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
--- a/mm/internal.h~mm-fix-missing-handler-for-__gfp_nowarn-v2
+++ a/mm/internal.h
@@ -35,6 +35,10 @@ struct folio_batch;
/* Do not use these with a slab allocator */
#define GFP_SLAB_BUG_MASK (__GFP_DMA32|__GFP_HIGHMEM|~__GFP_BITS_MASK)
+/*
+ * Different from WARN_ON_ONCE(), no warning will be issued
+ * when we specify __GFP_NOWARN.
+ */
#define WARN_ON_ONCE_GFP(cond, gfp) ({ \
static bool __section(".data.once") __warned; \
int __ret_warn_once = !!(cond); \
--- a/mm/page_alloc.c~mm-fix-missing-handler-for-__gfp_nowarn-v2
+++ a/mm/page_alloc.c
@@ -3712,7 +3712,7 @@ struct page *rmqueue(struct zone *prefer
* We most definitely don't want callers attempting to
* allocate greater than order-1 page units with __GFP_NOFAIL.
*/
- WARN_ON_ONCE_GFP((gfp_flags & __GFP_NOFAIL) && (order > 1), gfp_flags);
+ WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
do {
page = NULL;
@@ -9027,7 +9027,7 @@ int __alloc_contig_migrate_range(struct
lru_cache_enable();
if (ret < 0) {
- if (ret == -EBUSY)
+ if (!(cc->gfp_mask & __GFP_NOWARN) && ret == -EBUSY)
alloc_contig_dump_pages(&cc->migratepages);
putback_movable_pages(&cc->migratepages);
return ret;
_
Patches currently in -mm which might be from zhengqi.arch@xxxxxxxxxxxxx are
mm-fix-missing-handler-for-__gfp_nowarn.patch
