khugepaged-pass-folio-instead-of-head-page-to-trace-events.patch removed from -mm tree
The quilt patch titled
Subject: khugepaged: pass folio instead of head page to trace events
has been removed from the -mm tree. Its filename was
khugepaged-pass-folio-instead-of-head-page-to-trace-events.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Fan Ni <[email protected]>
Subject: khugepaged: pass folio instead of head page to trace events
Date: Thu, 24 Apr 2025 17:16:51 -0700
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.
---
include/trace/events/huge_memory.h | 12 ++++++------ mm/khugepaged.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-)
include/trace/events/huge_memory.h renamed from include/trace/events/huge_memory.h~khugepaged-pass-folio-instead-of-head-page-to-trace-events +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_isolat ), 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 renamed from mm/khugepaged.c~khugepaged-pass-folio-instead-of-head-page-to-trace-events +3 -3
@@ -696,13 +696,13 @@ next: 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 @@ out_unmap: *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; }
_
Patches currently in -mm which might be from [email protected] are
mm-hugetlb-pass-folio-instead-of-page-to-unmap_ref_private.patch mm-hugetlb-refactor-unmap_hugepage_range-to-take-folio-instead-of-page.patch mm-hugetlb-refactor-__unmap_hugepage_range-to-take-folio-instead-of-page.patch mm-hugetlb-convert-use-of-struct-page-to-folio-in-__unmap_hugepage_range.patch