Skip to content

Commit 0a31df6

Browse files
vittyvkbonzini
authored andcommitted
KVM: x86: Check the right feature bit for MSR_KVM_ASYNC_PF_ACK access
MSR_KVM_ASYNC_PF_ACK MSR is part of interrupt based asynchronous page fault interface and not the original (deprecated) KVM_FEATURE_ASYNC_PF. This is stated in Documentation/virt/kvm/msr.rst. Fixes: 66570e9 ("kvm: x86: only provide PV features if enabled in guest's CPUID") Signed-off-by: Vitaly Kuznetsov <[email protected]> Reviewed-by: Maxim Levitsky <[email protected]> Reviewed-by: Oliver Upton <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 3b1c8c5 commit 0a31df6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kvm/x86.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,7 +3407,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
34073407
return 1;
34083408
break;
34093409
case MSR_KVM_ASYNC_PF_ACK:
3410-
if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF))
3410+
if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF_INT))
34113411
return 1;
34123412
if (data & 0x1) {
34133413
vcpu->arch.apf.pageready_pending = false;
@@ -3746,7 +3746,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
37463746
msr_info->data = vcpu->arch.apf.msr_int_val;
37473747
break;
37483748
case MSR_KVM_ASYNC_PF_ACK:
3749-
if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF))
3749+
if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF_INT))
37503750
return 1;
37513751

37523752
msr_info->data = 0;

0 commit comments

Comments
 (0)