KVM: x86: Check the right feature bit for MSR_KVM_ASYNC_PF_ACK access
PATCH 1/1 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.
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -3406,7 +3406,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;
@@ -3745,7 +3745,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 ;
Signature · 1 line
2.31.1
Quoted 24 lines · Vitaly Kuznetsov
MSR_KVM_ASYNC_PF_ACKMSR is part of interrupt based asynchronous page fault interface and not the original (deprecated)KVM_FEATURE_ASYNC_PF. This is stated inDocumentation/virt/kvm/msr.rst.Fixes 66570e966dd9 ("kvm: x86: only provide PV features if enabled in guest's CPUID")Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +1
-1@@ -3406,7 +3406,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;
arch/x86/kvm/x86.c int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 3751
Quoted 8 lines
arch/x86/kvm/x86.c +1
-1@@ -3745,7 +3745,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 ;
Best regards,
Maxim Levitsky
Oliver Upton
Reviewed-byQuoted 33 lines · Maxim Levitsky
Quoted 31 lines · Vitaly Kuznetsov
MSR_KVM_ASYNC_PF_ACKMSR is part of interrupt based asynchronous page fault interface and not the original (deprecated)KVM_FEATURE_ASYNC_PF. This is stated inDocumentation/virt/kvm/msr.rst.Fixes 66570e966dd9 ("kvm: x86: only provide PV features if enabled in guest's CPUID")Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +2
-2@@ -3406,7 +3406,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;@@ -3745,7 +3745,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 ;
Quoted 7 lines
arch/x86/kvm/x86.c int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 3751
Quoted 1 line
arch/x86/kvm/x86.c +0
-0msr_info->data =0 ;Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
--
Thanks,
Oliver
Sean Christopherson
maintainerQuoted 15 lines · Vitaly Kuznetsov
MSR_KVM_ASYNC_PF_ACKMSR is part of interrupt based asynchronous page fault interface and not the original (deprecated)KVM_FEATURE_ASYNC_PF. This is stated inDocumentation/virt/kvm/msr.rst.Fixes 66570e966dd9 ("kvm: x86: only provide PV features if enabled in guest's CPUID")Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +0
-0
arch/x86/kvm/x86.c int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 3409
Quoted 5 lines
arch/x86/kvm/x86.c +1
-1@@ -3406,7 +3406,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 ))
Do we want to require both, or do we want to let userspace be stupid?
Quoted 15 lines
arch/x86/kvm/x86.c +1
-1return 1 ;if (data &0x1 ) { vcpu->arch.apf.pageready_pending = false;@@ -3745,7 +3745,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 ;Signature · 1 line
2.31.1
Quoted 11 lines · Sean Christopherson
Quoted 10 lines · Vitaly Kuznetsov
MSR_KVM_ASYNC_PF_ACKMSR is part of interrupt based asynchronous page fault interface and not the original (deprecated)KVM_FEATURE_ASYNC_PF. This is stated inDocumentation/virt/kvm/msr.rst.Fixes 66570e966dd9 ("kvm: x86: only provide PV features if enabled in guest's CPUID")Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 13 lines
arch/x86/kvm/x86.c int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 3409
Quoted 10 lines
arch/x86/kvm/x86.c +1
-1@@ -3406,7 +3406,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 ))Do we want to require both, or do we want to let userspace be stupid?
It's OK to be stupid :-)
Thinking more about it, I'd suggest we go the other way around: allow access to MSR_KVM_ASYNC_PF_EN when either KVM_FEATURE_ASYNC_PF or KVM_FEATURE_ASYNC_PF_INT are present. This will allow to eventually deprecate KVM_FEATURE_ASYNC_PF completely and switch to KVM_FEATURE_ASYNC_PF_INT exclusively.
Quoted 16 lines
Quoted 15 lines
arch/x86/kvm/x86.c +1
-1return 1 ;if (data &0x1 ) { vcpu->arch.apf.pageready_pending = false;@@ -3745,7 +3745,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 ;Signature · 1 line
2.31.1
Signature · 1 line
Vitaly
Quoted 25 lines · Vitaly Kuznetsov
MSR_KVM_ASYNC_PF_ACKMSR is part of interrupt based asynchronous page fault interface and not the original (deprecated)KVM_FEATURE_ASYNC_PF. This is stated inDocumentation/virt/kvm/msr.rst.Fixes 66570e966dd9 ("kvm: x86: only provide PV features if enabled in guest's CPUID")Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +1
-1@@ -3406,7 +3406,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;
arch/x86/kvm/x86.c int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 3751
Quoted 8 lines
arch/x86/kvm/x86.c +1
-1@@ -3745,7 +3745,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 ;
Queued, thanks.
Paolo