The patch titled
Subject: mm/khugepaged: add missed tracepoint for collapse_huge_page_swapin
has been added to the -mm tree. Its filename is
mm-khugepaged-add-missed-tracepoint-for-collapse_huge_page_swapin.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-khugepaged-add-missed-tracepoint-for-collapse_huge_page_swapin.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-khugepaged-add-missed-tracepoint-for-collapse_huge_page_swapin.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/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: SeongJae Park <sj38.park@xxxxxxxxx>
Subject: mm/khugepaged: add missed tracepoint for collapse_huge_page_swapin
One return case of `__collapse_huge_page_swapin()` does not invoke
tracepoint while every other return case does. This commit adds a
tracepoint invocation for the case.
Link: http://lkml.kernel.org/r/20170507101813.30187-1-sj38.park@xxxxxxxxx
Signed-off-by: SeongJae Park <sj38.park@xxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/khugepaged.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN mm/khugepaged.c~mm-khugepaged-add-missed-tracepoint-for-collapse_huge_page_swapin mm/khugepaged.c
--- a/mm/khugepaged.c~mm-khugepaged-add-missed-tracepoint-for-collapse_huge_page_swapin
+++ a/mm/khugepaged.c
@@ -907,8 +907,10 @@ static bool __collapse_huge_page_swapin(
return false;
}
/* check if the pmd is still valid */
- if (mm_find_pmd(mm, address) != pmd)
+ if (mm_find_pmd(mm, address) != pmd) {
+ trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);
return false;
+ }
}
if (ret & VM_FAULT_ERROR) {
trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);
_
Patches currently in -mm which might be from sj38.park@xxxxxxxxx are
mm-khugepaged-add-missed-tracepoint-for-collapse_huge_page_swapin.patch
docs-vm-transhuge-fix-few-trivial-typos.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
