x86/xen: Cleanup Xen related trace points

Since dropping Xen-PV support for 32-bit, include/trace/events/xen.h
contains several stale trace point definitions. Remove them.

Signed-off-by: Juergen Gross <jgross@suse.com>
Message-ID: <20260522152114.77319-3-jgross@suse.com>

diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h
index 0577f0cdd23162d6abd7a88b005d9479a7c0f5b0..e3f139f0bc78476f0a441cc0b72a525621a1a72f 100644 (file)
--- a/include/trace/events/xen.h
+++ b/include/trace/events/xen.h
@@ -129,9 +129,10 @@ TRACE_EVENT(xen_mc_extend_args,
                      __entry->res == XEN_MC_XE_NO_SPACE ? "NO_SPACE" : "???")
        );
 
-TRACE_DEFINE_SIZEOF(pteval_t);
 /* mmu */
-DECLARE_EVENT_CLASS(xen_mmu__set_pte,
+TRACE_DEFINE_SIZEOF(pteval_t);
+
+TRACE_EVENT(xen_mmu_set_pte,
            TP_PROTO(pte_t *ptep, pte_t pteval),
            TP_ARGS(ptep, pteval),
            TP_STRUCT__entry(
@@ -146,13 +147,6 @@ DECLARE_EVENT_CLASS(xen_mmu__set_pte,
                      (int)sizeof(pteval_t) * 2, (unsigned long long)__entry->pteval)
        );
 
-#define DEFINE_XEN_MMU_SET_PTE(name)                           \
-       DEFINE_EVENT(xen_mmu__set_pte, name,                    \
-                    TP_PROTO(pte_t *ptep, pte_t pteval),       \
-                    TP_ARGS(ptep, pteval))
-
-DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte);
-
 TRACE_DEFINE_SIZEOF(pmdval_t);
 
 TRACE_EVENT(xen_mmu_set_pmd,
@@ -170,37 +164,6 @@ TRACE_EVENT(xen_mmu_set_pmd,
                      (int)sizeof(pmdval_t) * 2, (unsigned long long)__entry->pmdval)
        );
 
-#ifdef CONFIG_X86_PAE
-DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte_atomic);
-
-TRACE_EVENT(xen_mmu_pte_clear,
-           TP_PROTO(struct mm_struct *mm, unsigned long addr, pte_t *ptep),
-           TP_ARGS(mm, addr, ptep),
-           TP_STRUCT__entry(
-                   __field(struct mm_struct *, mm)
-                   __field(unsigned long, addr)
-                   __field(pte_t *, ptep)
-                   ),
-           TP_fast_assign(__entry->mm = mm;
-                          __entry->addr = addr;
-                          __entry->ptep = ptep),
-           TP_printk("mm %p addr %lx ptep %p",
-                     __entry->mm, __entry->addr, __entry->ptep)
-       );
-
-TRACE_EVENT(xen_mmu_pmd_clear,
-           TP_PROTO(pmd_t *pmdp),
-           TP_ARGS(pmdp),
-           TP_STRUCT__entry(
-                   __field(pmd_t *, pmdp)
-                   ),
-           TP_fast_assign(__entry->pmdp = pmdp),
-           TP_printk("pmdp %p", __entry->pmdp)
-       );
-#endif
-
-#if CONFIG_PGTABLE_LEVELS >= 4
-
 TRACE_DEFINE_SIZEOF(pudval_t);
 
 TRACE_EVENT(xen_mmu_set_pud,
@@ -236,24 +199,6 @@ TRACE_EVENT(xen_mmu_set_p4d,
                      (int)sizeof(p4dval_t) * 2, (unsigned long long)pgd_val(native_make_pgd(__entry->p4dval)),
                      (int)sizeof(p4dval_t) * 2, (unsigned long long)__entry->p4dval)
        );
-#else
-
-TRACE_EVENT(xen_mmu_set_pud,
-           TP_PROTO(pud_t *pudp, pud_t pudval),
-           TP_ARGS(pudp, pudval),
-           TP_STRUCT__entry(
-                   __field(pud_t *, pudp)
-                   __field(pudval_t, pudval)
-                   ),
-           TP_fast_assign(__entry->pudp = pudp;
-                          __entry->pudval = native_pud_val(pudval)),
-           TP_printk("pudp %p pudval %0*llx (raw %0*llx)",
-                     __entry->pudp,
-                     (int)sizeof(pudval_t) * 2, (unsigned long long)pgd_val(native_make_pgd(__entry->pudval)),
-                     (int)sizeof(pudval_t) * 2, (unsigned long long)__entry->pudval)
-       );
-
-#endif
 
 DECLARE_EVENT_CLASS(xen_mmu_ptep_modify_prot,
            TP_PROTO(struct mm_struct *mm, unsigned long addr,
@@ -452,7 +397,6 @@ TRACE_EVENT(xen_cpu_set_ldt,
                      __entry->addr, __entry->entries)
        );
 
-
 #endif /*  _TRACE_XEN_H */
 
 /* This part must be outside protection */