khugepaged: Pass folio instead of head page to trace events
Subsystems (3)
PATCH v3 1/1 khugepaged: Pass folio instead of head page to trace events
From: Fan Ni <[email protected]>
The trace functions trace_mm_collapse_huge_page_isolate() and trace_mm_khugepaged_scan_pmd() each have a single user, which always passes in the head page of a folio.
Refactor both functions to take a folio directly.
---
v3:
1) No functional change compared to v2;
2) Picked up tags;
3) Squashed the two patches in v2 into one based on Yang Shi and David Hildenbrand's feedback;
4) Reword the commit log to reflect the squash.
v2:
https://lore.kernel.org/linux-mm/[email protected]/
--- include/trace/events/huge_memory.h | 12 ++++++------ mm/khugepaged.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-)
include/trace/events/huge_memory.h +6 -6
@@ -55,10 +55,10 @@ SCAN_STATUS TRACE_EVENT(mm_khugepaged_scan_pmd, - TP_PROTO(struct mm_struct *mm, struct page *page, bool writable, + TP_PROTO(struct mm_struct *mm, struct folio *folio, bool writable, int referenced, int none_or_zero, int status, int unmapped), - TP_ARGS(mm, page, writable, referenced, none_or_zero, status, unmapped), + TP_ARGS(mm, folio, writable, referenced, none_or_zero, status, unmapped), TP_STRUCT__entry( __field(struct mm_struct *, mm)
@@ -72,7 +72,7 @@ TRACE_EVENT(mm_khugepaged_scan_pmd,TP_fast_assign ( __entry->mm = mm; - __entry->pfn = page ?page_to_pfn (page) :-1 ; + __entry->pfn = folio ?folio_pfn (folio) :-1 ; __entry->writable = writable; __entry->referenced = referenced; __entry->none_or_zero = none_or_zero;
@@ -116,10 +116,10 @@ TRACE_EVENT(mm_collapse_huge_page, TRACE_EVENT(mm_collapse_huge_page_isolate, - TP_PROTO(struct page *page, int none_or_zero, + TP_PROTO(struct folio *folio, int none_or_zero, int referenced, bool writable, int status), - TP_ARGS(page, none_or_zero, referenced, writable, status), + TP_ARGS(folio, none_or_zero, referenced, writable, status), TP_STRUCT__entry( __field(unsigned long, pfn)
@@ -130,7 +130,7 @@ TRACE_EVENT(mm_collapse_huge_page_isolate, ), TP_fast_assign( - __entry->pfn = page ? page_to_pfn(page) : -1; + __entry->pfn = folio ? folio_pfn(folio) : -1; __entry->none_or_zero = none_or_zero; __entry->referenced = referenced; __entry->writable = writable;
mm/khugepaged.c +3 -3
@@ -696,13 +696,13 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, result =SCAN_LACK_REFERENCED_PAGE ; }else { result =SCAN_SUCCEED ; -trace_mm_collapse_huge_page_isolate (&folio->page, none_or_zero, +trace_mm_collapse_huge_page_isolate (folio, none_or_zero, referenced, writable, result);return result; } out:release_pte_pages (pte, _pte, compound_pagelist); -trace_mm_collapse_huge_page_isolate (&folio->page, none_or_zero, +trace_mm_collapse_huge_page_isolate (folio, none_or_zero, referenced, writable, result);return result; }
@@ -1435,7 +1435,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, *mmap_locked = false; } out: -trace_mm_khugepaged_scan_pmd (mm, &folio->page, writable, referenced, +trace_mm_khugepaged_scan_pmd (mm, folio, writable, referenced, none_or_zero, result, unmapped);return result; }
Signature · 1 line
2.47.2
Quoted 7 lines · On Thu, Apr 24, 2025 at 05:16:51PM -0700, [email protected] wrote:
From: Fan Ni <[email protected]>
The trace functions
trace_mm_collapse_huge_page_isolate()andtrace_mm_khugepaged_scan_pmd()each have a single user, which always passes in the head page of a folio.
Refactor both functions to take a folio directly.
Quoted 6 lines
Signed-off-by Fan Ni <[email protected]>Reviewed-by Nico Pache <[email protected]>Reviewed-by Davidlohr Bueso <[email protected]>Reviewed-by Baolin Wang <[email protected]>Reviewed-by Yang Shi <[email protected]>