powerpc-mm-trace-convert-trace-event-to-trace-event-class.patch removed from -mm tree
The quilt patch titled
Subject: powerpc/mm/trace: convert trace event to trace event class
has been removed from the -mm tree. Its filename was
powerpc-mm-trace-convert-trace-event-to-trace-event-class.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: "Aneesh Kumar K.V" <[email protected]>
Subject: powerpc/mm/trace: convert trace event to trace event class
Date: Tue, 25 Jul 2023 00:37:54 +0530
A follow-up patch will add a pud variant for this same event. Using event class makes that addition simpler.
No functional change in this patch.
---
arch/powerpc/mm/book3s64/hash_pgtable.c | 2 - arch/powerpc/mm/book3s64/radix_pgtable.c | 2 - include/trace/events/thp.h | 23 ++++++++++++++------- 3 files changed, 18 insertions(+), 9 deletions(-)
arch/powerpc/mm/book3s64/hash_pgtable.c renamed from arch/powerpc/mm/book3s64/hash_pgtable.c~powerpc-mm-trace-convert-trace-event-to-trace-event-class +1 -1
@@ -214,7 +214,7 @@ unsigned long hash__pmd_hugepage_update( old =be64_to_cpu (old_be); -trace_hugepage_update (addr, old, clr, set); +trace_hugepage_update_pmd (addr, old, clr, set);if (old &H_PAGE_HASHPTE )hpte_do_hugepage_flush (mm, addr, pmdp, old);return old;
arch/powerpc/mm/book3s64/radix_pgtable.c renamed from arch/powerpc/mm/book3s64/radix_pgtable.c~powerpc-mm-trace-convert-trace-event-to-trace-event-class +1 -1
@@ -962,7 +962,7 @@ unsigned long radix__pmd_hugepage_update#endif old =radix__pte_update (mm, addr,pmdp_ptep (pmdp), clr, set,1 ); -trace_hugepage_update (addr, old, clr, set); +trace_hugepage_update_pmd (addr, old, clr, set);return old; }
include/trace/events/thp.h renamed from include/trace/events/thp.h~powerpc-mm-trace-convert-trace-event-to-trace-event-class +16 -7
@@ -8,25 +8,29 @@#include <linux/types.h> #include <linux/tracepoint.h> -TRACE_EVENT (hugepage_set_pmd, +DECLARE_EVENT_CLASS (hugepage_set, - TP_PROTO(unsigned long addr, unsigned long pmd), -TP_ARGS (addr, pmd), + TP_PROTO(unsigned long addr, unsigned long pte), +TP_ARGS (addr, pte),TP_STRUCT__entry ( __field(unsigned long, addr) - __field(unsigned long, pmd) + __field(unsigned long, pte) ),TP_fast_assign ( __entry->addr = addr; - __entry->pmd = pmd; + __entry->pte = pte; ), -TP_printk ("Set pmd with 0x%lx with 0x%lx" , __entry->addr, __entry->pmd) +TP_printk ("Set page table entry with 0x%lx with 0x%lx" , __entry->addr, __entry->pte) ); +DEFINE_EVENT (hugepage_set, hugepage_set_pmd, + TP_PROTO(unsigned long addr, unsigned long pmd), +TP_ARGS (addr, pmd) +); -TRACE_EVENT(hugepage_update, +DECLARE_EVENT_CLASS(hugepage_update, TP_PROTO(unsigned long addr, unsigned long pte, unsigned long clr, unsigned long set), TP_ARGS(addr, pte, clr, set),
@@ -48,6 +52,11 @@ TRACE_EVENT(hugepage_update,TP_printk ("hugepage update at addr 0x%lx and pte = 0x%lx clr = 0x%lx, set = 0x%lx" , __entry->addr, __entry->pte, __entry->clr, __entry->set) ); +DEFINE_EVENT (hugepage_update, hugepage_update_pmd, + TP_PROTO(unsigned long addr, unsigned long pmd, unsigned long clr, unsigned long set), +TP_ARGS (addr, pmd, clr, set) +); + DECLARE_EVENT_CLASS(migration_pmd, TP_PROTO(unsigned long addr, unsigned long pmd),
_
Patches currently in -mm which might be from [email protected] are
mm-memory_hotplug-simplify-arch_mhp_memmap_on_memory_enable-kconfig.patch mm-memory_hotplug-allow-memmap-on-memory-hotplug-request-to-fallback.patch mm-memory_hotplug-allow-architecture-to-override-memmap-on-memory-support-check.patch mm-memory_hotplug-support-memmap_on_memory-when-memmap-is-not-aligned-to-pageblocks.patch powerpc-book3s64-memhotplug-enable-memmap-on-memory-for-radix.patch mm-memory_hotplug-embed-vmem_altmap-details-in-memory-block.patch