[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v13 8/8] Add xentrace to vmware_port
From: Don Slutz <dslutz@xxxxxxxxxxx> Also added missing TRAP_DEBUG & VLAPIC. Signed-off-by: Don Slutz <dslutz@xxxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> CC: Don Slutz <don.slutz@xxxxxxxxx> --- v13: Please do this by extending the existing infrastructure rather than special-casing 7 on the side. (i.e. extend ND to take 7 parameters, and introduce HVMTRACE_7D) = { d1, d2, d3, d4, d5, d6, d7 } will be far shorter, linewise. v12: Switch VMPORT_IGNORED to port, regs->_eax. v11: No change v10: Added Acked-by: Ian Campbell Added back in the trace point calls. Why is cmd in this patch? Because the trace points use it. v9: Dropped unneed VMPORT_UNHANDLED, VMPORT_DECODE. v7: Dropped some of the new traces. Added HVMTRACE_ND7. v6: Dropped the attempt to use svm_nextrip_insn_length via __get_instruction_length (added in v2). Just always look at upto 15 bytes on AMD. v5: exitinfo1 is used twice. Fixed. tools/xentrace/formats | 5 ++++ xen/arch/x86/hvm/hvm.c | 3 ++ xen/arch/x86/hvm/svm/svm.c | 6 ++-- xen/arch/x86/hvm/vmware/vmport.c | 14 ++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 6 ++-- xen/include/asm-x86/hvm/trace.h | 59 ++++++++++++++++++++-------------------- xen/include/public/trace.h | 3 ++ 7 files changed, 57 insertions(+), 39 deletions(-) diff --git a/tools/xentrace/formats b/tools/xentrace/formats index 5d7b72a..ac8800e 100644 --- a/tools/xentrace/formats +++ b/tools/xentrace/formats @@ -79,6 +79,11 @@ 0x00082020 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INTR_WINDOW [ value = 0x%(1)08x ] 0x00082021 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) NPF [ gpa = 0x%(2)08x%(1)08x mfn = 0x%(4)08x%(3)08x qual = 0x%(5)04x p2mt = 0x%(6)04x ] 0x00082023 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) TRAP [ vector = 0x%(1)02x ] +0x00082024 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) TRAP_DEBUG [ exit_qualification = 0x%(1)08x ] +0x00082025 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VLAPIC +0x00082026 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMPORT_HANDLED [ cmd = %(1)d eax = 0x%(2)08x ebx = 0x%(3)08x ecx = 0x%(4)08x edx = 0x%(5)08x esi = 0x%(6)08x edi = 0x%(7)08x ] +0x00082027 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMPORT_IGNORED [ port = %(1)d eax = 0x%(2)08x ] +0x00082028 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMPORT_QEMU [ eax = 0x%(1)08x ebx = 0x%(2)08x ecx = 0x%(3)08x edx = 0x%(4)08x esi = 0x%(5)08x edi = 0x%(6)08x ] 0x0010f001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_map [ domid = %(1)d ] 0x0010f002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_unmap [ domid = %(1)d ] diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 07b4025..6003317 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -588,6 +588,9 @@ void hvm_do_resume(struct vcpu *v) regs->_edx = vr->edx; regs->_esi = vr->esi; regs->_edi = vr->edi; + HVMTRACE_ND(VMPORT_QEMU, 0, 1/*cycles*/, 6, + vio->io_req.data, regs->_ebx, regs->_ecx, + regs->_edx, regs->_esi, regs->_edi, 0); } } (void)handle_pio(vio->io_req.addr, vio->io_req.size, diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 200a5df..ce45e8d 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2291,12 +2291,12 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) HVMTRACE_ND(VMEXIT64, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, 1/*cycles*/, 3, exit_reason, (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32), - 0, 0, 0); + 0, 0, 0, 0); else HVMTRACE_ND(VMEXIT, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, 1/*cycles*/, 2, exit_reason, (uint32_t)regs->eip, - 0, 0, 0, 0); + 0, 0, 0, 0, 0); if ( vcpu_guestmode ) { enum nestedhvm_vmexits nsret; @@ -2685,7 +2685,7 @@ void svm_trace_vmentry(void) struct vcpu *curr = current; HVMTRACE_ND(VMENTRY, nestedhvm_vcpu_in_guestmode(curr) ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); + 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0, 0); } /* diff --git a/xen/arch/x86/hvm/vmware/vmport.c b/xen/arch/x86/hvm/vmware/vmport.c index ee993b3..9f66328 100644 --- a/xen/arch/x86/hvm/vmware/vmport.c +++ b/xen/arch/x86/hvm/vmware/vmport.c @@ -16,6 +16,7 @@ #include <xen/lib.h> #include <asm/hvm/hvm.h> #include <asm/hvm/support.h> +#include <asm/hvm/trace.h> #include "backdoor_def.h" @@ -35,6 +36,7 @@ static int vmport_ioport(int dir, uint32_t port, uint32_t bytes, uint32_t *val) if ( port == BDOOR_PORT && regs->_eax == BDOOR_MAGIC ) { uint32_t new_eax = ~0u; + uint16_t cmd = regs->_ecx; uint64_t value; struct vcpu *curr = current; struct domain *currd = curr->domain; @@ -45,7 +47,7 @@ static int vmport_ioport(int dir, uint32_t port, uint32_t bytes, uint32_t *val) * leaving the high 32-bits unchanged, unlike what one would * expect to happen. */ - switch ( regs->_ecx & 0xffff ) + switch ( cmd ) { case BDOOR_CMD_GETMHZ: new_eax = currd->arch.tsc_khz / 1000; @@ -123,11 +125,17 @@ static int vmport_ioport(int dir, uint32_t port, uint32_t bytes, uint32_t *val) /* Let backing DM handle */ return X86EMUL_UNHANDLEABLE; } + HVMTRACE_7D(VMPORT_HANDLED, cmd, new_eax, regs->_ebx, regs->_ecx, + regs->_edx, regs->_esi, regs->_edi); if ( dir == IOREQ_READ ) *val = new_eax; } - else if ( dir == IOREQ_READ ) - *val = ~0u; + else + { + HVMTRACE_2D(VMPORT_IGNORED, port, regs->_eax); + if ( dir == IOREQ_READ ) + *val = ~0u; + } return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2581e97..5325e8d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2886,11 +2886,11 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) if ( hvm_long_mode_enabled(v) ) HVMTRACE_ND(VMEXIT64, 0, 1/*cycles*/, 3, exit_reason, (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32), - 0, 0, 0); + 0, 0, 0, 0); else HVMTRACE_ND(VMEXIT, 0, 1/*cycles*/, 2, exit_reason, (uint32_t)regs->eip, - 0, 0, 0, 0); + 0, 0, 0, 0, 0); perfc_incra(vmexits, exit_reason); @@ -3506,7 +3506,7 @@ void vmx_vmenter_helper(const struct cpu_user_regs *regs) vpid_sync_all(); out: - HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); + HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0, 0); __vmwrite(GUEST_RIP, regs->rip); __vmwrite(GUEST_RSP, regs->rsp); diff --git a/xen/include/asm-x86/hvm/trace.h b/xen/include/asm-x86/hvm/trace.h index de802a6..3ec7817 100644 --- a/xen/include/asm-x86/hvm/trace.h +++ b/xen/include/asm-x86/hvm/trace.h @@ -54,6 +54,9 @@ #define DO_TRC_HVM_TRAP DEFAULT_HVM_MISC #define DO_TRC_HVM_TRAP_DEBUG DEFAULT_HVM_MISC #define DO_TRC_HVM_VLAPIC DEFAULT_HVM_MISC +#define DO_TRC_HVM_VMPORT_HANDLED DEFAULT_HVM_IO +#define DO_TRC_HVM_VMPORT_IGNORED DEFAULT_HVM_IO +#define DO_TRC_HVM_VMPORT_QEMU DEFAULT_HVM_IO #define TRC_PAR_LONG(par) ((par)&0xFFFFFFFF),((par)>>32) @@ -65,38 +68,34 @@ #define TRACE_2_LONG_4D(_e, d1, d2, d3, d4, ...) \ TRACE_6D(_e, d1, d2, d3, d4) -#define HVMTRACE_ND(evt, modifier, cycles, count, d1, d2, d3, d4, d5, d6) \ - do { \ - if ( unlikely(tb_init_done) && DO_TRC_HVM_ ## evt ) \ - { \ - struct { \ - u32 d[6]; \ - } _d; \ - _d.d[0]=(d1); \ - _d.d[1]=(d2); \ - _d.d[2]=(d3); \ - _d.d[3]=(d4); \ - _d.d[4]=(d5); \ - _d.d[5]=(d6); \ - __trace_var(TRC_HVM_ ## evt | (modifier), cycles, \ - sizeof(*_d.d) * count, &_d); \ - } \ +#define HVMTRACE_ND(evt, modifier, cycles, count, d1, d2, d3, d4, d5, d6, d7) \ + do { \ + if ( unlikely(tb_init_done) && DO_TRC_HVM_ ## evt ) \ + { \ + struct { \ + u32 d[7]; \ + } _d = { { d1, d2, d3, d4, d5, d6, d7 } }; \ + __trace_var(TRC_HVM_ ## evt | (modifier), cycles, \ + sizeof(*_d.d) * count, &_d); \ + } \ } while(0) -#define HVMTRACE_6D(evt, d1, d2, d3, d4, d5, d6) \ - HVMTRACE_ND(evt, 0, 0, 6, d1, d2, d3, d4, d5, d6) -#define HVMTRACE_5D(evt, d1, d2, d3, d4, d5) \ - HVMTRACE_ND(evt, 0, 0, 5, d1, d2, d3, d4, d5, 0) -#define HVMTRACE_4D(evt, d1, d2, d3, d4) \ - HVMTRACE_ND(evt, 0, 0, 4, d1, d2, d3, d4, 0, 0) -#define HVMTRACE_3D(evt, d1, d2, d3) \ - HVMTRACE_ND(evt, 0, 0, 3, d1, d2, d3, 0, 0, 0) -#define HVMTRACE_2D(evt, d1, d2) \ - HVMTRACE_ND(evt, 0, 0, 2, d1, d2, 0, 0, 0, 0) -#define HVMTRACE_1D(evt, d1) \ - HVMTRACE_ND(evt, 0, 0, 1, d1, 0, 0, 0, 0, 0) -#define HVMTRACE_0D(evt) \ - HVMTRACE_ND(evt, 0, 0, 0, 0, 0, 0, 0, 0, 0) +#define HVMTRACE_7D(evt, d1, d2, d3, d4, d5, d6, d7) \ + HVMTRACE_ND(evt, 0, 0, 7, d1, d2, d3, d4, d5, d6, d7) +#define HVMTRACE_6D(evt, d1, d2, d3, d4, d5, d6) \ + HVMTRACE_ND(evt, 0, 0, 6, d1, d2, d3, d4, d5, d6, 0) +#define HVMTRACE_5D(evt, d1, d2, d3, d4, d5) \ + HVMTRACE_ND(evt, 0, 0, 5, d1, d2, d3, d4, d5, 0, 0) +#define HVMTRACE_4D(evt, d1, d2, d3, d4) \ + HVMTRACE_ND(evt, 0, 0, 4, d1, d2, d3, d4, 0, 0, 0) +#define HVMTRACE_3D(evt, d1, d2, d3) \ + HVMTRACE_ND(evt, 0, 0, 3, d1, d2, d3, 0, 0, 0, 0) +#define HVMTRACE_2D(evt, d1, d2) \ + HVMTRACE_ND(evt, 0, 0, 2, d1, d2, 0, 0, 0, 0, 0) +#define HVMTRACE_1D(evt, d1) \ + HVMTRACE_ND(evt, 0, 0, 1, d1, 0, 0, 0, 0, 0, 0) +#define HVMTRACE_0D(evt) \ + HVMTRACE_ND(evt, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) #define HVMTRACE_LONG_1D(evt, d1) \ HVMTRACE_2D(evt ## 64, (d1) & 0xFFFFFFFF, (d1) >> 32) diff --git a/xen/include/public/trace.h b/xen/include/public/trace.h index 274f8f6..548acfe 100644 --- a/xen/include/public/trace.h +++ b/xen/include/public/trace.h @@ -227,6 +227,9 @@ #define TRC_HVM_TRAP (TRC_HVM_HANDLER + 0x23) #define TRC_HVM_TRAP_DEBUG (TRC_HVM_HANDLER + 0x24) #define TRC_HVM_VLAPIC (TRC_HVM_HANDLER + 0x25) +#define TRC_HVM_VMPORT_HANDLED (TRC_HVM_HANDLER + 0x26) +#define TRC_HVM_VMPORT_IGNORED (TRC_HVM_HANDLER + 0x27) +#define TRC_HVM_VMPORT_QEMU (TRC_HVM_HANDLER + 0x28) #define TRC_HVM_IOPORT_WRITE (TRC_HVM_HANDLER + 0x216) #define TRC_HVM_IOMEM_WRITE (TRC_HVM_HANDLER + 0x217) -- 1.8.3.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |