Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b10bf31 authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: x86: Silence various LAPIC-related host kernel messages 



KVM-x86 dumps a lot of debug messages that have no meaning for normal
operation:
 - INIT de-assertion is ignored
 - SIPIs are sent and received
 - APIC writes are unaligned or < 4 byte long
   (Windows Server 2003 triggers this on SMP)

Degrade them to true debug messages, keeping the host kernel log clean
for real problems.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e5fcfc82

arch/x86/kvm/lapic.c

+7 −9
Original line number Diff line number Diff line
@@ -365,15 +365,13 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, 
			vcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;

			kvm_vcpu_kick(vcpu);

		} else {

			printk(KERN_DEBUG

			       "Ignoring de-assert INIT to vcpu %d\n",

			apic_debug("Ignoring de-assert INIT to vcpu %d\n",

				   vcpu->vcpu_id);

		}



		break;



	case APIC_DM_STARTUP:

		printk(KERN_DEBUG "SIPI to vcpu %d vector 0x%02x\n",

		apic_debug("SIPI to vcpu %d vector 0x%02x\n",

			   vcpu->vcpu_id, vector);

		if (vcpu->arch.mp_state == KVM_MP_STATE_INIT_RECEIVED) {

			vcpu->arch.sipi_vector = vector;
@@ -679,8 +677,8 @@ static void apic_mmio_write(struct kvm_io_device *this, 
	 * Refer SDM 8.4.1

	 */

	if (len != 4 || alignment) {

		if (printk_ratelimit())

			printk(KERN_ERR "apic write: bad size=%d %lx\n",

		/* Don't shout loud, $infamous_os would cause only noise. */

		apic_debug("apic write: bad size=%d %lx\n",

			   len, (long)address);

		return;

	}

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -3224,7 +3224,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	int r;



	if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED)) {

		printk("vcpu %d received sipi with vector # %x\n",

		pr_debug("vcpu %d received sipi with vector # %x\n",

			 vcpu->vcpu_id, vcpu->arch.sipi_vector);

		kvm_lapic_reset(vcpu);

		r = kvm_x86_ops->vcpu_reset(vcpu);