linux-kernel - [PATCH v2 1/2] khugepaged: Refactor trace_mm_collapse_huge_page

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250418183920.273154-1-nifan.cxl@gmail.com>
Date: Fri, 18 Apr 2025 11:34:20 -0700
From: nifan.cxl@...il.com
To: rostedt@...dmis.org,
	mhiramat@...nel.org,
	willy@...radead.org
Cc: akpm@...ux-foundation.org,
	david@...hat.com,
	fan.ni@...sung.com,
	yang@...amperecomputing.com,
	linux-kernel@...r.kernel.org,
	linux-trace-kernel@...r.kernel.org,
	linux-mm@...ck.org,
	npache@...hat.com,
	mcgrof@...nel.org,
	a.manzanares@...sung.com,
	dave@...olabs.net,
	nifan.cxl@...il.com,
	Baolin Wang <baolin.wang@...ux.alibaba.com>
Subject: [PATCH v2 1/2] khugepaged: Refactor trace_mm_collapse_huge_page_isolate() to take folio instead of page

From: Fan Ni <fan.ni@...sung.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@...sung.com>
Reviewed-by: Nico Pache <npache@...hat.com>
Reviewed-by: Davidlohr Bueso <dave@...olabs.net>
Reviewed-by: Baolin Wang <baolin.wang@...ux.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