aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeongJae Park <sj38.park@gmail.com>2017-05-12 15:46:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-12 15:57:15 -0700
commit835152a25949dd5561819c2e3fcc4b2dd27f3e1e (patch)
tree018d3d942d62afc4a772793caa6a571046b86331
parent05384213436ab690c46d9dfec706b80ef8d671ab (diff)
downloadlinux-stericsson-835152a25949dd5561819c2e3fcc4b2dd27f3e1e.tar.gz
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>
-rw-r--r--mm/khugepaged.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 7cb9c88bb4a3..d1943e54ba95 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -907,8 +907,10 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm,
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);