Re: [PATCH v2 2/2] khugepaged: Refactor trace_mm_khugepaged_scan_pmd() to take folio instead of page

[Yang Shi]

On 4/18/25 11:34 AM, nifan....@gmail.com wrote:
From: Fan Ni <fan...@samsung.com>

trace_mm_khugepaged_scan_pmd() is only called in
hpage_collapse_scan_pmd(), where the head page of a folio is passed in,
so refactor it to take folio directly.

Signed-off-by: Fan Ni <fan...@samsung.com>
---
This is a new patch added to the series.

The change looks good to me. Reviewed-by: Yang Shi 
<y...@os.amperecomputing.com>

But I think the two patches can be squashed into one patch.

---
  include/trace/events/huge_memory.h | 6 +++---
  mm/khugepaged.c                    | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/trace/events/huge_memory.h 
b/include/trace/events/huge_memory.h
index a73699f000de..2305df6cb485 100644
--- a/include/trace/events/huge_memory.h
+++ b/include/trace/events/huge_memory.h
@@ -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;
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 950d147cd95e..bf5583dca1cb 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -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;
  }