Skip to contentSkip to conversation

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

PATCH Applied Vitaly Kuznetsov 3 participants 4 messages Sep 11, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 9d3c447c72fb2 ("KVM: X86: Fix async pf caused null-ptr-deref")
---
 arch/x86/kvm/x86.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +3 -3
index d39d6cf1d473..44a86f7f2397 100644
@@ -2730,9 +2730,6 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
 	if (data & 0x30)
 		return 1;
 
-	if (!lapic_in_kernel(vcpu))
-		return 1;
-
 	vcpu->arch.apf.msr_en_val = data;
 
 	if (!kvm_pv_async_pf_enabled(vcpu)) {
@@ -2741,6 +2738,9 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
 		return 0;
 	}
 
+	if (!lapic_in_kernel(vcpu))
+		return 1;
+
 	if (kvm_gfn_to_hva_cache_init(vcpu->kvm, &vcpu->arch.apf.data, gpa,
 					sizeof(u64)))
 		return 1;
Signature · 1 line
2.25.4
#1 lore raw
Quoted 29 lines · Vitaly Kuznetsov

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 9d3c447c72fb2 ("KVM: X86: Fix async pf caused null-ptr-deref")
---
 arch/x86/kvm/x86.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +0 -3
index d39d6cf1d473..44a86f7f2397 100644
@@ -2730,9 +2730,6 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
 	if (data & 0x30)
 		return 1;
 
-	if (!lapic_in_kernel(vcpu))
-		return 1;
-
 	vcpu->arch.apf.msr_en_val = data;
 
 	if (!kvm_pv_async_pf_enabled(vcpu)) {

arch/x86/kvm/x86.c static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data) · line 2741

Quoted 4 lines
arch/x86/kvm/x86.c +1 -0
@@ -2741,6 +2738,9 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
 		return 0;
 	}
 
+	if (!lapic_in_kernel(vcpu))

This doesn't actually verify that @data == 0. kvm_pv_async_pf_enabled() returns true iff KVM_ASYNC_PF_ENABLED and KVM_ASYNC_PF_DELIVERY_AS_INT are set, e.g. this would allow setting one and not the other. This also allows userspace to set vcpu->arch.apf.msr_en_val to an unsupported value, i.e. @data has already been propagated to the vcpu and isn't unwound.

Why not just pivot on @data when lapic_in_kernel() is false? vcpu->arch.apic is immutable so there's no need to update apf.msr_en_val in either direction.

arch/x86/kvm/x86.c +1 -1
index 539ea1cd6020..36969d5ec291 100644
@@ -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;
 
Quoted 8 lines
arch/x86/kvm/x86.c +2 -0
+		return 1;
+
 	if (kvm_gfn_to_hva_cache_init(vcpu->kvm, &vcpu->arch.apf.data, gpa,
 					sizeof(u64)))
 		return 1;
Signature · 1 line
2.25.4
maintainer
#2 lore raw
Quoted 23 lines · Sean Christopherson

This doesn't actually verify that @data == 0. kvm_pv_async_pf_enabled() returns true iff KVM_ASYNC_PF_ENABLED and KVM_ASYNC_PF_DELIVERY_AS_INT are set, e.g. this would allow setting one and not the other. This also allows userspace to set vcpu->arch.apf.msr_en_val to an unsupported value, i.e. @data has already been propagated to the vcpu and isn't unwound.

Why not just pivot on @data when lapic_in_kernel() is false? vcpu->arch.apic is immutable so there's no need to update apf.msr_en_val in either direction.

arch/x86/kvm/x86.c +1 -1
index 539ea1cd6020..36969d5ec291 100644
@@ -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;
 
Quoted 9 lines
Quoted 8 lines
(quoted diff) +2 -0
+		return 1;
+
 	if (kvm_gfn_to_hva_cache_init(vcpu->kvm, &vcpu->arch.apf.data, gpa,
 					sizeof(u64)))
 		return 1;
Signature · 1 line
2.25.4

Committed this instead, though.

Paolo

maintainer Applied
#3 lore raw
In reply to Vitaly Kuznetsov
Quoted 30 lines · Vitaly Kuznetsov

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 9d3c447c72fb2 ("KVM: X86: Fix async pf caused null-ptr-deref")
---
 arch/x86/kvm/x86.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +0 -3
index d39d6cf1d473..44a86f7f2397 100644
@@ -2730,9 +2730,6 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
 	if (data & 0x30)
 		return 1;
 
-	if (!lapic_in_kernel(vcpu))
-		return 1;
-
 	vcpu->arch.apf.msr_en_val = data;
 
 	if (!kvm_pv_async_pf_enabled(vcpu)) {

arch/x86/kvm/x86.c static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data) · line 2746

Quoted 9 lines
arch/x86/kvm/x86.c +3 -0
@@ -2741,6 +2738,9 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
 		return 0;
 	}
 
+	if (!lapic_in_kernel(vcpu))
+		return 1;
+
 	if (kvm_gfn_to_hva_cache_init(vcpu->kvm, &vcpu->arch.apf.data, gpa,
 					sizeof(u64)))
 		return 1;

Queued, thanks.

Paolo