qiurui/Centos-kernel-stream-10
1
0
Fork 0
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git synced 2026-09-09 00:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

KVM: SVM: Allow KVM_SET_NESTED_STATE to clear GIF when SVME==0

Browse Source 
JIRA: https://issues.redhat.com/browse/RHEL-151869

commit 6f4d3ebc24c6ef92e196ebbd389a3f2bfdc7a144
Author: Jim Mattson <jmattson@google.com>
Date:   Fri Nov 21 20:48:00 2025 +0000

    KVM: SVM: Allow KVM_SET_NESTED_STATE to clear GIF when SVME==0

    GIF==0 together with EFER.SVME==0 is a valid architectural
    state. Don't return -EINVAL for KVM_SET_NESTED_STATE when this
    combination is specified.

    Fixes: cc440cdad5 ("KVM: nSVM: implement KVM_GET_NESTED_STATE and KVM_SET_NESTED_STATE")
    Signed-off-by: Jim Mattson <jmattson@google.com>
    Reviewed-by: Yosry Ahmed <yosry.ahmed@linux.dev>
    Signed-off-by: Yosry Ahmed <yosry.ahmed@linux.dev>
    Link: https://patch.msgid.link/20251121204803.991707-2-yosry.ahmed@linux.dev
    [sean: disallow KVM_STATE_NESTED_RUN_PENDING with SVME=0]
    Signed-off-by: Sean Christopherson <seanjc@google.com>

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
This commit is contained in:
Maxim Levitsky
2026-07-21 14:11:50 -04:00
parent bf2f7da378
commit 85e53f64fc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/kvm/svm/nested.c
+5 -5
View File
@@ -1837,12 +1837,12 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
/*
* If in guest mode, vcpu->arch.efer actually refers to the L2 guest's
* EFER.SVME, but EFER.SVME still has to be 1 for VMRUN to succeed.
* If SVME is disabled, the only valid states are "none" and GIF=1
* (clearing SVME does NOT set GIF, i.e. GIF=0 is allowed).
*/
if (!(vcpu->arch.efer & EFER_SVME)) {
/* GIF=1 and no guest mode are required if SVME=0. */
if (kvm_state->flags != KVM_STATE_NESTED_GIF_SET)
return -EINVAL;
}
if (!(vcpu->arch.efer & EFER_SVME) && kvm_state->flags &&
kvm_state->flags != KVM_STATE_NESTED_GIF_SET)
return -EINVAL;
/* SMM temporarily disables SVM, so we cannot be in guest mode. */
if (is_smm(vcpu) && (kvm_state->flags & KVM_STATE_NESTED_GUEST_MODE))