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

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

[nifan.cxl]

From: Fan Ni <fan.ni@samsung.com>

trace_mm_collapse_huge_page_isolate() is only used in
__collapse_huge_page_isolate(), which passes in the head page of a
folio, so refactor it to take folio directly.

Signed-off-by: Fan Ni <fan.ni@samsung.com>
Reviewed-by: Nico Pache <npache@redhat.com>
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
---
v2: 
Picked up Reviewed-by tags;
v1:
https://lore.kernel.org/linux-mm/CAA1CXcB06JD9Fp4c7GGU3NHEm4W-aV7TS7JW7eWxshJEM4t2_w@mail.gmail.com/T/
---
 include/trace/events/huge_memory.h | 6 +++---
 mm/khugepaged.c                    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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

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

[nifan.cxl]

From: Fan Ni <fan.ni@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.ni@samsung.com>
---
This is a new patch added to the series.
---
 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;
 }
-- 
2.47.2

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

[Baolin Wang]

On 2025/4/19 02:34, nifan.cxl@gmail.com wrote:
> From: Fan Ni <fan.ni@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.ni@samsung.com>

LGTM.
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>

> ---
> This is a new patch added to the series.
> ---
>   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;
>   }

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

[Yang Shi]

On 4/18/25 11:34 AM, nifan.cxl@gmail.com wrote:
> From: Fan Ni <fan.ni@samsung.com>
>
> trace_mm_collapse_huge_page_isolate() is only used in
> __collapse_huge_page_isolate(), which passes in the head page of a
> folio, so refactor it to take folio directly.
>
> Signed-off-by: Fan Ni <fan.ni@samsung.com>
> Reviewed-by: Nico Pache <npache@redhat.com>
> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
> ---
> v2:
> Picked up Reviewed-by tags;
> v1:
> https://lore.kernel.org/linux-mm/CAA1CXcB06JD9Fp4c7GGU3NHEm4W-aV7TS7JW7eWxshJEM4t2_w@mail.gmail.com/T/
> ---

Reviewed-by: Yang Shi <yang@os.amperecomputing.com>

>   include/trace/events/huge_memory.h | 6 +++---
>   mm/khugepaged.c                    | 4 ++--
>   2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h
> index 9d5c00b0285c..a73699f000de 100644
> --- a/include/trace/events/huge_memory.h
> +++ b/include/trace/events/huge_memory.h
> @@ -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;
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index b8838ba8207a..950d147cd95e 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -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;
>   }

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.cxl@gmail.com wrote:
> From: Fan Ni <fan.ni@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.ni@samsung.com>
> ---
> This is a new patch added to the series.

The change looks good to me. Reviewed-by: Yang Shi 
<yang@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;
>   }

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

[David Hildenbrand]

On 18.04.25 20:34, nifan.cxl@gmail.com wrote:
> From: Fan Ni <fan.ni@samsung.com>
> 
> trace_mm_collapse_huge_page_isolate() is only used in
> __collapse_huge_page_isolate(), which passes in the head page of a
> folio, so refactor it to take folio directly.
> 
> Signed-off-by: Fan Ni <fan.ni@samsung.com>
> Reviewed-by: Nico Pache <npache@redhat.com>
> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
> ---
> v2:
> Picked up Reviewed-by tags;
> v1:
> https://lore.kernel.org/linux-mm/CAA1CXcB06JD9Fp4c7GGU3NHEm4W-aV7TS7JW7eWxshJEM4t2_w@mail.gmail.com/T/
> ---

Acked-by: David Hildenbrand <david@redhat.com>

-- 
Cheers,

David / dhildenb

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

[David Hildenbrand]

On 22.04.25 00:40, Yang Shi wrote:
> 
> 
> On 4/18/25 11:34 AM, nifan.cxl@gmail.com wrote:
>> From: Fan Ni <fan.ni@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.ni@samsung.com>
>> ---
>> This is a new patch added to the series.
> 
> The change looks good to me. Reviewed-by: Yang Shi
> <yang@os.amperecomputing.com>
> 
> But I think the two patches can be squashed into one patch.

Agreed, something like

"khugepaged: pass folio instead of head page to trace events"

Acked-by: David Hildenbrand <david@redhat.com>

-- 
Cheers,

David / dhildenb