Re: [PATCH v9 09/13] Add xentrace to vmware_port

[Andrew Cooper <andrew.cooper3@citrix.com>]

On 16/02/15 23:05, Don Slutz wrote:
> Also added missing TRAP_DEBUG & VLAPIC.
>
> Signed-off-by: Don Slutz <dslutz@verizon.com>

This patch doesn't actually add any trace points.

> ---
> 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/vmware/vmport.c |  4 +++-
>  xen/include/asm-x86/hvm/trace.h  | 22 ++++++++++++++++++++++
>  xen/include/public/trace.h       |  3 +++
>  4 files changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/tools/xentrace/formats b/tools/xentrace/formats
> index 5d7b72a..eec65f4 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 ebx = 0x%(3)08x ecx = 0x%(4)08x edx = 0x%(5)08x esi = 0x%(6)08x edi = 0x%(7)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/vmware/vmport.c b/xen/arch/x86/hvm/vmware/vmport.c
> index 131bafd..fb191a2 100644
> --- a/xen/arch/x86/hvm/vmware/vmport.c
> +++ b/xen/arch/x86/hvm/vmware/vmport.c
> @@ -17,6 +17,7 @@
>  #include <asm/hvm/hvm.h>
>  #include <asm/hvm/support.h>
>  #include <asm/hvm/vmport.h>
> +#include <asm/hvm/trace.h>
>  
>  #include "backdoor_def.h"
>  
> @@ -55,8 +56,9 @@ int vmport_ioport(int dir, uint32_t port, uint32_t bytes, uint32_t *val)
>          uint64_t value;
>          struct vcpu *curr = current;
>          struct domain *d = curr->domain;
> +        uint16_t cmd = regs->_ecx;
>  
> -        switch ( regs->_ecx & 0xffff )
> +        switch ( cmd )

This hunk really looks like it belongs in patch 5.

~Andrew

>          {
>          case BDOOR_CMD_GETMHZ:
>              new_eax = d->arch.tsc_khz / 1000;
> 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) \
> +    do {                                                                  \
> +        if ( unlikely(tb_init_done) && DO_TRC_HVM_ ## evt )               \
> +        {                                                                 \
> +            struct {                                                      \
> +                u32 d[7];                                                 \
> +            } _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);                                                 \
> +            _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)