xen/trace: add tlb flush tracepoints

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 5dfa90a7ad1837893b37b71ab2d25a5c9c977a67..c3abba17ab00c853b5e35852be24623bf871ef5f 100644 (file)
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1222,6 +1222,8 @@ static void xen_flush_tlb(void)
        struct mmuext_op *op;
        struct multicall_space mcs;
 
+       trace_xen_mmu_flush_tlb(0);
+
        preempt_disable();
 
        mcs = xen_mc_entry(sizeof(*op));
@@ -1240,6 +1242,8 @@ static void xen_flush_tlb_single(unsigned long addr)
        struct mmuext_op *op;
        struct multicall_space mcs;
 
+       trace_xen_mmu_flush_tlb_single(addr);
+
        preempt_disable();
 
        mcs = xen_mc_entry(sizeof(*op));
@@ -1266,6 +1270,8 @@ static void xen_flush_tlb_others(const struct cpumask *cpus,
        } *args;
        struct multicall_space mcs;
 
+       trace_xen_mmu_flush_tlb_others(cpus, mm, va);
+
        if (cpumask_empty(cpus))
                return;         /* nothing to do */
 
@@ -1305,6 +1311,8 @@ static void __xen_write_cr3(bool kernel, unsigned long cr3)
        struct multicall_space mcs;
        unsigned long mfn;
 
+       trace_xen_mmu_write_cr3(kernel, cr3);
+
        if (cr3)
                mfn = pfn_to_mfn(PFN_DOWN(cr3));
        else

diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h
index 1dda50834f9c5f2be3a5ed1a980bf20861845b32..1f71f2297c00762baaf0c7ec00a9ee75a9d02701 100644 (file)
--- a/include/trace/events/xen.h
+++ b/include/trace/events/xen.h
@@ -405,6 +405,54 @@ TRACE_EVENT(xen_mmu_pgd_unpin,
            TP_printk("mm %p pgd %p", __entry->mm, __entry->pgd)
        );
 
+TRACE_EVENT(xen_mmu_flush_tlb,
+           TP_PROTO(int x),
+           TP_ARGS(x),
+           TP_STRUCT__entry(__array(char, x, 0)),
+           TP_fast_assign((void)x),
+           TP_printk("%s", "")
+       );
+
+TRACE_EVENT(xen_mmu_flush_tlb_single,
+           TP_PROTO(unsigned long addr),
+           TP_ARGS(addr),
+           TP_STRUCT__entry(
+                   __field(unsigned long, addr)
+                   ),
+           TP_fast_assign(__entry->addr = addr),
+           TP_printk("addr %lx", __entry->addr)
+       );
+
+TRACE_EVENT(xen_mmu_flush_tlb_others,
+           TP_PROTO(const struct cpumask *cpus, struct mm_struct *mm,
+                    unsigned long addr),
+           TP_ARGS(cpus, mm, addr),
+           TP_STRUCT__entry(
+                   __field(unsigned, ncpus)
+                   __field(struct mm_struct *, mm)
+                   __field(unsigned long, addr)
+                   ),
+           TP_fast_assign(__entry->ncpus = cpumask_weight(cpus);
+                          __entry->mm = mm;
+                          __entry->addr = addr),
+           TP_printk("ncpus %d mm %p addr %lx",
+                     __entry->ncpus, __entry->mm, __entry->addr)
+       );
+
+TRACE_EVENT(xen_mmu_write_cr3,
+           TP_PROTO(bool kernel, unsigned long cr3),
+           TP_ARGS(kernel, cr3),
+           TP_STRUCT__entry(
+                   __field(bool, kernel)
+                   __field(unsigned long, cr3)
+                   ),
+           TP_fast_assign(__entry->kernel = kernel;
+                          __entry->cr3 = cr3),
+           TP_printk("%s cr3 %lx",
+                     __entry->kernel ? "kernel" : "user", __entry->cr3)
+       );
+
+
 /* CPU */
 TRACE_EVENT(xen_cpu_write_ldt_entry,
            TP_PROTO(struct desc_struct *dt, int entrynum, u64 desc),