Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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@gmail.com
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

SeongJae Park and committed by
Linus Torvalds
835152a2 05384213

+3 -1
+3 -1
mm/khugepaged.c
··· 907 907 return false; 908 908 } 909 909 /* check if the pmd is still valid */ 910 - if (mm_find_pmd(mm, address) != pmd) 910 + if (mm_find_pmd(mm, address) != pmd) { 911 + trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0); 911 912 return false; 913 + } 912 914 } 913 915 if (ret & VM_FAULT_ERROR) { 914 916 trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);