From d4f59ae5164748e530cad42bd54b9b909d0c1ee8 Mon Sep 17 00:00:00 2001 From: Patrick Mooney Date: Thu, 19 May 2022 18:54:29 +0000 Subject: 14703 clean KTR from bhyve Reviewed by: Andy Fiddaman Approved by: Gordon Ross --- usr/src/compat/bhyve/sys/ktr.h | 27 ---------- usr/src/uts/intel/io/vmm/amd/svm.c | 20 +------ usr/src/uts/intel/io/vmm/intel/vmx.c | 33 +++--------- usr/src/uts/intel/io/vmm/io/ppt.c | 1 - usr/src/uts/intel/io/vmm/io/vatpic.c | 38 ++----------- usr/src/uts/intel/io/vmm/io/vatpit.c | 5 +- usr/src/uts/intel/io/vmm/io/vhpet.c | 29 ++-------- usr/src/uts/intel/io/vmm/io/vioapic.c | 27 ++-------- usr/src/uts/intel/io/vmm/io/vlapic.c | 31 ++--------- usr/src/uts/intel/io/vmm/io/vlapic_priv.h | 40 -------------- usr/src/uts/intel/io/vmm/io/vrtc.c | 56 +++---------------- usr/src/uts/intel/io/vmm/sys/vmm_kernel.h | 3 +- usr/src/uts/intel/io/vmm/vmm.c | 36 +------------ usr/src/uts/intel/io/vmm/vmm_instruction_emul.c | 1 - usr/src/uts/intel/io/vmm/vmm_ktr.h | 72 ------------------------- usr/src/uts/intel/io/vmm/vmm_lapic.c | 8 +-- usr/src/uts/intel/io/vmm/vmm_sol_dev.c | 2 +- usr/src/uts/intel/io/vmm/x86.c | 3 -- 18 files changed, 34 insertions(+), 398 deletions(-) delete mode 100644 usr/src/compat/bhyve/sys/ktr.h delete mode 100644 usr/src/uts/intel/io/vmm/vmm_ktr.h diff --git a/usr/src/compat/bhyve/sys/ktr.h b/usr/src/compat/bhyve/sys/ktr.h deleted file mode 100644 index 96c499ef18..0000000000 --- a/usr/src/compat/bhyve/sys/ktr.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2013 Pluribus Networks Inc. - */ - -#ifndef _COMPAT_FREEBSD_SYS_KTR_H_ -#define _COMPAT_FREEBSD_SYS_KTR_H_ - -#define CTR0(m, format) -#define CTR1(m, format, p1) -#define CTR2(m, format, p1, p2) -#define CTR3(m, format, p1, p2, p3) -#define CTR4(m, format, p1, p2, p3, p4) -#define CTR5(m, format, p1, p2, p3, p4, p5) -#define CTR6(m, d, p1, p2, p3, p4, p5, p6) - -#endif /* _COMPAT_FREEBSD_SYS_KTR_H_ */ diff --git a/usr/src/uts/intel/io/vmm/amd/svm.c b/usr/src/uts/intel/io/vmm/amd/svm.c index 993e759fc6..d6b271a75c 100644 --- a/usr/src/uts/intel/io/vmm/amd/svm.c +++ b/usr/src/uts/intel/io/vmm/amd/svm.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include "vmm_lapic.h" #include "vmm_stat.h" -#include "vmm_ktr.h" #include "vmm_ioport.h" #include "vatpic.h" #include "vlapic.h" @@ -275,8 +274,6 @@ svm_set_intercept(struct svm_softc *sc, int vcpu, int idx, uint32_t bitmask, if (ctrl->intercept[idx] != oldval) { svm_set_dirty(sc, vcpu, VMCB_CACHE_I); - VCPU_CTR3(sc->vm, vcpu, "intercept[%d] modified " - "from %x to %x", idx, oldval, ctrl->intercept[idx]); } } @@ -945,8 +942,6 @@ svm_save_exitintinfo(struct svm_softc *svm_sc, int vcpu) * If a #VMEXIT happened during event delivery then record the event * that was being delivered. */ - VCPU_CTR2(svm_sc->vm, vcpu, "SVM:Pending INTINFO(0x%lx), vector=%d.\n", - intinfo, VMCB_EXITINTINFO_VECTOR(intinfo)); vmm_stat_incr(svm_sc->vm, vcpu, VCPU_EXITINTINFO, 1); /* * Relies on match between VMCB exitintinfo format and bhyve-generic @@ -992,7 +987,6 @@ svm_enable_intr_window_exiting(struct svm_softc *sc, int vcpu) VERIFY((ctrl->eventinj & VMCB_EVENTINJ_VALID) != 0 || (state->rflags & PSL_I) == 0 || ctrl->intr_shadow); - VCPU_CTR0(sc->vm, vcpu, "Enable intr window exiting"); ctrl->v_irq |= V_IRQ; ctrl->v_intr_prio |= V_IGN_TPR; ctrl->v_intr_vector = 0; @@ -1013,7 +1007,6 @@ svm_disable_intr_window_exiting(struct svm_softc *sc, int vcpu) return; } - VCPU_CTR0(sc->vm, vcpu, "Disable intr window exiting"); ctrl->v_irq &= ~V_IRQ; ctrl->v_intr_vector = 0; svm_set_dirty(sc, vcpu, VMCB_CACHE_TPR); @@ -1038,7 +1031,6 @@ svm_clear_nmi_blocking(struct svm_softc *sc, int vcpu) struct vmcb_ctrl *ctrl; KASSERT(svm_nmi_blocked(sc, vcpu), ("vNMI already unblocked")); - VCPU_CTR0(sc->vm, vcpu, "vNMI blocking cleared"); /* * When the IRET intercept is cleared the vcpu will attempt to execute * the "iret" when it runs next. However, it is possible to inject @@ -1498,23 +1490,15 @@ svm_vmexit(struct svm_softc *svm_sc, int vcpu, struct vm_exit *vmexit) case VMCB_EXIT_NPF: /* EXITINFO2 contains the faulting guest physical address */ if (info1 & VMCB_NPF_INFO1_RSV) { - VCPU_CTR2(svm_sc->vm, vcpu, "nested page fault with " - "reserved bits set: info1(%lx) info2(%lx)", - info1, info2); + /* nested fault with reserved bits set */ } else if (vm_mem_allocated(svm_sc->vm, vcpu, info2)) { vmexit->exitcode = VM_EXITCODE_PAGING; vmexit->u.paging.gpa = info2; vmexit->u.paging.fault_type = npf_fault_type(info1); vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_NESTED_FAULT, 1); - VCPU_CTR3(svm_sc->vm, vcpu, "nested page fault " - "on gpa %lx/%lx at rip %lx", - info2, info1, state->rip); } else if (svm_npf_emul_fault(info1)) { svm_handle_mmio_emul(svm_sc, vcpu, vmexit, info2); vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_MMIO_EMUL, 1); - VCPU_CTR3(svm_sc->vm, vcpu, "mmio_emul fault " - "for gpa %lx/%lx at rip %lx", - info2, info1, state->rip); } break; case VMCB_EXIT_MONITOR: @@ -2015,11 +1999,9 @@ svm_vmrun(void *arg, int vcpu, uint64_t rip) ctrl->vmcb_clean = vmcb_clean & ~vcpustate->dirty; vcpustate->dirty = 0; - VCPU_CTR1(vm, vcpu, "vmcb clean %x", ctrl->vmcb_clean); /* Launch Virtual Machine. */ vcpu_ustate_change(vm, vcpu, VU_RUN); - VCPU_CTR1(vm, vcpu, "Resume execution at %lx", state->rip); svm_dr_enter_guest(gctx); svm_launch(vmcb_pa, gctx, get_pcpu()); svm_dr_leave_guest(gctx); diff --git a/usr/src/uts/intel/io/vmm/intel/vmx.c b/usr/src/uts/intel/io/vmm/intel/vmx.c index 58d1c8361e..4699168af1 100644 --- a/usr/src/uts/intel/io/vmm/intel/vmx.c +++ b/usr/src/uts/intel/io/vmm/intel/vmx.c @@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$"); #include "vmm_lapic.h" #include "vmm_host.h" #include "vmm_ioport.h" -#include "vmm_ktr.h" #include "vmm_stat.h" #include "vatpic.h" #include "vlapic.h" @@ -1053,23 +1052,22 @@ CTASSERT((PROCBASED_CTLS_ONE_SETTING & PROCBASED_INT_WINDOW_EXITING) != 0); static __inline void vmx_set_int_window_exiting(struct vmx *vmx, int vcpu) { - if ((vmx->cap[vcpu].proc_ctls & PROCBASED_INT_WINDOW_EXITING) == 0) { + /* Enable interrupt window exiting */ vmx->cap[vcpu].proc_ctls |= PROCBASED_INT_WINDOW_EXITING; vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - VCPU_CTR0(vmx->vm, vcpu, "Enabling interrupt window exiting"); } } static __inline void vmx_clear_int_window_exiting(struct vmx *vmx, int vcpu) { - KASSERT((vmx->cap[vcpu].proc_ctls & PROCBASED_INT_WINDOW_EXITING) != 0, ("intr_window_exiting not set: %x", vmx->cap[vcpu].proc_ctls)); + + /* Disable interrupt window exiting */ vmx->cap[vcpu].proc_ctls &= ~PROCBASED_INT_WINDOW_EXITING; vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - VCPU_CTR0(vmx->vm, vcpu, "Disabling interrupt window exiting"); } static __inline bool @@ -1341,10 +1339,6 @@ vmx_inject_vlapic(struct vmx *vmx, int vcpu, struct vlapic *vlapic) */ if (status_new > status_old) { vmcs_write(VMCS_GUEST_INTR_STATUS, status_new); - VCPU_CTR2(vlapic->vm, vlapic->vcpuid, - "vmx_inject_interrupts: guest_intr_status " - "changed from 0x%04x to 0x%04x", - status_old, status_new); } /* @@ -1433,7 +1427,6 @@ vmx_restore_nmi_blocking(struct vmx *vmx, int vcpuid) { uint32_t gi; - VCPU_CTR0(vmx->vm, vcpuid, "Restore Virtual-NMI blocking"); gi = vmcs_read(VMCS_GUEST_INTERRUPTIBILITY); gi |= VMCS_INTERRUPTIBILITY_NMI_BLOCKING; vmcs_write(VMCS_GUEST_INTERRUPTIBILITY, gi); @@ -1444,7 +1437,6 @@ vmx_clear_nmi_blocking(struct vmx *vmx, int vcpuid) { uint32_t gi; - VCPU_CTR0(vmx->vm, vcpuid, "Clear Virtual-NMI blocking"); gi = vmcs_read(VMCS_GUEST_INTERRUPTIBILITY); gi &= ~VMCS_INTERRUPTIBILITY_NMI_BLOCKING; vmcs_write(VMCS_GUEST_INTERRUPTIBILITY, gi); @@ -2182,7 +2174,6 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit) * as most VM-exit fields are not populated as usual. */ if (reason == EXIT_REASON_MCE_DURING_ENTRY) { - VCPU_CTR0(vmx->vm, vcpu, "Handling MCE during VM-entry"); vmm_call_trap(T_MCE); return (1); } @@ -2276,10 +2267,6 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit) } vmexit->exitcode = VM_EXITCODE_TASK_SWITCH; SDT_PROBE4(vmm, vmx, exit, taskswitch, vmx, vcpu, vmexit, ts); - VCPU_CTR4(vmx->vm, vcpu, "task switch reason %d, tss 0x%04x, " - "%s errcode 0x%016lx", ts->reason, ts->tsssel, - ts->ext ? "external" : "internal", - ((uint64_t)ts->errcode << 32) | ts->errcode_valid); break; case EXIT_REASON_CR_ACCESS: vmm_stat_incr(vmx->vm, vcpu, VMEXIT_CR_ACCESS, 1); @@ -2407,7 +2394,6 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit) * the machine check back into the guest. */ if (intr_vec == IDT_MC) { - VCPU_CTR0(vmx->vm, vcpu, "Vectoring to MCE handler"); vmm_call_trap(T_MCE); return (1); } @@ -2444,8 +2430,6 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit) errcode_valid = 1; errcode = vmcs_read(VMCS_EXIT_INTR_ERRCODE); } - VCPU_CTR2(vmx->vm, vcpu, "Reflecting exception %d/%x into " - "the guest", intr_vec, errcode); SDT_PROBE5(vmm, vmx, exit, exception, vmx, vcpu, vmexit, intr_vec, errcode); error = vm_inject_exception(vmx->vm, vcpu, intr_vec, @@ -2924,9 +2908,6 @@ vmx_run(void *arg, int vcpu, uint64_t rip) vmexit->exitcode); } - VCPU_CTR1(vm, vcpu, "returning from vmx_run: exitcode %d", - vmexit->exitcode); - vmcs_clear(vmcs_pa); vmx_msr_guest_exit(vmx, vcpu); @@ -3020,7 +3001,7 @@ vmx_getreg(void *arg, int vcpu, int reg, uint64_t *retval) running = vcpu_is_running(vmx->vm, vcpu, &hostcpu); if (running && hostcpu != curcpu) - panic("vmx_getreg: %s%d is running", vm_name(vmx->vm), vcpu); + panic("vmx_getreg: %d is running", vcpu); /* VMCS access not required for ctx reads */ if ((regp = vmxctx_regptr(&vmx->ctx[vcpu], reg)) != NULL) { @@ -3076,7 +3057,7 @@ vmx_setreg(void *arg, int vcpu, int reg, uint64_t val) running = vcpu_is_running(vmx->vm, vcpu, &hostcpu); if (running && hostcpu != curcpu) - panic("vmx_setreg: %s%d is running", vm_name(vmx->vm), vcpu); + panic("vmx_setreg: %d is running", vcpu); /* VMCS access not required for ctx writes */ if ((regp = vmxctx_regptr(&vmx->ctx[vcpu], reg)) != NULL) { @@ -3182,7 +3163,7 @@ vmx_getdesc(void *arg, int vcpu, int seg, struct seg_desc *desc) running = vcpu_is_running(vmx->vm, vcpu, &hostcpu); if (running && hostcpu != curcpu) - panic("vmx_getdesc: %s%d is running", vm_name(vmx->vm), vcpu); + panic("vmx_getdesc: %d is running", vcpu); if (!running) { vmcs_load(vmx->vmcs_pa[vcpu]); @@ -3212,7 +3193,7 @@ vmx_setdesc(void *arg, int vcpu, int seg, const struct seg_desc *desc) running = vcpu_is_running(vmx->vm, vcpu, &hostcpu); if (running && hostcpu != curcpu) - panic("vmx_setdesc: %s%d is running", vm_name(vmx->vm), vcpu); + panic("vmx_setdesc: %d is running", vcpu); if (!running) { vmcs_load(vmx->vmcs_pa[vcpu]); diff --git a/usr/src/uts/intel/io/vmm/io/ppt.c b/usr/src/uts/intel/io/vmm/io/ppt.c index 75a29fa17a..7c0efec709 100644 --- a/usr/src/uts/intel/io/vmm/io/ppt.c +++ b/usr/src/uts/intel/io/vmm/io/ppt.c @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include #include "vmm_lapic.h" -#include "vmm_ktr.h" #include "iommu.h" #include "ppt.h" diff --git a/usr/src/uts/intel/io/vmm/io/vatpic.c b/usr/src/uts/intel/io/vmm/io/vatpic.c index 43e332d70d..18da42aa60 100644 --- a/usr/src/uts/intel/io/vmm/io/vatpic.c +++ b/usr/src/uts/intel/io/vmm/io/vatpic.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include -#include "vmm_ktr.h" #include "vmm_lapic.h" #include "vioapic.h" #include "vatpic.h" @@ -115,21 +114,6 @@ struct vatpic { struct atpic_stats stats; }; -#define VATPIC_CTR0(vatpic, fmt) \ - VM_CTR0((vatpic)->vm, fmt) - -#define VATPIC_CTR1(vatpic, fmt, a1) \ - VM_CTR1((vatpic)->vm, fmt, a1) - -#define VATPIC_CTR2(vatpic, fmt, a1, a2) \ - VM_CTR2((vatpic)->vm, fmt, a1, a2) - -#define VATPIC_CTR3(vatpic, fmt, a1, a2, a3) \ - VM_CTR3((vatpic)->vm, fmt, a1, a2, a3) - -#define VATPIC_CTR4(vatpic, fmt, a1, a2, a3, a4) \ - VM_CTR4((vatpic)->vm, fmt, a1, a2, a3, a4) - /* * Loop over all the pins in priority order from highest to lowest. */ @@ -235,10 +219,6 @@ vatpic_notify_intr(struct vatpic *vatpic) atpic = &vatpic->atpic[1]; if (!atpic->intr_raised && (pin = vatpic_get_highest_irrpin(atpic)) != -1) { - VATPIC_CTR4(vatpic, "atpic slave notify pin = %d " - "(imr 0x%x irr 0x%x isr 0x%x)", pin, - atpic->reg_imr, atpic->reg_irr, atpic->reg_isr); - /* * Cascade the request from the slave to the master. */ @@ -247,9 +227,7 @@ vatpic_notify_intr(struct vatpic *vatpic) (void) vatpic_set_pinstate(vatpic, 2, false); } } else { - VATPIC_CTR3(vatpic, "atpic slave no eligible interrupts " - "(imr 0x%x irr 0x%x isr 0x%x)", - atpic->reg_imr, atpic->reg_irr, atpic->reg_isr); + /* No eligible interrupts on slave chip */ } /* @@ -258,10 +236,6 @@ vatpic_notify_intr(struct vatpic *vatpic) atpic = &vatpic->atpic[0]; if (!atpic->intr_raised && (pin = vatpic_get_highest_irrpin(atpic)) != -1) { - VATPIC_CTR4(vatpic, "atpic master notify pin = %d " - "(imr 0x%x irr 0x%x isr 0x%x)", pin, - atpic->reg_imr, atpic->reg_irr, atpic->reg_isr); - /* * From Section 3.6.2, "Interrupt Modes", in the * MPtable Specification, Version 1.4 @@ -292,9 +266,7 @@ vatpic_notify_intr(struct vatpic *vatpic) (void) vioapic_pulse_irq(vatpic->vm, 0); vatpic->stats.as_interrupts++; } else { - VATPIC_CTR3(vatpic, "atpic master no eligible interrupts " - "(imr 0x%x irr 0x%x isr 0x%x)", - atpic->reg_imr, atpic->reg_irr, atpic->reg_isr); + /* No eligible interrupts on master chip */ } } @@ -312,12 +284,12 @@ vatpic_icw1(struct vatpic *vatpic, struct atpic *atpic, uint8_t val) atpic->special_mask_mode = false; if ((val & ICW1_SNGL) != 0) { - VATPIC_CTR0(vatpic, "vatpic cascade mode required"); + /* Cascade mode reqired */ return (-1); } if ((val & ICW1_IC4) == 0) { - VATPIC_CTR0(vatpic, "vatpic icw4 required"); + /* ICW4 reqired */ return (-1); } @@ -347,7 +319,7 @@ static int vatpic_icw4(struct vatpic *vatpic, struct atpic *atpic, uint8_t val) { if ((val & ICW4_8086) == 0) { - VATPIC_CTR0(vatpic, "vatpic microprocessor mode required"); + /* Microprocessor mode required */ return (-1); } diff --git a/usr/src/uts/intel/io/vmm/io/vatpit.c b/usr/src/uts/intel/io/vmm/io/vatpit.c index 3d66932a3a..3efd5b6ab0 100644 --- a/usr/src/uts/intel/io/vmm/io/vatpit.c +++ b/usr/src/uts/intel/io/vmm/io/vatpit.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include -#include "vmm_ktr.h" #include "vatpic.h" #include "vioapic.h" #include "vatpit.h" @@ -147,8 +146,6 @@ vatpit_callout_handler(void *a) c = &vatpit->channel[arg->channel_num]; callout = &c->callout; - VM_CTR1(vatpit->vm, "atpit t%d fired", arg->channel_num); - VATPIT_LOCK(vatpit); if (callout_pending(callout)) /* callout was reset */ @@ -348,7 +345,7 @@ vatpit_handler(void *arg, bool in, uint16_t port, uint8_t bytes, uint32_t *eax) if (port == TIMER_MODE) { if (in) { - VM_CTR0(vatpit->vm, "vatpit attempt to read mode"); + /* Mode is write-only */ return (-1); } diff --git a/usr/src/uts/intel/io/vmm/io/vhpet.c b/usr/src/uts/intel/io/vmm/io/vhpet.c index 423280a32e..e57bca9770 100644 --- a/usr/src/uts/intel/io/vmm/io/vhpet.c +++ b/usr/src/uts/intel/io/vmm/io/vhpet.c @@ -52,8 +52,6 @@ __FBSDID("$FreeBSD$"); #include "vioapic.h" #include "vhpet.h" -#include "vmm_ktr.h" - static MALLOC_DEFINE(M_VHPET, "vhpet", "bhyve virtual hpet"); #define HPET_FREQ 16777216 /* 16.7 (2^24) Mhz */ @@ -224,7 +222,6 @@ vhpet_timer_interrupt(struct vhpet *vhpet, int n) * If a level triggered interrupt is already asserted then just return. */ if ((vhpet->isr & (1 << n)) != 0) { - VM_CTR1(vhpet->vm, "hpet t%d intr is already asserted", n); return; } @@ -236,7 +233,7 @@ vhpet_timer_interrupt(struct vhpet *vhpet, int n) pin = vhpet_timer_ioapic_pin(vhpet, n); if (pin == 0) { - VM_CTR1(vhpet->vm, "hpet t%d intr is not routed to ioapic", n); + /* Interrupt is not routed to IOAPIC */ return; } @@ -289,8 +286,6 @@ vhpet_handler(void *a) n = arg->timer_num; callout = &vhpet->timer[n].callout; - VM_CTR1(vhpet->vm, "hpet t%d fired", n); - VHPET_LOCK(vhpet); if (callout_pending(callout)) /* callout was reset */ @@ -314,8 +309,6 @@ done: static void vhpet_stop_timer(struct vhpet *vhpet, int n, hrtime_t now) { - - VM_CTR1(vhpet->vm, "hpet t%d stopped", n); callout_stop(&vhpet->timer[n].callout); /* @@ -326,8 +319,6 @@ vhpet_stop_timer(struct vhpet *vhpet, int n, hrtime_t now) * the next interrupt has to wait for the counter to wrap around. */ if (vhpet->timer[n].callout_expire < now) { - VM_CTR1(vhpet->vm, "hpet t%d interrupt triggered after " - "stopping timer", n); vhpet_timer_interrupt(vhpet, n); } } @@ -415,7 +406,6 @@ vhpet_timer_update_config(struct vhpet *vhpet, int n, uint64_t data, return; vhpet->timer[n].cap_config = newval; - VM_CTR2(vhpet->vm, "hpet t%d cap_config set to 0x%016x", n, newval); /* * Validate the interrupt routing in the HPET_TCNF_INT_ROUTE field. @@ -425,8 +415,7 @@ vhpet_timer_update_config(struct vhpet *vhpet, int n, uint64_t data, allowed_irqs = vhpet->timer[n].cap_config >> 32; new_pin = vhpet_timer_ioapic_pin(vhpet, n); if (new_pin != 0 && (allowed_irqs & (1 << new_pin)) == 0) { - VM_CTR3(vhpet->vm, "hpet t%d configured invalid irq %d, " - "allowed_irqs 0x%08x", n, new_pin, allowed_irqs); + /* Invalid IRQ configured */ new_pin = 0; vhpet->timer[n].cap_config &= ~HPET_TCNF_INT_ROUTE; } @@ -458,8 +447,6 @@ vhpet_timer_update_config(struct vhpet *vhpet, int n, uint64_t data, clear_isr = false; if (clear_isr) { - VM_CTR1(vhpet->vm, "hpet t%d isr cleared due to " - "configuration change", n); (void) vioapic_deassert_irq(vhpet->vm, old_pin); vhpet->isr &= ~(1 << n); } @@ -496,15 +483,12 @@ vhpet_mmio_write(struct vm *vm, int vcpuid, uint64_t gpa, uint64_t val, } break; default: - VM_CTR2(vhpet->vm, "hpet invalid mmio write: " - "offset 0x%08x, size %d", offset, size); + /* Invalid MMIO write */ goto done; } /* Access to the HPET should be naturally aligned to its width */ if (offset & (size - 1)) { - VM_CTR2(vhpet->vm, "hpet invalid mmio write: " - "offset 0x%08x, size %d", offset, size); goto done; } @@ -528,10 +512,8 @@ vhpet_mmio_write(struct vm *vm, int vcpuid, uint64_t gpa, uint64_t val, if ((oldval ^ vhpet->config) & HPET_CNF_ENABLE) { if (vhpet_counter_enabled(vhpet)) { vhpet_start_counting(vhpet); - VM_CTR0(vhpet->vm, "hpet enabled"); } else { vhpet_stop_counting(vhpet, counter, now); - VM_CTR0(vhpet->vm, "hpet disabled"); } } goto done; @@ -541,7 +523,6 @@ vhpet_mmio_write(struct vm *vm, int vcpuid, uint64_t gpa, uint64_t val, isr_clear_mask = vhpet->isr & data; for (i = 0; i < VHPET_NUM_TIMERS; i++) { if ((isr_clear_mask & (1 << i)) != 0) { - VM_CTR1(vhpet->vm, "hpet t%d isr cleared", i); vhpet_timer_clear_isr(vhpet, i); } } @@ -630,16 +611,12 @@ vhpet_mmio_read(struct vm *vm, int vcpuid, uint64_t gpa, uint64_t *rval, /* Accesses to the HPET should be 4 or 8 bytes wide */ if (size != 4 && size != 8) { - VM_CTR2(vhpet->vm, "hpet invalid mmio read: " - "offset 0x%08x, size %d", offset, size); data = 0; goto done; } /* Access to the HPET should be naturally aligned to its width */ if (offset & (size - 1)) { - VM_CTR2(vhpet->vm, "hpet invalid mmio read: " - "offset 0x%08x, size %d", offset, size); data = 0; goto done; } diff --git a/usr/src/uts/intel/io/vmm/io/vioapic.c b/usr/src/uts/intel/io/vmm/io/vioapic.c index 90dedb9ac1..cf09c3adae 100644 --- a/usr/src/uts/intel/io/vmm/io/vioapic.c +++ b/usr/src/uts/intel/io/vmm/io/vioapic.c @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "vmm_ktr.h" #include "vmm_lapic.h" #include "vlapic.h" #include "vioapic.h" @@ -98,18 +97,6 @@ struct vioapic { static MALLOC_DEFINE(M_VIOAPIC, "vioapic", "bhyve virtual ioapic"); -#define VIOAPIC_CTR1(vioapic, fmt, a1) \ - VM_CTR1((vioapic)->vm, fmt, a1) - -#define VIOAPIC_CTR2(vioapic, fmt, a1, a2) \ - VM_CTR2((vioapic)->vm, fmt, a1, a2) - -#define VIOAPIC_CTR3(vioapic, fmt, a1, a2, a3) \ - VM_CTR3((vioapic)->vm, fmt, a1, a2, a3) - -#define VIOAPIC_CTR4(vioapic, fmt, a1, a2, a3, a4) \ - VM_CTR4((vioapic)->vm, fmt, a1, a2, a3, a4) - static void vioapic_send_intr(struct vioapic *vioapic, int pin) { @@ -124,7 +111,7 @@ vioapic_send_intr(struct vioapic *vioapic, int pin) high = vioapic->rtbl[pin].reg >> 32; if ((low & IOART_INTMASK) == IOART_INTMSET) { - VIOAPIC_CTR1(vioapic, "ioapic pin%d: masked", pin); + /* Pin is masked */ return; } @@ -133,8 +120,7 @@ vioapic_send_intr(struct vioapic *vioapic, int pin) level = low & IOART_TRGRLVL ? true : false; if (level) { if ((low & IOART_REM_IRR) != 0) { - VIOAPIC_CTR1(vioapic, "ioapic pin%d: irr pending", - pin); + /* IRR already pending */ return; } vioapic->rtbl[pin].reg |= IOART_REM_IRR; @@ -331,9 +317,6 @@ vioapic_write(struct vioapic *vioapic, int vcpuid, uint32_t addr, uint32_t data) (vioapic->rtbl[pin].reg & IOART_REM_IRR) != 0) vioapic->rtbl[pin].reg &= ~IOART_REM_IRR; - VIOAPIC_CTR2(vioapic, "ioapic pin%d: redir table entry %#lx", - pin, vioapic->rtbl[pin].reg); - /* * Generate an interrupt if the following conditions are met: * - pin trigger mode is level @@ -341,8 +324,6 @@ vioapic_write(struct vioapic *vioapic, int vcpuid, uint32_t addr, uint32_t data) */ if ((vioapic->rtbl[pin].reg & IOART_TRGRMOD) == IOART_TRGRLVL && (vioapic->rtbl[pin].acnt > 0)) { - VIOAPIC_CTR2(vioapic, "ioapic pin%d: asserted at rtbl " - "write, acnt %d", pin, vioapic->rtbl[pin].acnt); vioapic_send_intr(vioapic, pin); } } @@ -420,7 +401,6 @@ vioapic_process_eoi(struct vm *vm, int vcpuid, int vector) ("vioapic_process_eoi: invalid vector %d", vector)); vioapic = vm_ioapic(vm); - VIOAPIC_CTR1(vioapic, "ioapic processing eoi for vector %d", vector); /* * XXX keep track of the pins associated with this vector instead @@ -434,8 +414,7 @@ vioapic_process_eoi(struct vm *vm, int vcpuid, int vector) continue; vioapic->rtbl[pin].reg &= ~IOART_REM_IRR; if (vioapic->rtbl[pin].acnt > 0) { - VIOAPIC_CTR2(vioapic, "ioapic pin%d: asserted at eoi, " - "acnt %d", pin, vioapic->rtbl[pin].acnt); + /* Pin asserted at EOI */ vioapic_send_intr(vioapic, pin); } } diff --git a/usr/src/uts/intel/io/vmm/io/vlapic.c b/usr/src/uts/intel/io/vmm/io/vlapic.c index ef7a876c0c..b3767367ba 100644 --- a/usr/src/uts/intel/io/vmm/io/vlapic.c +++ b/usr/src/uts/intel/io/vmm/io/vlapic.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include "vmm_lapic.h" -#include "vmm_ktr.h" #include "vmm_stat.h" #include "vlapic.h" @@ -163,8 +162,7 @@ vlapic_dfr_write_handler(struct vlapic *vlapic) lapic = vlapic->apic_page; if (vlapic_x2mode(vlapic)) { - VM_CTR1(vlapic->vm, "ignoring write to DFR in x2apic mode: %#x", - lapic->dfr); + /* Ignore write to DFR in x2APIC mode */ lapic->dfr = 0; return; } @@ -182,12 +180,10 @@ vlapic_ldr_write_handler(struct vlapic *vlapic) /* LDR is read-only in x2apic mode */ if (vlapic_x2mode(vlapic)) { - VLAPIC_CTR1(vlapic, "ignoring write to LDR in x2apic mode: %#x", - lapic->ldr); + /* Ignore write to LDR in x2APIC mode */ lapic->ldr = x2apic_ldr(vlapic); } else { lapic->ldr &= ~APIC_LDR_RESERVED; - VLAPIC_CTR1(vlapic, "vlapic LDR set to %#x", lapic->ldr); } } @@ -263,8 +259,6 @@ vlapic_get_ccr(struct vlapic *vlapic) } KASSERT(ccr <= lapic->icr_timer, ("vlapic_get_ccr: invalid ccr %x, " "icr_timer is %x", ccr, lapic->icr_timer)); - VLAPIC_CTR2(vlapic, "vlapic ccr_timer = %#x, icr_timer = %#x", - ccr, lapic->icr_timer); VLAPIC_TIMER_UNLOCK(vlapic); return (ccr); } @@ -279,8 +273,6 @@ vlapic_dcr_write_handler(struct vlapic *vlapic) VLAPIC_TIMER_LOCK(vlapic); divisor = vlapic_timer_divisor(lapic->dcr_timer); - VLAPIC_CTR2(vlapic, "vlapic dcr_timer=%#x, divisor=%d", - lapic->dcr_timer, divisor); /* * Update the timer frequency and the timer period. @@ -574,7 +566,6 @@ vlapic_update_ppr(struct vlapic *vlapic) } vlapic->apic_page->ppr = ppr; - VLAPIC_CTR1(vlapic, "vlapic_update_ppr 0x%02x", ppr); } /* @@ -598,7 +589,6 @@ vlapic_raise_ppr(struct vlapic *vlapic, int vec) #endif /* __ISRVEC_DEBUG */ lapic->ppr = ppr; - VLAPIC_CTR1(vlapic, "vlapic_update_ppr 0x%02x", ppr); } void @@ -627,9 +617,6 @@ vlapic_process_eoi(struct vlapic *vlapic) vector = i * 32 + bitpos; isrptr[idx] &= ~(1 << bitpos); - VCPU_CTR1(vlapic->vm, vlapic->vcpuid, "EOI vector %d", - vector); - VLAPIC_CTR_ISR(vlapic, "vlapic_process_eoi"); #ifdef __ISRVEC_DEBUG vlapic_isrstk_eoi(vlapic, vector); #endif @@ -641,7 +628,6 @@ vlapic_process_eoi(struct vlapic *vlapic) return; } } - VCPU_CTR0(vlapic->vm, vlapic->vcpuid, "Gratuitous EOI"); vmm_stat_incr(vlapic->vm, vlapic->vcpuid, VLAPIC_GRATUITOUS_EOI, 1); } @@ -690,7 +676,6 @@ vlapic_fire_timer(struct vlapic *vlapic) ASSERT(VLAPIC_TIMER_LOCKED(vlapic)); if (vlapic_fire_lvt(vlapic, APIC_LVT_TIMER)) { - VLAPIC_CTR0(vlapic, "vlapic timer fired"); vmm_stat_incr(vlapic->vm, vlapic->vcpuid, VLAPIC_INTR_TIMER, 1); } } @@ -908,8 +893,6 @@ vlapic_calcdest(struct vm *vm, cpuset_t *dmask, uint32_t dest, bool phys, * Guest has configured a bad logical * model for this vcpu - skip it. */ - VLAPIC_CTR1(vlapic, "vlapic has bad logical " - "model %x - cannot deliver interrupt", dfr); continue; } @@ -931,8 +914,6 @@ vlapic_set_tpr(struct vlapic *vlapic, uint8_t val) struct LAPIC *lapic = vlapic->apic_page; if (lapic->tpr != val) { - VCPU_CTR2(vlapic->vm, vlapic->vcpuid, "vlapic TPR changed " - "from %#x to %#x", lapic->tpr, val); lapic->tpr = val; vlapic_update_ppr(vlapic); } @@ -1067,7 +1048,6 @@ vlapic_self_ipi_handler(struct vlapic *vlapic, uint32_t val) (void) lapic_intr_edge(vlapic->vm, vlapic->vcpuid, vec); vmm_stat_incr(vlapic->vm, vlapic->vcpuid, VLAPIC_IPI_SEND, 1); vmm_stat_incr(vlapic->vm, vlapic->vcpuid, VLAPIC_IPI_RECV, 1); - VLAPIC_CTR1(vlapic, "vlapic self-ipi %d", vec); } int @@ -1090,7 +1070,6 @@ vlapic_pending_intr(struct vlapic *vlapic, int *vecptr) if (bitpos != 0) { vector = i * 32 + (bitpos - 1); if (PRIO(vector) > PRIO(lapic->ppr)) { - VLAPIC_CTR1(vlapic, "pending intr %d", vector); if (vecptr != NULL) *vecptr = vector; return (1); @@ -1121,11 +1100,9 @@ vlapic_intr_accepted(struct vlapic *vlapic, int vector) irrptr = &lapic->irr0; atomic_clear_int(&irrptr[idx], 1 << (vector % 32)); - VLAPIC_CTR_IRR(vlapic, "vlapic_intr_accepted"); isrptr = &lapic->isr0; isrptr[idx] |= 1 << (vector % 32); - VLAPIC_CTR_ISR(vlapic, "vlapic_intr_accepted"); /* * The only way a fresh vector could be accepted into ISR is if it was @@ -1158,7 +1135,6 @@ vlapic_svr_write_handler(struct vlapic *vlapic) * The apic is now disabled so stop the apic timer * and mask all the LVT entries. */ - VLAPIC_CTR0(vlapic, "vlapic is software-disabled"); VLAPIC_TIMER_LOCK(vlapic); callout_stop(&vlapic->callout); VLAPIC_TIMER_UNLOCK(vlapic); @@ -1168,7 +1144,6 @@ vlapic_svr_write_handler(struct vlapic *vlapic) * The apic is now enabled so restart the apic timer * if it is configured in periodic mode. */ - VLAPIC_CTR0(vlapic, "vlapic is software-enabled"); if (vlapic_periodic_timer(vlapic)) vlapic_icrtmr_write_handler(vlapic); } @@ -1704,7 +1679,7 @@ vlapic_deliver_intr(struct vm *vm, bool level, uint32_t dest, bool phys, if (delmode != IOART_DELFIXED && delmode != IOART_DELLOPRI && delmode != IOART_DELEXINT) { - VM_CTR1(vm, "vlapic intr invalid delmode %#x", delmode); + /* Invalid delivery mode */ return; } lowprio = (delmode == IOART_DELLOPRI); diff --git a/usr/src/uts/intel/io/vmm/io/vlapic_priv.h b/usr/src/uts/intel/io/vmm/io/vlapic_priv.h index 7b12b60f51..abe1271fcc 100644 --- a/usr/src/uts/intel/io/vmm/io/vlapic_priv.h +++ b/usr/src/uts/intel/io/vmm/io/vlapic_priv.h @@ -97,46 +97,6 @@ #define APIC_OFFSET_TIMER_DCR 0x3E0 /* Timer's Divide Configuration */ #define APIC_OFFSET_SELF_IPI 0x3F0 /* Self IPI register */ -#define VLAPIC_CTR0(vlapic, format) \ - VCPU_CTR0((vlapic)->vm, (vlapic)->vcpuid, format) - -#define VLAPIC_CTR1(vlapic, format, p1) \ - VCPU_CTR1((vlapic)->vm, (vlapic)->vcpuid, format, p1) - -#define VLAPIC_CTR2(vlapic, format, p1, p2) \ - VCPU_CTR2((vlapic)->vm, (vlapic)->vcpuid, format, p1, p2) - -#define VLAPIC_CTR3(vlapic, format, p1, p2, p3) \ - VCPU_CTR3((vlapic)->vm, (vlapic)->vcpuid, format, p1, p2, p3) - -#define VLAPIC_CTR_IRR(vlapic, msg) \ -do { \ - uint32_t *irrptr = &(vlapic)->apic_page->irr0; \ - irrptr[0] = irrptr[0]; /* silence compiler */ \ - VLAPIC_CTR1((vlapic), msg " irr0 0x%08x", irrptr[0 << 2]); \ - VLAPIC_CTR1((vlapic), msg " irr1 0x%08x", irrptr[1 << 2]); \ - VLAPIC_CTR1((vlapic), msg " irr2 0x%08x", irrptr[2 << 2]); \ - VLAPIC_CTR1((vlapic), msg " irr3 0x%08x", irrptr[3 << 2]); \ - VLAPIC_CTR1((vlapic), msg " irr4 0x%08x", irrptr[4 << 2]); \ - VLAPIC_CTR1((vlapic), msg " irr5 0x%08x", irrptr[5 << 2]); \ - VLAPIC_CTR1((vlapic), msg " irr6 0x%08x", irrptr[6 << 2]); \ - VLAPIC_CTR1((vlapic), msg " irr7 0x%08x", irrptr[7 << 2]); \ -} while (0) - -#define VLAPIC_CTR_ISR(vlapic, msg) \ -do { \ - uint32_t *isrptr = &(vlapic)->apic_page->isr0; \ - isrptr[0] = isrptr[0]; /* silence compiler */ \ - VLAPIC_CTR1((vlapic), msg " isr0 0x%08x", isrptr[0 << 2]); \ - VLAPIC_CTR1((vlapic), msg " isr1 0x%08x", isrptr[1 << 2]); \ - VLAPIC_CTR1((vlapic), msg " isr2 0x%08x", isrptr[2 << 2]); \ - VLAPIC_CTR1((vlapic), msg " isr3 0x%08x", isrptr[3 << 2]); \ - VLAPIC_CTR1((vlapic), msg " isr4 0x%08x", isrptr[4 << 2]); \ - VLAPIC_CTR1((vlapic), msg " isr5 0x%08x", isrptr[5 << 2]); \ - VLAPIC_CTR1((vlapic), msg " isr6 0x%08x", isrptr[6 << 2]); \ - VLAPIC_CTR1((vlapic), msg " isr7 0x%08x", isrptr[7 << 2]); \ -} while (0) - /* * 16 priority levels with at most one vector injected per level. */ diff --git a/usr/src/uts/intel/io/vmm/io/vrtc.c b/usr/src/uts/intel/io/vmm/io/vrtc.c index e01fabfa68..8ee724810e 100644 --- a/usr/src/uts/intel/io/vmm/io/vrtc.c +++ b/usr/src/uts/intel/io/vmm/io/vrtc.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include -#include "vmm_ktr.h" #include "vatpic.h" #include "vioapic.h" #include "vrtc.h" @@ -403,8 +402,6 @@ vrtc_time_update(struct vrtc *vrtc, time_t newtime, hrtime_t newbase) alarm_hour = rtc->alarm_hour; oldtime = vrtc->base_rtctime; - VM_CTR2(vrtc->vm, "Updating RTC secs from %lx to %lx", - oldtime, newtime); vrtc->base_uptime = newbase; @@ -425,7 +422,6 @@ vrtc_time_update(struct vrtc *vrtc, time_t newtime, hrtime_t newbase) * Return an error if RTC updates are halted by the guest. */ if (rtc_halted(vrtc)) { - VM_CTR0(vrtc->vm, "RTC update halted by guest"); return (EBUSY); } @@ -514,12 +510,10 @@ vrtc_callout_reset(struct vrtc *vrtc, hrtime_t freqhrt) if (freqhrt == 0) { if (callout_active(&vrtc->callout)) { - VM_CTR0(vrtc->vm, "RTC callout stopped"); callout_stop(&vrtc->callout); } return; } - VM_CTR1(vrtc->vm, "RTC callout frequency %d hz", NANOSEC / freqhrt); callout_reset_hrtime(&vrtc->callout, freqhrt, vrtc_callout_handler, vrtc, 0); } @@ -531,7 +525,6 @@ vrtc_callout_handler(void *arg) time_t rtctime; int error; - VM_CTR0(vrtc->vm, "vrtc callout fired"); VRTC_LOCK(vrtc); if (callout_pending(&vrtc->callout)) /* callout was reset */ @@ -580,7 +573,6 @@ vrtc_set_reg_c(struct vrtc *vrtc, uint8_t newval) { struct rtcdev *rtc; int oldirqf, newirqf; - uint8_t oldval, changed; ASSERT(VRTC_LOCKED(vrtc)); @@ -596,20 +588,14 @@ vrtc_set_reg_c(struct vrtc *vrtc, uint8_t newval) newirqf = 0; } - oldval = rtc->reg_c; rtc->reg_c = newirqf | newval; - changed = oldval ^ rtc->reg_c; - if (changed) { - VM_CTR2(vrtc->vm, "RTC reg_c changed from %x to %x", - oldval, rtc->reg_c); - } if (!oldirqf && newirqf) { - VM_CTR1(vrtc->vm, "RTC irq %d asserted", RTC_IRQ); + /* IRQ asserted */ (void) vatpic_pulse_irq(vrtc->vm, RTC_IRQ); (void) vioapic_pulse_irq(vrtc->vm, RTC_IRQ); } else if (oldirqf && !newirqf) { - VM_CTR1(vrtc->vm, "RTC irq %d deasserted", RTC_IRQ); + /* IRQ de-asserted */ } } @@ -630,10 +616,6 @@ vrtc_set_reg_b(struct vrtc *vrtc, uint8_t newval) rtc->reg_b = newval; changed = oldval ^ newval; - if (changed) { - VM_CTR2(vrtc->vm, "RTC reg_b changed from %x to %x", - oldval, newval); - } if (changed & RTCSB_HALT) { hrtime_t basetime; @@ -695,7 +677,7 @@ static void vrtc_set_reg_a(struct vrtc *vrtc, uint8_t newval) { hrtime_t oldfreq, newfreq; - uint8_t oldval, changed; + uint8_t oldval; ASSERT(VRTC_LOCKED(vrtc)); @@ -704,8 +686,7 @@ vrtc_set_reg_a(struct vrtc *vrtc, uint8_t newval) oldfreq = vrtc_freq(vrtc); if (divider_enabled(oldval) && !divider_enabled(newval)) { - VM_CTR2(vrtc->vm, "RTC divider held in reset at %lx/%lx", - vrtc->base_rtctime, vrtc->base_uptime); + /* RTC divider held in reset */ } else if (!divider_enabled(oldval) && divider_enabled(newval)) { /* * If the dividers are coming out of reset then update @@ -714,18 +695,11 @@ vrtc_set_reg_a(struct vrtc *vrtc, uint8_t newval) * while the dividers were disabled. */ vrtc->base_uptime = gethrtime(); - VM_CTR2(vrtc->vm, "RTC divider out of reset at %lx/%lx", - vrtc->base_rtctime, vrtc->base_uptime); } else { /* NOTHING */ } vrtc->rtcdev.reg_a = newval; - changed = oldval ^ newval; - if (changed) { - VM_CTR2(vrtc->vm, "RTC reg_a changed from %x to %x", - oldval, newval); - } /* * Side effect of changes to rate select and divider enable bits. @@ -748,13 +722,6 @@ vrtc_set_time(struct vm *vm, time_t secs) error = vrtc_time_update(vrtc, secs, gethrtime()); VRTC_UNLOCK(vrtc); - if (error) { - VM_CTR2(vrtc->vm, "Error %d setting RTC time to %lx", error, - secs); - } else { - VM_CTR1(vrtc->vm, "RTC time set to %lx", secs); - } - return (error); } @@ -785,15 +752,13 @@ vrtc_nvram_write(struct vm *vm, int offset, uint8_t value) */ if (offset < offsetof(struct rtcdev, nvram[0]) || offset == RTC_CENTURY || offset >= sizeof (struct rtcdev)) { - VM_CTR1(vrtc->vm, "RTC nvram write to invalid offset %d", - offset); + /* NVRAM write to invalid offset */ return (EINVAL); } VRTC_LOCK(vrtc); ptr = (uint8_t *)(&vrtc->rtcdev); ptr[offset] = value; - VM_CTR2(vrtc->vm, "RTC nvram write %x to offset %x", value, offset); VRTC_UNLOCK(vrtc); return (0); @@ -897,25 +862,19 @@ vrtc_data_handler(void *arg, bool in, uint16_t port, uint8_t bytes, } else { *val = *((uint8_t *)rtc + offset); } - VM_CTR2(vm, "Read value %x from RTC offset %x", - *val, offset); } else { switch (offset) { case 10: - VM_CTR1(vm, "RTC reg_a set to %x", *val); vrtc_set_reg_a(vrtc, *val); break; case 11: - VM_CTR1(vm, "RTC reg_b set to %x", *val); error = vrtc_set_reg_b(vrtc, *val); break; case 12: - VM_CTR1(vm, "RTC reg_c set to %x (ignored)", - *val); + /* Ignored write to reg_c */ break; case 13: - VM_CTR1(vm, "RTC reg_d set to %x (ignored)", - *val); + /* Ignored write to reg_d */ break; case 0: /* @@ -924,7 +883,6 @@ vrtc_data_handler(void *arg, bool in, uint16_t port, uint8_t bytes, *val &= 0x7f; /* FALLTHRU */ default: - VM_CTR2(vm, "RTC offset %x set to %x", offset, *val); *((uint8_t *)rtc + offset) = *val; break; } diff --git a/usr/src/uts/intel/io/vmm/sys/vmm_kernel.h b/usr/src/uts/intel/io/vmm/sys/vmm_kernel.h index ed6fe1c814..ccc76b29bf 100644 --- a/usr/src/uts/intel/io/vmm/sys/vmm_kernel.h +++ b/usr/src/uts/intel/io/vmm/sys/vmm_kernel.h @@ -111,10 +111,9 @@ struct vmm_ops { extern struct vmm_ops vmm_ops_intel; extern struct vmm_ops vmm_ops_amd; -int vm_create(const char *name, uint64_t flags, struct vm **retvm); +int vm_create(uint64_t flags, struct vm **retvm); void vm_destroy(struct vm *vm); int vm_reinit(struct vm *vm, uint64_t); -const char *vm_name(struct vm *vm); uint16_t vm_get_maxcpus(struct vm *vm); void vm_get_topology(struct vm *vm, uint16_t *sockets, uint16_t *cores, uint16_t *threads, uint16_t *maxcpus); diff --git a/usr/src/uts/intel/io/vmm/vmm.c b/usr/src/uts/intel/io/vmm/vmm.c index db87dfbbf4..aca181814f 100644 --- a/usr/src/uts/intel/io/vmm/vmm.c +++ b/usr/src/uts/intel/io/vmm/vmm.c @@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$"); #include #include "vmm_ioport.h" -#include "vmm_ktr.h" #include "vmm_host.h" #include "vmm_util.h" #include "vatpic.h" @@ -206,7 +205,6 @@ struct vm { struct mem_map mem_maps[VM_MAX_MEMMAPS]; /* (i) guest address space */ struct mem_seg mem_segs[VM_MAX_MEMSEGS]; /* (o) guest memory regions */ struct vmspace *vmspace; /* (o) guest's address space */ - char name[VM_MAX_NAMELEN]; /* (o) virtual machine name */ struct vcpu vcpu[VM_MAXCPU]; /* (i) guest vcpus */ /* The following describe the vm cpu topology */ uint16_t sockets; /* (o) num of sockets */ @@ -522,7 +520,7 @@ uint_t threads_per_core = 1; bool gpt_track_dirty = false; int -vm_create(const char *name, uint64_t flags, struct vm **retvm) +vm_create(uint64_t flags, struct vm **retvm) { struct vm *vm; struct vmspace *vmspace; @@ -534,15 +532,11 @@ vm_create(const char *name, uint64_t flags, struct vm **retvm) if (!vmm_initialized) return (ENXIO); - /* Name validation has already occurred */ - VERIFY3U(strnlen(name, VM_MAX_NAMELEN), <, VM_MAX_NAMELEN); - vmspace = vmspace_alloc(VM_MAXUSER_ADDRESS, pte_ops, gpt_track_dirty); if (vmspace == NULL) return (ENOMEM); vm = malloc(sizeof (struct vm), M_VM, M_WAITOK | M_ZERO); - (void) strlcpy(vm->name, name, sizeof (vm->name)); vm->vmspace = vmspace; vm->mem_transient = (flags & VCF_RESERVOIR_MEM) == 0; @@ -705,12 +699,6 @@ vm_reinit(struct vm *vm, uint64_t flags) return (0); } -const char * -vm_name(struct vm *vm) -{ - return (vm->name); -} - int vm_map_mmio(struct vm *vm, vm_paddr_t gpa, size_t len, vm_paddr_t hpa) { @@ -1127,7 +1115,6 @@ vm_set_register(struct vm *vm, int vcpuid, int reg, uint64_t val) return (error); /* Set 'nextrip' to match the value of %rip */ - VCPU_CTR1(vm, vcpuid, "Setting nextrip to %lx", val); vcpu = &vm->vcpu[vcpuid]; vcpu->nextrip = val; return (0); @@ -1340,8 +1327,6 @@ vcpu_set_state_locked(struct vm *vm, int vcpuid, enum vcpu_state newstate, while (vcpu->state != VCPU_IDLE) { vcpu->reqidle = 1; vcpu_notify_event_locked(vcpu, VCPU_NOTIFY_EXIT); - VCPU_CTR1(vm, vcpuid, "vcpu state change from %s to " - "idle requested", vcpu_state2str(vcpu->state)); cv_wait(&vcpu->state_cv, &vcpu->lock); } } else { @@ -1380,9 +1365,6 @@ vcpu_set_state_locked(struct vm *vm, int vcpuid, enum vcpu_state newstate, if (error) return (EBUSY); - VCPU_CTR2(vm, vcpuid, "vcpu state changed from %s to %s", - vcpu_state2str(vcpu->state), vcpu_state2str(newstate)); - vcpu->state = newstate; if (newstate == VCPU_RUNNING) vcpu->hostcpu = curcpu; @@ -1511,9 +1493,6 @@ vm_handle_paging(struct vm *vm, int vcpuid) rv = vmc_fault(vmc, vme->u.paging.gpa, ftype); - VCPU_CTR3(vm, vcpuid, "vm_handle_paging rv = %d, gpa = %lx, " - "ftype = %d", rv, vme->u.paging.gpa, ftype); - if (rv != 0) return (EFAULT); return (0); @@ -1576,9 +1555,6 @@ vm_handle_mmio_emul(struct vm *vm, int vcpuid) inst_addr = vme->rip + vme->u.mmio_emul.cs_base; cs_d = vme->u.mmio_emul.cs_d; - VCPU_CTR1(vm, vcpuid, "inst_emul fault accessing gpa %lx", - vme->u.mmio_emul.gpa); - /* Fetch the faulting instruction */ if (vie_needs_fetch(vie)) { error = vie_fetch_instruction(vie, vm, vcpuid, inst_addr, @@ -1597,8 +1573,6 @@ vm_handle_mmio_emul(struct vm *vm, int vcpuid) } if (vie_decode_instruction(vie, vm, vcpuid, cs_d) != 0) { - VCPU_CTR1(vm, vcpuid, "Error decoding instruction at %lx", - inst_addr); /* Dump (unrecognized) instruction bytes in userspace */ vie_fallback_exitinfo(vie, vme); return (-1); @@ -1765,7 +1739,6 @@ vm_handle_suspend(struct vm *vm, int vcpuid) int rc; if (CPU_CMP(&vm->suspended_cpus, &vm->active_cpus) == 0) { - VCPU_CTR0(vm, vcpuid, "All vcpus suspended"); break; } @@ -2435,8 +2408,6 @@ exit: vmm_savectx(&vcpu->vtc); kpreempt_enable(); - VCPU_CTR2(vm, vcpuid, "retu %d/%d", error, vme->exitcode); - vcpu_ustate_change(vm, vcpuid, VU_EMU_USER); return (error); } @@ -2464,8 +2435,6 @@ vm_restart_instruction(void *arg, int vcpuid) * instruction to be restarted. */ vcpu->exitinfo.inst_length = 0; - VCPU_CTR1(vm, vcpuid, "restarting instruction at %lx by " - "setting inst_length to zero", vcpu->exitinfo.rip); } else if (state == VCPU_FROZEN) { /* * When a vcpu is "frozen" it is outside the critical section @@ -2475,8 +2444,6 @@ vm_restart_instruction(void *arg, int vcpuid) */ error = vm_get_register(vm, vcpuid, VM_REG_GUEST_RIP, &rip); KASSERT(!error, ("%s: error %d getting rip", __func__, error)); - VCPU_CTR2(vm, vcpuid, "restarting instruction by updating " - "nextrip from %lx to %lx", vcpu->nextrip, rip); vcpu->nextrip = rip; } else { panic("%s: invalid state %d", __func__, state); @@ -3125,7 +3092,6 @@ vm_activate_cpu(struct vm *vm, int vcpuid) return (EBUSY); } - VCPU_CTR0(vm, vcpuid, "activated"); CPU_SET_ATOMIC(vcpuid, &vm->active_cpus); /* diff --git a/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c b/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c index a71fa63cc4..6f2380d170 100644 --- a/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c +++ b/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include "vmm_ioport.h" -#include "vmm_ktr.h" enum vie_status { VIES_INIT = (1U << 0), diff --git a/usr/src/uts/intel/io/vmm/vmm_ktr.h b/usr/src/uts/intel/io/vmm/vmm_ktr.h deleted file mode 100644 index 2e706ffc57..0000000000 --- a/usr/src/uts/intel/io/vmm/vmm_ktr.h +++ /dev/null @@ -1,72 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2011 NetApp, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _VMM_KTR_H_ -#define _VMM_KTR_H_ - -#include -#include - -#ifndef KTR_VMM -#define KTR_VMM KTR_GEN -#endif - -#define VCPU_CTR0(vm, vcpuid, format) \ - CTR2(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid)) - -#define VCPU_CTR1(vm, vcpuid, format, p1) \ - CTR3(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1)) - -#define VCPU_CTR2(vm, vcpuid, format, p1, p2) \ - CTR4(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1), (p2)) - -#define VCPU_CTR3(vm, vcpuid, format, p1, p2, p3) \ - CTR5(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), \ - (p1), (p2), (p3)) - -#define VCPU_CTR4(vm, vcpuid, format, p1, p2, p3, p4) \ - CTR6(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), \ - (p1), (p2), (p3), (p4)) - -#define VM_CTR0(vm, format) \ - CTR1(KTR_VMM, "vm %s: " format, vm_name((vm))) - -#define VM_CTR1(vm, format, p1) \ - CTR2(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1)) - -#define VM_CTR2(vm, format, p1, p2) \ - CTR3(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2)) - -#define VM_CTR3(vm, format, p1, p2, p3) \ - CTR4(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2), (p3)) - -#define VM_CTR4(vm, format, p1, p2, p3, p4) \ - CTR5(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2), (p3), (p4)) -#endif diff --git a/usr/src/uts/intel/io/vmm/vmm_lapic.c b/usr/src/uts/intel/io/vmm/vmm_lapic.c index 8ef1c851d0..bf97e18d2c 100644 --- a/usr/src/uts/intel/io/vmm/vmm_lapic.c +++ b/usr/src/uts/intel/io/vmm/vmm_lapic.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "vmm_ktr.h" #include "vmm_lapic.h" #include "vlapic.h" @@ -120,10 +119,8 @@ lapic_intr_msi(struct vm *vm, uint64_t addr, uint64_t msg) uint32_t dest; bool phys; - VM_CTR2(vm, "lapic MSI addr: %#lx msg: %#lx", addr, msg); - if ((addr & MSI_X86_ADDR_MASK) != MSI_X86_ADDR_BASE) { - VM_CTR1(vm, "lapic MSI invalid addr %#lx", addr); + /* Invalid MSI address */ return (-1); } @@ -143,9 +140,6 @@ lapic_intr_msi(struct vm *vm, uint64_t addr, uint64_t msg) delmode = msg & APIC_DELMODE_MASK; vec = msg & 0xff; - VM_CTR3(vm, "lapic MSI %s dest %#x, vec %d", - phys ? "physical" : "logical", dest, vec); - vlapic_deliver_intr(vm, LAPIC_TRIG_EDGE, dest, phys, delmode, vec); return (0); } diff --git a/usr/src/uts/intel/io/vmm/vmm_sol_dev.c b/usr/src/uts/intel/io/vmm/vmm_sol_dev.c index c8fd8b9aa4..bf57cba26f 100644 --- a/usr/src/uts/intel/io/vmm/vmm_sol_dev.c +++ b/usr/src/uts/intel/io/vmm/vmm_sol_dev.c @@ -1665,7 +1665,7 @@ vmmdev_do_vm_create(const struct vm_create_req *req, cred_t *cr) goto fail; } - error = vm_create(req->name, req->flags, &sc->vmm_vm); + error = vm_create(req->flags, &sc->vmm_vm); if (error == 0) { /* Complete VM intialization and report success. */ (void) strlcpy(sc->vmm_name, name, sizeof (sc->vmm_name)); diff --git a/usr/src/uts/intel/io/vmm/x86.c b/usr/src/uts/intel/io/vmm/x86.c index 187c89afd0..de48ba1d48 100644 --- a/usr/src/uts/intel/io/vmm/x86.c +++ b/usr/src/uts/intel/io/vmm/x86.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include "vmm_host.h" -#include "vmm_ktr.h" #include "vmm_util.h" #include "x86.h" @@ -110,8 +109,6 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id, uint64_t *rax, uint64_t *rbx, func = (uint32_t)*rax; param = (uint32_t)*rcx; - VCPU_CTR2(vm, vcpu_id, "cpuid %#x,%#x", func, param); - /* * Requests for invalid CPUID levels should map to the highest * available level instead. -- cgit v1.2.3