HVM-582 remove more XXXs

HVM-583 KVM DTrace probes should all use KVM_TRACE macros

Author: bcantrill

kvm.c

@@ -449,16 +449,10 @@ kvm_ctx_restore(void *arg)
 	kvm_arch_vcpu_load(vcpu, cpu);
 }
 
-#ifdef XXX_KVM_DECLARATION
-#define	pfn_valid(pfn) ((pfn < physmax) && (pfn != PFN_INVALID))
-#else
-#define	pfn_valid(pfn) (pfn != PFN_INVALID)
-#endif
-
 inline int
 kvm_is_mmio_pfn(pfn_t pfn)
 {
-	if (pfn_valid(pfn)) {
+	if (pfn != PFN_INVALID) {
 #ifdef XXX
 		struct page *page = compound_head(pfn_to_page(pfn));
 		return (PageReserved(page));
@@ -936,8 +930,6 @@ __kvm_set_memory_region(struct kvm *kvmp,
 		 * 	- kvm_is_visible_gfn (mmu_check_roots)
 		 */
 		kvm_arch_flush_shadow(kvmp);
-
-		/* XXX: how many bytes to free??? */
 		kmem_free(old_memslots, sizeof (struct kvm_memslots));
 	}
 
@@ -1299,18 +1291,8 @@ kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len)
 	if (kvm_is_error_hva(addr))
 		return (-EFAULT);
 
-#ifdef XXX
-	pagefault_disable();
-#else
-	XXX_KVM_PROBE;
-#endif
-
 	r = copyin((caddr_t)addr + offset, data, len);
-#ifdef XXX
-	pagefault_enable();
-#else
-	XXX_KVM_PROBE;
-#endif
+
 	if (r)
 		return (-EFAULT);
 
@@ -1329,7 +1311,6 @@ kvm_write_guest_page(struct kvm *kvm,
 	if (kvm_is_error_hva(addr))
 		return (-EFAULT);
 
-	/* XXX - addr could be user or kernel */
 	if (addr >= kernelbase) {
 		bcopy(data, (caddr_t)(addr + offset), len);
 	} else {
@@ -1778,25 +1759,15 @@ kvm_init(void *opaque)
 
 
 void
-kvm_guest_exit(void)
+kvm_guest_exit(struct kvm_vcpu *vcpu)
 {
-#ifdef XXX
-	account_system_vtime(current);
-	current->flags &= ~PF_VCPU;
-#else
-	XXX_KVM_PROBE;
-#endif
+	KVM_TRACE1(guest__exit, struct kvm_vcpu *, vcpu);
 }
 
 void
-kvm_guest_enter(void)
+kvm_guest_enter(struct kvm_vcpu *vcpu)
 {
-#ifdef XXX
-	account_system_vtime(current);
-	current->flags |= PF_VCPU;
-#else
-	XXX_KVM_PROBE;
-#endif
+	KVM_TRACE1(guest__entry, struct kvm_vcpu *, vcpu);
 }
 
 /*
@@ -2017,21 +1988,13 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
 	minor_t minor;
 	kvm_devstate_t *ksp;
 	void *argp = (void *)arg;
+	struct kvm_pit_config pit;
 
 	minor = getminor(dev);
 	ksp = ddi_get_soft_state(kvm_state, minor);
 	if (ksp == NULL)
 		return (ENXIO);
 
-	union {
-		struct kvm_pit_state ps;
-		struct kvm_pit_state2 ps2;
-#ifdef XXX_KVM_DECLARATION
-		struct kvm_memory_alias alias;
-#endif
-		struct kvm_pit_config pit_config;
-	} u;
-
 	struct {
 		int cmd;		/* command */
 		void *func;		/* function to call */
@@ -2211,8 +2174,7 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
 		break;
 
 	case KVM_CREATE_PIT2:
-		if (copyin(argp, &u.pit_config,
-		    sizeof (struct kvm_pit_config)) != 0) {
+		if (copyin(argp, &pit, sizeof (struct kvm_pit_config)) != 0) {
 			rval = EFAULT;
 			break;
 		}
@@ -2227,7 +2189,7 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
 		}
 
 		if (cmd == KVM_CREATE_PIT) {
-			u.pit_config.flags = KVM_PIT_SPEAKER_DUMMY;
+			pit.flags = KVM_PIT_SPEAKER_DUMMY;
 		} else {
 			ASSERT(cmd == KVM_CREATE_PIT2);
 		}
@@ -2237,7 +2199,7 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
 		if (kvmp->arch.vpit != NULL) {
 			rval = EEXIST;
 		} else if ((kvmp->arch.vpit = kvm_create_pit(kvmp,
-		    u.pit_config.flags)) == NULL) {
+		    pit.flags)) == NULL) {
 			rval = ENOMEM;
 		}
 
@@ -2739,11 +2701,9 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
 		*rv = 0;
 		break;
 	}
+
 	default:
-#ifndef XXX
-		XXX_KVM_PROBE;
-		DTRACE_PROBE1(kvm__xxx__ioctl, int, cmd);
-#endif
+		KVM_TRACE1(bad__ioctl, int, cmd);
 		rval = EINVAL;  /* x64, others may do other things... */
 	}
 
@@ -2820,7 +2780,7 @@ kvm_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len,
 	    PAGESIZE*2, PROT_READ | PROT_WRITE | PROT_USER, DEVMAP_DEFAULTS,
 	    NULL);
 
-	*maplen = PAGESIZE*2;
+	*maplen = PAGESIZE * 2;
 
 	return (res);
 }

kvm_host.h

@@ -444,8 +444,8 @@ extern void kvm_free_irq_source_id(struct kvm *, int);
 /* For vcpu->arch.iommu_flags */
 #define	KVM_IOMMU_CACHE_COHERENCY	0x1
 
-extern void kvm_guest_enter(void);
-extern void kvm_guest_exit(void);
+extern void kvm_guest_enter(struct kvm_vcpu *);
+extern void kvm_guest_exit(struct kvm_vcpu *);
 
 #ifndef KVM_ARCH_HAS_UNALIAS_INSTANTIATION
 #define	unalias_gfn_instantiation unalias_gfn

kvm_impl.h

@@ -13,6 +13,9 @@
 #define	XXX_KVM_SYNC_PROBE DTRACE_PROBE2(kvm__xxx__sync, \
 	char *, __FILE__, int, __LINE__)
 
+#define	KVM_TRACE(name)							\
+	DTRACE_PROBE(kvm__##name);
+
 #define	KVM_TRACE1(name, type1, arg1)					\
 	DTRACE_PROBE1(kvm__##name, type1, arg1);
 

kvm_vmx.c

@@ -433,7 +433,7 @@ __invvpid(int ext, uint16_t vpid, gva_t gva)
 		uint64_t gva;
 	} operand = { vpid, 0, gva };
 
-	DTRACE_PROBE2(kvm__vmx__invvpid, int, vpid, uint64_t, gva);
+	KVM_TRACE2(vmx__invvpid, int, vpid, uint64_t, gva);
 
 	/* BEGIN CSTYLED */
 	__asm__ volatile (ASM_VMX_INVVPID
@@ -450,7 +450,7 @@ __invept(int ext, uint64_t eptp, gpa_t gpa)
 		uint64_t eptp, gpa;
 	} operand = {eptp, gpa};
 
-	DTRACE_PROBE2(kvm__vmx__invept, uint64_t, eptp, uint64_t, gpa);
+	KVM_TRACE2(vmx__invept, uint64_t, eptp, uint64_t, gpa);
 
 	/* BEGIN CSTYLED */
 	__asm__ volatile (ASM_VMX_INVEPT
@@ -477,7 +477,7 @@ vmcs_clear(uint64_t vmcs_pa)
 {
 	unsigned char error;
 
-	DTRACE_PROBE1(kvm__vmx__vmclear, uint64_t, vmcs_pa);
+	KVM_TRACE1(vmx__vmclear, uint64_t, vmcs_pa);
 
 	/*CSTYLED*/
 	__asm__ volatile (__ex(ASM_VMX_VMCLEAR_RAX) "\n\tsetna %0\n"
@@ -552,7 +552,7 @@ vmcs_readl(unsigned long field)
 	__asm__ volatile (ASM_VMX_VMREAD_RDX_RAX
 	    : "=a"(value) : "d"(field) : "cc");
 
-	DTRACE_PROBE2(kvm__vmx__vmread, long, field, long, value);
+	KVM_TRACE2(vmx__vmread, long, field, long, value);
 
 	return (value);
 }
@@ -594,7 +594,7 @@ __vmwrite(unsigned long field, unsigned long value)
 	    : "=q"(err) : "a" (value), "d" (field)
 	    : "cc", "memory");
 
-	DTRACE_PROBE3(kvm__vmx__vmwrite, long, field,
+	KVM_TRACE3(vmx__vmwrite, long, field,
 	    long, value, uint8_t, err);
 
 	/* XXX the following should be ifdef debug... */
@@ -841,7 +841,7 @@ vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 
 		current_vmcs[cpu] = vmx->vmcs;
 
-		DTRACE_PROBE1(kvm__vmx__vmptrld, uint64_t, phys_addr);
+		KVM_TRACE1(vmx__vmptrld, uint64_t, phys_addr);
 
 		/*CSTYLED*/
 		__asm__ volatile (ASM_VMX_VMPTRLD_RAX "; setna %0"
@@ -1308,7 +1308,7 @@ vmx_hardware_enable(void *garbage)
 		    FEATURE_CONTROL_VMXON_ENABLED);
 	}
 
-	DTRACE_PROBE1(kvm__vmx__vmxon, uint64_t, phys_addr);
+	KVM_TRACE1(vmx__vmxon, uint64_t, phys_addr);
 
 	setcr4(getcr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */
 	/* BEGIN CSTYLED */
@@ -1329,7 +1329,7 @@ vmx_hardware_enable(void *garbage)
 static void
 kvm_cpu_vmxoff(void)
 {
-	DTRACE_PROBE(kvm__vmx__vmxoff);
+	KVM_TRACE(vmx__vmxoff);
 
 	/* BEGIN CSTYLED */
 	__asm__ volatile ((ASM_VMX_VMXOFF) : : : "cc");
@@ -3254,8 +3254,7 @@ handle_cr(struct kvm_vcpu *vcpu)
 	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);
 	cr = exit_qualification & 15;
 	reg = (exit_qualification >> 8) & 15;
-	DTRACE_PROBE3(kvm__cr, int, cr, int, reg, int,
-	    (exit_qualification >> 4) & 3);
+	KVM_TRACE3(cr, int, cr, int, reg, int, (exit_qualification >> 4) & 3);
 	switch ((exit_qualification >> 4) & 3) {
 	case 0: /* mov to cr */
 		val = kvm_register_read(vcpu, reg);
@@ -3903,7 +3902,7 @@ vmx_handle_exit(struct kvm_vcpu *vcpu)
 
 	/* Always read the guest rip when exiting */
 	rip = vmcs_readl(GUEST_RIP);
-	DTRACE_PROBE2(kvm__vexit, unsigned long, rip, uint32_t, exit_reason);
+	KVM_TRACE2(vexit, unsigned long, rip, uint32_t, exit_reason);
 
 	/* If guest state is invalid, start emulating */
 	if (vmx->emulation_required && emulate_invalid_guest_state)
@@ -4128,7 +4127,7 @@ vmx_vcpu_run(struct kvm_vcpu *vcpu)
 	if (test_bit(VCPU_REGS_RIP, (unsigned long *)&vcpu->arch.regs_dirty))
 		vmcs_writel(GUEST_RIP, vcpu->arch.regs[VCPU_REGS_RIP]);
 
-	DTRACE_PROBE1(kvm__vrun, unsigned long, vcpu->arch.regs[VCPU_REGS_RIP]);
+	KVM_TRACE1(vrun, unsigned long, vcpu->arch.regs[VCPU_REGS_RIP]);
 
 	/*
 	 * When single-stepping over STI and MOV SS, we must clear the
@@ -4146,9 +4145,9 @@ vmx_vcpu_run(struct kvm_vcpu *vcpu)
 	vmcs_writel(HOST_CR0, read_cr0());
 
 	if (vmx->launched) {
-		DTRACE_PROBE1(kvm__vmx__vmresume, struct vcpu_vmx *, vmx);
+		KVM_TRACE1(vmx__vmresume, struct vcpu_vmx *, vmx);
 	} else {
-		DTRACE_PROBE1(kvm__vmx__vmlaunch, struct vcpu_vmx *, vmx);
+		KVM_TRACE1(vmx__vmlaunch, struct vcpu_vmx *, vmx);
 	}
 
 	__asm__(