Skip to content

Commit 045634f

Browse files
Gautam-Menghaniakpm00
authored andcommitted
mm/khugepaged: refactor mm_khugepaged_scan_file tracepoint to remove filename from function call
Refactor the mm_khugepaged_scan_file tracepoint to move filename dereference to the tracepoint definition, to maintain consistency with other tracepoints[1]. [1]:lore.kernel.org/lkml/[email protected]/ Link: https://lkml.kernel.org/r/[email protected] Fixes: d41fd20 ("mm/khugepaged: add tracepoint to hpage_collapse_scan_file()") Signed-off-by: Gautam Menghani <[email protected]> Reviewed-by: Yang Shi <[email protected]> Reviewed-by: Zach O'Keefe <[email protected]> Reviewed-by: Steven Rostedt (Google) <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Masami Hiramatsu (Google) <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent ed86b74 commit 045634f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

include/trace/events/huge_memory.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ TRACE_EVENT(mm_collapse_huge_page_swapin,
171171

172172
TRACE_EVENT(mm_khugepaged_scan_file,
173173

174-
TP_PROTO(struct mm_struct *mm, struct page *page, const char *filename,
174+
TP_PROTO(struct mm_struct *mm, struct page *page, struct file *file,
175175
int present, int swap, int result),
176176

177-
TP_ARGS(mm, page, filename, present, swap, result),
177+
TP_ARGS(mm, page, file, present, swap, result),
178178

179179
TP_STRUCT__entry(
180180
__field(struct mm_struct *, mm)
181181
__field(unsigned long, pfn)
182-
__string(filename, filename)
182+
__string(filename, file->f_path.dentry->d_iname)
183183
__field(int, present)
184184
__field(int, swap)
185185
__field(int, result)
@@ -188,7 +188,7 @@ TRACE_EVENT(mm_khugepaged_scan_file,
188188
TP_fast_assign(
189189
__entry->mm = mm;
190190
__entry->pfn = page ? page_to_pfn(page) : -1;
191-
__assign_str(filename, filename);
191+
__assign_str(filename, file->f_path.dentry->d_iname);
192192
__entry->present = present;
193193
__entry->swap = swap;
194194
__entry->result = result;

mm/khugepaged.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,8 +2153,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr,
21532153
}
21542154
}
21552155

2156-
trace_mm_khugepaged_scan_file(mm, page, file->f_path.dentry->d_iname,
2157-
present, swap, result);
2156+
trace_mm_khugepaged_scan_file(mm, page, file, present, swap, result);
21582157
return result;
21592158
}
21602159
#else

0 commit comments

Comments
 (0)