d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the VMM_CTRx() family of macros to VCPU_CTRx() to highlight that these

Browse Source 
tracepoints are vcpu-specific.

Add support for tracepoints that are global to the virtual machine - these
tracepoints are called VM_CTRx().
This commit is contained in:
Neel Natu 2013-10-31 05:20:11 +00:00
parent a9b3c1bf05
commit 513c8d338d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=257422
4 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/amd64/vmm/intel/vmx.c
View File

@ -307,8 +307,8 @@ vmx_setjmp_rc2str(int rc)
} }
} }
#define SETJMP_TRACE(vmx, vcpu, vmxctx, regname) \ #define SETJMP_TRACE(vmx, vcpu, vmxctx, regname) \
VMM_CTR1((vmx)->vm, (vcpu), "setjmp trace " #regname " 0x%016lx", \ VCPU_CTR1((vmx)->vm, (vcpu), "setjmp trace " #regname " 0x%016lx", \
(vmxctx)->regname) (vmxctx)->regname)
static void static void
@ -320,14 +320,14 @@ vmx_setjmp_trace(struct vmx *vmx, int vcpu, struct vmxctx *vmxctx, int rc)
panic("vmx_setjmp_trace: invalid vmxctx %p; should be %p", panic("vmx_setjmp_trace: invalid vmxctx %p; should be %p",
vmxctx, &vmx->ctx[vcpu]); vmxctx, &vmx->ctx[vcpu]);
VMM_CTR1((vmx)->vm, (vcpu), "vmxctx = %p", vmxctx); VCPU_CTR1((vmx)->vm, (vcpu), "vmxctx = %p", vmxctx);
VMM_CTR2((vmx)->vm, (vcpu), "setjmp return code %s(%d)", VCPU_CTR2((vmx)->vm, (vcpu), "setjmp return code %s(%d)",
vmx_setjmp_rc2str(rc), rc); vmx_setjmp_rc2str(rc), rc);
host_rsp = host_rip = ~0; host_rsp = host_rip = ~0;
vmread(VMCS_HOST_RIP, &host_rip); vmread(VMCS_HOST_RIP, &host_rip);
vmread(VMCS_HOST_RSP, &host_rsp); vmread(VMCS_HOST_RSP, &host_rsp);
VMM_CTR2((vmx)->vm, (vcpu), "vmcs host_rip 0x%016lx, host_rsp 0x%016lx", VCPU_CTR2((vmx)->vm, (vcpu), "vmcs host_rip 0x%016lx, host_rsp %#lx",
host_rip, host_rsp); host_rip, host_rsp);
SETJMP_TRACE(vmx, vcpu, vmxctx, host_r15); SETJMP_TRACE(vmx, vcpu, vmxctx, host_r15);
@ -886,7 +886,7 @@ static __inline void
vmx_run_trace(struct vmx *vmx, int vcpu) vmx_run_trace(struct vmx *vmx, int vcpu)
{ {
#ifdef KTR #ifdef KTR
VMM_CTR1(vmx->vm, vcpu, "Resume execution at 0x%0lx", vmcs_guest_rip()); VCPU_CTR1(vmx->vm, vcpu, "Resume execution at %#lx", vmcs_guest_rip());
#endif #endif
} }
@ -895,7 +895,7 @@ vmx_exit_trace(struct vmx *vmx, int vcpu, uint64_t rip, uint32_t exit_reason,
int handled) int handled)
{ {
#ifdef KTR #ifdef KTR
VMM_CTR3(vmx->vm, vcpu, "%s %s vmexit at 0x%0lx", VCPU_CTR3(vmx->vm, vcpu, "%s %s vmexit at 0x%0lx",
handled ? "handled" : "unhandled", handled ? "handled" : "unhandled",
exit_reason_to_str(exit_reason), rip); exit_reason_to_str(exit_reason), rip);
#endif #endif
@ -905,7 +905,7 @@ static __inline void
vmx_astpending_trace(struct vmx *vmx, int vcpu, uint64_t rip) vmx_astpending_trace(struct vmx *vmx, int vcpu, uint64_t rip)
{ {
#ifdef KTR #ifdef KTR
VMM_CTR1(vmx->vm, vcpu, "astpending vmexit at 0x%0lx", rip); VCPU_CTR1(vmx->vm, vcpu, "astpending vmexit at 0x%0lx", rip);
#endif #endif
} }
@ -1054,7 +1054,7 @@ vmx_inject_nmi(struct vmx *vmx, int vcpu)
if (error) if (error)
panic("vmx_inject_nmi: vmwrite(intrinfo) %d", error); panic("vmx_inject_nmi: vmwrite(intrinfo) %d", error);
VMM_CTR0(vmx->vm, vcpu, "Injecting vNMI"); VCPU_CTR0(vmx->vm, vcpu, "Injecting vNMI");
/* Clear the request */ /* Clear the request */
vm_nmi_clear(vmx->vm, vcpu); vm_nmi_clear(vmx->vm, vcpu);
@ -1067,7 +1067,7 @@ vmx_inject_nmi(struct vmx *vmx, int vcpu)
*/ */
vmx_set_nmi_window_exiting(vmx, vcpu); vmx_set_nmi_window_exiting(vmx, vcpu);
VMM_CTR0(vmx->vm, vcpu, "Enabling NMI window exiting"); VCPU_CTR0(vmx->vm, vcpu, "Enabling NMI window exiting");
return (1); return (1);
} }
@ -1133,7 +1133,7 @@ vmx_inject_interrupts(struct vmx *vmx, int vcpu)
/* Update the Local APIC ISR */ /* Update the Local APIC ISR */
lapic_intr_accepted(vmx->vm, vcpu, vector); lapic_intr_accepted(vmx->vm, vcpu, vector);
VMM_CTR1(vmx->vm, vcpu, "Injecting hwintr at vector %d", vector); VCPU_CTR1(vmx->vm, vcpu, "Injecting hwintr at vector %d", vector);
return; return;
@ -1144,7 +1144,7 @@ vmx_inject_interrupts(struct vmx *vmx, int vcpu)
*/ */
vmx_set_int_window_exiting(vmx, vcpu); vmx_set_int_window_exiting(vmx, vcpu);
VMM_CTR0(vmx->vm, vcpu, "Enabling interrupt window exiting"); VCPU_CTR0(vmx->vm, vcpu, "Enabling interrupt window exiting");
} }
static int static int
@ -1434,7 +1434,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
case EXIT_REASON_INTR_WINDOW: case EXIT_REASON_INTR_WINDOW:
vmm_stat_incr(vmx->vm, vcpu, VMEXIT_INTR_WINDOW, 1); vmm_stat_incr(vmx->vm, vcpu, VMEXIT_INTR_WINDOW, 1);
vmx_clear_int_window_exiting(vmx, vcpu); vmx_clear_int_window_exiting(vmx, vcpu);
VMM_CTR0(vmx->vm, vcpu, "Disabling interrupt window exiting"); VCPU_CTR0(vmx->vm, vcpu, "Disabling interrupt window exiting");
return (1); return (1);
case EXIT_REASON_EXT_INTR: case EXIT_REASON_EXT_INTR:
/* /*
@ -1457,7 +1457,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
/* Exit to allow the pending virtual NMI to be injected */ /* Exit to allow the pending virtual NMI to be injected */
vmm_stat_incr(vmx->vm, vcpu, VMEXIT_NMI_WINDOW, 1); vmm_stat_incr(vmx->vm, vcpu, VMEXIT_NMI_WINDOW, 1);
vmx_clear_nmi_window_exiting(vmx, vcpu); vmx_clear_nmi_window_exiting(vmx, vcpu);
VMM_CTR0(vmx->vm, vcpu, "Disabling NMI window exiting"); VCPU_CTR0(vmx->vm, vcpu, "Disabling NMI window exiting");
return (1); return (1);
case EXIT_REASON_INOUT: case EXIT_REASON_INOUT:
vmm_stat_incr(vmx->vm, vcpu, VMEXIT_INOUT, 1); vmm_stat_incr(vmx->vm, vcpu, VMEXIT_INOUT, 1);
@ -1658,7 +1658,7 @@ vmx_run(void *arg, int vcpu, register_t rip, pmap_t pmap)
if (!handled) if (!handled)
vmm_stat_incr(vmx->vm, vcpu, VMEXIT_USERSPACE, 1); vmm_stat_incr(vmx->vm, vcpu, VMEXIT_USERSPACE, 1);
VMM_CTR1(vmx->vm, vcpu, "goto userland: exitcode %d",vmexit->exitcode); VCPU_CTR1(vmx->vm, vcpu, "goto userland: exitcode %d",vmexit->exitcode);
/* /*
* XXX * XXX

4
sys/amd64/vmm/io/vlapic.c
View File

@ -48,10 +48,10 @@ __FBSDID("$FreeBSD$");
#include "vlapic.h" #include "vlapic.h"
#define VLAPIC_CTR0(vlapic, format) \ #define VLAPIC_CTR0(vlapic, format) \
VMM_CTR0((vlapic)->vm, (vlapic)->vcpuid, format) VCPU_CTR0((vlapic)->vm, (vlapic)->vcpuid, format)
#define VLAPIC_CTR1(vlapic, format, p1) \ #define VLAPIC_CTR1(vlapic, format, p1) \
VMM_CTR1((vlapic)->vm, (vlapic)->vcpuid, format, p1) VCPU_CTR1((vlapic)->vm, (vlapic)->vcpuid, format, p1)
#define VLAPIC_CTR_IRR(vlapic, msg) \ #define VLAPIC_CTR_IRR(vlapic, msg) \
do { \ do { \

4
sys/amd64/vmm/vmm.c
View File

@ -918,8 +918,8 @@ vm_handle_paging(struct vm *vm, int vcpuid, boolean_t *retu)
map = &vm->vmspace->vm_map; map = &vm->vmspace->vm_map;
rv = vm_fault(map, vme->u.paging.gpa, ftype, VM_FAULT_NORMAL); rv = vm_fault(map, vme->u.paging.gpa, ftype, VM_FAULT_NORMAL);
VMM_CTR3(vm, vcpuid, "vm_handle_paging rv = %d, gpa = %#lx, ftype = %d", VCPU_CTR3(vm, vcpuid, "vm_handle_paging rv = %d, gpa = %#lx, "
rv, vme->u.paging.gpa, ftype); "ftype = %d", rv, vme->u.paging.gpa, ftype);
if (rv != KERN_SUCCESS) if (rv != KERN_SUCCESS)
return (EFAULT); return (EFAULT);

20
sys/amd64/vmm/vmm_ktr.h
View File

@ -34,18 +34,30 @@
#define KTR_VMM KTR_GEN #define KTR_VMM KTR_GEN
#define VMM_CTR0(vm, vcpuid, format) \ #define VCPU_CTR0(vm, vcpuid, format) \
CTR3(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu) CTR3(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu)
#define VMM_CTR1(vm, vcpuid, format, p1) \ #define VCPU_CTR1(vm, vcpuid, format, p1) \
CTR4(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \ CTR4(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
(p1)) (p1))
#define VMM_CTR2(vm, vcpuid, format, p1, p2) \ #define VCPU_CTR2(vm, vcpuid, format, p1, p2) \
CTR5(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \ CTR5(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
(p1), (p2)) (p1), (p2))
#define VMM_CTR3(vm, vcpuid, format, p1, p2, p3) \ #define VCPU_CTR3(vm, vcpuid, format, p1, p2, p3) \
CTR6(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \ CTR6(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
(p1), (p2), (p3)) (p1), (p2), (p3))
#define VM_CTR0(vm, format) \
CTR2(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu)
#define VM_CTR1(vm, format, p1) \
CTR3(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu, (p1))
#define VM_CTR2(vm, format, p1, p2) \
CTR4(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu, (p1), (p2))
#define VM_CTR3(vm, format, p1, p2, p3) \
CTR5(KTR_VMM, "vm %s(%d): " format, vm_name((vm)), curcpu, (p1), (p2), (p3))
#endif #endif