From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793819868; b=jDv1jRl3OJy9b/UEk79TMtFadGcdFvUcSqQjpoikIwJf6x4u9bsVZEs5xGaNZjjkHzZ2 QGL6HrXpqJNs0vrVT0AYk1hzr9yVvp8Oda0Umn+QvksoqmkwLFH5zlG5uwW2m4AX5jMTY tVAvAEP6kkG9XNkQsOXxN/PPzK8u+UM/dLwIzkwueB/LqIty1qdjdvDYNpyPNHK/IKtLC zQlR0O9gWOyghFyJCPfx8kqJBg4NOPsZkPtuCkvW31JC15XvmtKCh7x+NTEAS0K+M4vOx ttCf2AUCbR472fXrO7qvh2fQKT9VSS5+53dWxvCQzbzST+IBm0oL168SxB2UKaDxRpw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793819868; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=dLDXjqWflMAWluzQhZ9qMyFri5XhjDZ5Cf/AuRTJkwA=; b=xvIh1RO4LSRNkpreLlpxUyKsATToTVWpG8Wi6lTi6UOKP5QpF0WNu/m9BcnU4IwOEglE WBYNJgwikQUU3wJKnsXITrptMbZxMIzy6PDx9e/c60FXJ2AfWtDiLcYyQu0tBNhoGXWCu SF8/96e8t+E3elD32/XFaA/FFFnhRSY5sDFRZhetDgv93tq9a9NkrDE4n8yFBALxqEqPS rnzYRLR2Ha/ueIrq+oTSM6iSTqlxrzR94EBuH0xvNo0gQUxog9gKfSGdx/eMBQZy5m0Dx 86J54G8sS3zmsy9rvx+4ATKLnrDQlxQotK3pfv26Md0ouzx7NS9SdzaEJ9TK55kCcbg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=wUNLELoi; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 696C5606D815 for ; Wed, 4 Nov 2026 19:17:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=wUNLELoi Received: by smtp.kernel.org (Postfix) with ESMTPSA id 003131F00919; Wed, 4 Nov 2026 19:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793819868; bh=dLDXjqWflMAWluzQhZ9qMyFri5XhjDZ5Cf/AuRTJkwA=; h=Subject:To:Cc:From:Date; b=wUNLELoi3XO929n1RtDZldNIXJyFVJzHBhtcBruiRwzETaOvb1HSCYLQHe2edWkVE OUNqwvXUtGkjsg/KNDQ1puq/LxN+uBzNt/nysrwoRsJpR5ko5xaKHTEr9n5g1EoM07 Vtka4jYpAMB2Ew/BOeDWMIQmWNP5umKUO8P2P5+Y= Subject: FAILED: patch "[PATCH] KVM: nSVM: Reject KVM_SET_NESTED_STATE if L1 has EFER.LMA=1" failed to apply to 6.1-stable tree To: seanjc@google.com,fane@google.com,yosry@kernel.org Cc: From: Date: Wed, 04 Nov 2026 14:17:39 -0500 Message-ID: <2026110438-lining-quintuple-4db4@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 5dc500a354cc8e109df678076ae3488094649468 # git commit -s git send-email --to '' --in-reply-to '2026110438-lining-quintuple-4db4@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5dc500a354cc8e109df678076ae3488094649468 Mon Sep 17 00:00:00 2001 From: Sean Christopherson Date: Wed, 2 Sep 2026 16:20:24 -0700 Subject: [PATCH] KVM: nSVM: Reject KVM_SET_NESTED_STATE if L1 has EFER.LMA=1 && EFER.LME=0 Reject KVM_SET_NESTED_STATE if the incoming L1 host state has what is effectively an impossible EFER combination of LMA=1 but LME=0, i.e. if the state says long mode is active but not enabled. Unlike VMX, SVM doesn't have an explicit consistent check for the illegal combination; presumably hardware simply ignores EFER.LMA if EFER.LME=0. Unfortunately, KVM doesn't ignore EFER.LMA in this case and consumes the illegal state when constructing the shadow MMU for L2. E.g. if userspace also clears CR4.PAE, then kvm_calc_cpu_role() will compute a role with 4 or 5 levels of paging, but shadow_mmu_init_context() will wire up the MMU to use the paging32 template, which maxes out its levels at 2. Note, the "real badness" is effectively the same as what happened with the nVMX bug fixed by commit 112e66017bff ("KVM: nVMX: add missing consistency checks for CR0 and CR4"). Unfortunately, the sanity check added by commit 72e2fb24a0b0 ("KVM: x86/mmu: Bug the VM if a vCPU ends up in long mode without PAE enabled") doesn't work for this case, since L2 state is active at the time of the page fault, but it's L1 that has the bad state. Fixes: cc440cdad5b7 ("KVM: nSVM: implement KVM_GET_NESTED_STATE and KVM_SET_NESTED_STATE") Cc: stable@vger.kernel.org Cc: Yosry Ahmed Reported-by: Stefan Teodorescu Link: https://patch.msgid.link/20260902232028.2767071-2-seanjc@google.com Signed-off-by: Sean Christopherson diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 73f37b050d0a..49fb10ad1f9f 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -2028,6 +2028,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, if (!(save->cr0 & X86_CR0_PG) || !(save->cr0 & X86_CR0_PE) || (save->rflags & X86_EFLAGS_VM) || + ((save->efer & EFER_LMA) && !(save->efer & EFER_LME)) || !nested_vmcb_check_save(vcpu, &save_cached, false)) goto out_free;