aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/mm/trace: convert trace event to trace event class

Browse Source 
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.

Link: https://lkml.kernel.org/r/20230724190759.483013-9-aneesh.kumar@linux.ibm.com
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Aneesh Kumar K.V
2023-07-25 00:37:54 +05:30
committed by Andrew Morton
parent 0b6f15824c
commit 104c49d5b6
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/mm/book3s64/hash_pgtable.c
View File

@@ -214,7 +214,7 @@ unsigned long hash__pmd_hugepage_update(struct mm_struct *mm, unsigned long addr
old = be64_to_cpu(old_be); 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) if (old & H_PAGE_HASHPTE)
hpte_do_hugepage_flush(mm, addr, pmdp, old); hpte_do_hugepage_flush(mm, addr, pmdp, old);
return old; return old;

2
arch/powerpc/mm/book3s64/radix_pgtable.c
View File

@@ -962,7 +962,7 @@ unsigned long radix__pmd_hugepage_update(struct mm_struct *mm, unsigned long add
#endif #endif
old = radix__pte_update(mm, addr, pmdp_ptep(pmdp), clr, set, 1); 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; return old;
} }

23
include/trace/events/thp.h
View File

@@ -8,25 +8,29 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
TRACE_EVENT(hugepage_set_pmd, DECLARE_EVENT_CLASS(hugepage_set,
TP_PROTO(unsigned long addr, unsigned long pmd), TP_PROTO(unsigned long addr, unsigned long pte),
TP_ARGS(addr, pmd), TP_ARGS(addr, pte),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(unsigned long, addr) __field(unsigned long, addr)
__field(unsigned long, pmd) __field(unsigned long, pte)
), ),
TP_fast_assign( TP_fast_assign(
__entry->addr = addr; __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_PROTO(unsigned long addr, unsigned long pte, unsigned long clr, unsigned long set),
TP_ARGS(addr, pte, clr, 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) 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, DECLARE_EVENT_CLASS(migration_pmd,
TP_PROTO(unsigned long addr, unsigned long pmd), TP_PROTO(unsigned long addr, unsigned long pmd),