The patch titled
Subject: mm/page_alloc:add a missing mm_page_alloc_zone_locked tracepoint
has been added to the -mm tree. Its filename is
mm-page_alloc-add-a-missing-mm_page_alloc_zone_locked-tracepoint.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-page_alloc-add-a-missing-mm_page_alloc_zone_locked-tracepoint.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-page_alloc-add-a-missing-mm_page_alloc_zone_locked-tracepoint.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: Hailong liu <liu.hailong6@xxxxxxxxxx>
Subject: mm/page_alloc:add a missing mm_page_alloc_zone_locked tracepoint
The trace point *trace_mm_page_alloc_zone_locked()* in __rmqueue() does
not currently cover all branches. Add the missing tracepoint and check
the page before do that.
Link: https://lkml.kernel.org/r/20201228132901.41523-1-carver4lio@xxxxxxx
Signed-off-by: Hailong liu <liu.hailong6@xxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/mm/page_alloc.c~mm-page_alloc-add-a-missing-mm_page_alloc_zone_locked-tracepoint
+++ a/mm/page_alloc.c
@@ -2871,7 +2871,7 @@ __rmqueue(struct zone *zone, unsigned in
zone_page_state(zone, NR_FREE_PAGES) / 2) {
page = __rmqueue_cma_fallback(zone, order);
if (page)
- return page;
+ goto out;
}
#endif
retry:
@@ -2884,8 +2884,9 @@ retry:
alloc_flags))
goto retry;
}
-
- trace_mm_page_alloc_zone_locked(page, order, migratetype);
+out:
+ if (page)
+ trace_mm_page_alloc_zone_locked(page, order, migratetype);
return page;
}
_
Patches currently in -mm which might be from liu.hailong6@xxxxxxxxxx are
mm-page_alloc-add-a-missing-mm_page_alloc_zone_locked-tracepoint.patch
