| From 63b73d649fe0f9fc9d9b3caaf39976a4c433ae4e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 22 Jul 2021 14:30:18 +0200 |
| Subject: KVM: x86: Check the right feature bit for MSR_KVM_ASYNC_PF_ACK access |
| |
| From: Vitaly Kuznetsov <vkuznets@redhat.com> |
| |
| [ Upstream commit 0a31df6823232516f61f174907e444f710941dfe ] |
| |
| 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: 66570e966dd9 ("kvm: x86: only provide PV features if enabled in guest's CPUID") |
| Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> |
| Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
| Reviewed-by: Oliver Upton <oupton@google.com> |
| Message-Id: <20210722123018.260035-1-vkuznets@redhat.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kvm/x86.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c |
| index 3ad6f77ea1c4..27faa00fff71 100644 |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -3205,7 +3205,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) |
| return 1; |
| break; |
| case MSR_KVM_ASYNC_PF_ACK: |
| - if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF)) |
| + if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF_INT)) |
| return 1; |
| if (data & 0x1) { |
| vcpu->arch.apf.pageready_pending = false; |
| @@ -3534,7 +3534,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) |
| msr_info->data = vcpu->arch.apf.msr_int_val; |
| break; |
| case MSR_KVM_ASYNC_PF_ACK: |
| - if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF)) |
| + if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF_INT)) |
| return 1; |
| |
| msr_info->data = 0; |
| -- |
| 2.30.2 |
| |
