KVM: x86/xen: Add CPL to Xen hypercall tracepoint

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index bc25589ad588676974770919234b67f9ce198c43..a2dad1bce8521cd827d7d3460973c105eb7df6cb 100644 (file)
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -113,12 +113,13 @@ TRACE_EVENT(kvm_hv_hypercall_done,
  * Tracepoint for Xen hypercall.
  */
 TRACE_EVENT(kvm_xen_hypercall,
-       TP_PROTO(unsigned long nr, unsigned long a0, unsigned long a1,
-                unsigned long a2, unsigned long a3, unsigned long a4,
-                unsigned long a5),
-           TP_ARGS(nr, a0, a1, a2, a3, a4, a5),
+           TP_PROTO(u8 cpl, unsigned long nr,
+                    unsigned long a0, unsigned long a1, unsigned long a2,
+                    unsigned long a3, unsigned long a4, unsigned long a5),
+           TP_ARGS(cpl, nr, a0, a1, a2, a3, a4, a5),
 
        TP_STRUCT__entry(
+               __field(u8, cpl)
                __field(unsigned long, nr)
                __field(unsigned long, a0)
                __field(unsigned long, a1)
@@ -129,6 +130,7 @@ TRACE_EVENT(kvm_xen_hypercall,
        ),
 
        TP_fast_assign(
+               __entry->cpl = cpl;
                __entry->nr = nr;
                __entry->a0 = a0;
                __entry->a1 = a1;
@@ -138,8 +140,9 @@ TRACE_EVENT(kvm_xen_hypercall,
                __entry->a4 = a5;
        ),
 
-       TP_printk("nr 0x%lx a0 0x%lx a1 0x%lx a2 0x%lx a3 0x%lx a4 0x%lx a5 %lx",
-                 __entry->nr, __entry->a0, __entry->a1,  __entry->a2,
+       TP_printk("cpl %d nr 0x%lx a0 0x%lx a1 0x%lx a2 0x%lx a3 0x%lx a4 0x%lx a5 %lx",
+                 __entry->cpl, __entry->nr,
+                 __entry->a0, __entry->a1, __entry->a2,
                  __entry->a3, __entry->a4, __entry->a5)
 );
 

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index f3098c0e386a8a6a8eadf50f993ec2a00cfe2317..4b8e9628fbf57396b91cab1b61d773b2ed9bdcfb 100644 (file)
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -1256,7 +1256,7 @@ int kvm_xen_hypercall(struct kvm_vcpu *vcpu)
        }
 #endif
        cpl = static_call(kvm_x86_get_cpl)(vcpu);
-       trace_kvm_xen_hypercall(input, params[0], params[1], params[2],
+       trace_kvm_xen_hypercall(cpl, input, params[0], params[1], params[2],
                                params[3], params[4], params[5]);
 
        /*