From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Slutz Subject: Re: [PATCH v12 8/8] Add xentrace to vmware_port Date: Mon, 29 Jun 2015 12:11:34 -0400 Message-ID: <55916E36.6010707@Gmail.com> References: <1435447665-5433-1-git-send-email-Don.Slutz@Gmail.com> <1435447665-5433-9-git-send-email-Don.Slutz@Gmail.com> <55915C17.6090604@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <55915C17.6090604@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Andrew Cooper , xen-devel@lists.xen.org Cc: Kevin Tian , Keir Fraser , Ian Campbell , Stefano Stabellini , Jun Nakajima , Eddie Dong , Ian Jackson , Don Slutz , Tim Deegan , George Dunlap , Aravind Gopalakrishnan , Jan Beulich , Boris Ostrovsky , Suravee Suthikulpanit List-Id: xen-devel@lists.xenproject.org On 06/29/15 10:54, Andrew Cooper wrote: > On 28/06/15 00:27, Don Slutz wrote: >> From: Don Slutz >> >> Also added missing TRAP_DEBUG & VLAPIC. >> >> Signed-off-by: Don Slutz >> Acked-by: Ian Campbell >> CC: Don Slutz >> --- >> 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/io.c | 3 +++ >> xen/arch/x86/hvm/vmware/vmport.c | 15 ++++++++++++--- >> xen/include/asm-x86/hvm/trace.h | 22 ++++++++++++++++++++++ >> xen/include/public/trace.h | 3 +++ >> 5 files changed, 45 insertions(+), 3 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/io.c b/xen/arch/x86/hvm/io.c >> index c1379bf..e2d947b 100644 >> --- a/xen/arch/x86/hvm/io.c >> +++ b/xen/arch/x86/hvm/io.c >> @@ -206,6 +206,9 @@ void hvm_io_assist(ioreq_t *p) >> regs->_edx = vr->edx; >> regs->_esi = vr->esi; >> regs->_edi = vr->edi; >> + HVMTRACE_ND(VMPORT_QEMU, 0, 1/*cycles*/, 6, >> + p->data, regs->_ebx, regs->_ecx, >> + regs->_edx, regs->_esi, regs->_edi); >> } >> } >> if ( vio->io_size == 4 ) /* Needs zero extension. */ >> diff --git a/xen/arch/x86/hvm/vmware/vmport.c b/xen/arch/x86/hvm/vmware/vmport.c >> index 5e14402..de29e2f 100644 >> --- a/xen/arch/x86/hvm/vmware/vmport.c >> +++ b/xen/arch/x86/hvm/vmware/vmport.c >> @@ -16,6 +16,7 @@ >> #include >> #include >> #include >> +#include >> >> #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,18 @@ static int vmport_ioport(int dir, uint32_t port, uint32_t bytes, uint32_t *val) >> /* Let backing DM handle */ >> return X86EMUL_UNHANDLEABLE; >> } >> + HVMTRACE_ND7(VMPORT_HANDLED, 0, 0/*cycles*/, 7, >> + 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/include/asm-x86/hvm/trace.h b/xen/include/asm-x86/hvm/trace.h >> index de802a6..0ad805f 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) >> @@ -83,6 +86,25 @@ >> } \ >> } while(0) >> >> +#define HVMTRACE_ND7(evt, modifier, cycles, count, d1, d2, d3, d4, d5, d6, d7) \ > 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) > >> + do { \ >> + if ( unlikely(tb_init_done) && DO_TRC_HVM_ ## evt ) \ >> + { \ >> + struct { \ >> + u32 d[7]; \ >> + } _d; \ > = { d1, d2, d3, d4, d5, d6, d7 } > > will be far shorter, linewise. Ok, will do. -Don Slutz > ~Andrew > >> + _d.d[0]=(d1); \ >> + _d.d[1]=(d2); \ >> + _d.d[2]=(d3); \ >> + _d.d[3]=(d4); \ >> + _d.d[4]=(d5); \ >> + _d.d[5]=(d6); \ >> + _d.d[6]=(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) \ >> diff --git a/xen/include/public/trace.h b/xen/include/public/trace.h >> index 5211ae7..16b87f9 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)