projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0538421
)
mm/khugepaged: add missed tracepoint for collapse_huge_page_swapin
author
SeongJae Park
<
[email protected]
>
Fri, 12 May 2017 22:46:38 +0000
(15:46 -0700)
committer
Linus Torvalds
<
[email protected]
>
Fri, 12 May 2017 22:57:15 +0000
(15:57 -0700)
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/
[email protected]
Signed-off-by: SeongJae Park <
[email protected]
>
Cc: Kirill A. Shutemov <
[email protected]
>
Cc: Johannes Weiner <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
mm/khugepaged.c
patch
|
blob
|
history
diff --git
a/mm/khugepaged.c
b/mm/khugepaged.c
index 7cb9c88bb4a33ca11c3266f398ffffb53c5afc13..d1943e54ba95e2850bdc2bf6de264844e6329dae 100644
(file)
--- 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);