Commit d831de17 authored Sep 11, 2020 by Vitaly Kuznetsov Committed by Paolo Bonzini Sep 11, 2020

KVM: x86: always allow writing '0' to MSR_KVM_ASYNC_PF_EN



Even without in-kernel LAPIC we should allow writing '0' to
MSR_KVM_ASYNC_PF_EN as we're not enabling the mechanism. In
particular, QEMU with 'kernel-irqchip=off' fails to start
a guest with

qemu-system-x86_64: error: failed to set MSR 0x4b564d02 to 0x0

Fixes: 9d3c447c ("KVM: X86: Fix async pf caused null-ptr-deref")
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20200911093147.484565-1-vkuznets@redhat.com>
[Actually commit the version proposed by Sean Christopherson. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 7be74942

arch/x86/kvm/x86.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2735,7 +2735,7 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
		return 1;

		if (!lapic_in_kernel(vcpu))
		return 1;
		return data ? 1 : 0;

		vcpu->arch.apf.msr_en_val = data;

Admin message