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=1794590316; b=4cdgwVeifprV2SGTeyz3mpbz7bfW6Jnj0tn7ycpbGxMO5pJwouIA9ASroz/p/ltsrsiW NmpH1cU+A51uctz/0Eo+teLOxQ0pxdfNpjGmhRJ44NAS9VKbdRfGxWb0T3mPCKrXdXpcy xyq2oNsILhtou97iWqgTI6OcjD/PVfSBtagMPvItZMBTWU+jGpuregCjODQt+wo68vaPz LS0Y3fOd458I3Sg3T5lqZIEb7zfXCoLz2tOhcLyjueQgAX+U2I/bh1mxga//HcwqEriW5 r6vrtHUyOxAXKYON9Zc0GHbcbysxM5KlA4ZIIYc/UYDofcDEx0pkFgHAAlwPgDQsMDg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590316; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=lh+VMbcCyIC/+cC/bJtOfvsQyIAJMTFwplkQws2VmEs=; b=RZof5ZQMiGhuAlMUwL+/d+bU7NRdt//P/c4u1hCevRXZlm5cJ4vtVWNOzbIwoZG4xfcX 9BD2FXFu2B4vaEs0N6XFpTCm0rbgnNQlKtqL+WRbhee5tgDNrn512GcSOl8OEVZPgqI93 rxrDfX0ecsUknPWDDhYTKoFt3tPPY1Zx6JQAZff8e+1fsGW1xkjIiTAFQnpXa6Pro7Gtf M4xhoMrzdRVyhxfnjMTpkxavVVezvIJbsnedUyzMpwtucaNkYi9vAoAClgcBuun+939AS ghjlZuuM1Xz/vjFDucLru6NF5AUcuw/xwzTAvHQwSeith3r3KBH9S8F8cP6ozoLSq7A== 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=w1bCCRfE; 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 067EB607D2FB; Fri, 13 Nov 2026 17:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=w1bCCRfE Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC6A31F000C4; Fri, 13 Nov 2026 17:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590315; bh=lh+VMbcCyIC/+cC/bJtOfvsQyIAJMTFwplkQws2VmEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=w1bCCRfE2/OF2Kf/2iBhMov5Tn3f9BRtiwpIFXEg+H2Cy76ul79IunLXRURWD04BI Mdkt5IxBZ+HSjUdMPDKRbLM710MLRahnzMcx/2yyAmyiVNQN4e0oTg3DxFus7kgblM BBG8hl4xW5oyjBZQLt2lsvlnX/JYYM23a2g1Vwdk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stefan Teodorescu , Oren Yomtov , Chris Mason , Yosry Ahmed , Sean Christopherson , Paolo Bonzini , Sasha Levin Subject: [PATCH 6.18 299/686] KVM: x86: Unconditionally reset MMU context when emulating INIT Date: Fri, 13 Nov 2026 10:47:12 -0500 Message-ID: <20261113153831.089823703@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Christopherson [ Upstream commit c7c288d178cb0b78d3464a616b16b1aa0b316049 ] Force an MMU reset when emulating an INIT even if paging was already disabled, as the MMU page role includes guest_mode (L2), i.e. an INIT while L2 is running with CR0.PG=0 will result in KVM running L1 with a stale MMU context. Alternatively, the reset could be scoped strictly to paging being enabled or L2 being active, but SMM is also encoded in the page role. Even though it _should_ be impossible for the vCPU to be INIT'd while SMM is active, there's zero value in not handling SMM. At that point, the only scenario where KVM _doesn't_ need to reset the MMU context is on an INIT with the vCPU running in Real Mode or Unpaged Protect Mode, and while INIT in those modes is somewhat common, it's far from a hot path and re-initializing the MMU is not expensive, especially when the role isn't changing (KVM elides most of the re-configuration in that case). Note, like the Fixes commit, this bug only affects nested SVM as INIT is an unconditional intercept on VMX, i.e. it's impossible to emulate INIT while L2 is active. Temporarily keep the guest TLB flush when CR0.PG is being cleared even though it is fully redundant with the flush that is emitted on all INIT events (KVM itself only does RESET when a vCPU is being created, i.e. when CR0.PG must be '0'). Fixes: ed129ec9057f ("KVM: x86: forcibly leave nested mode on vCPU reset") Reported-by: Stefan Teodorescu Reported-by: Oren Yomtov Reported-by: Chris Mason Cc: stable@vger.kernel.org Cc: Yosry Ahmed Signed-off-by: Sean Christopherson Message-ID: <20261022015407.279870-2-seanjc@google.com> Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/x86.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0a6fb6e08d1bd..3ca396316d3cf 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12278,18 +12278,23 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) kvm_x86_call(set_efer)(vcpu, 0); kvm_x86_call(update_exception_bitmap)(vcpu); + if (old_cr0 & X86_CR0_PG) + kvm_make_request(KVM_REQ_TLB_FLUSH_GUEST, vcpu); + /* - * On the standard CR0/CR4/EFER modification paths, there are several - * complex conditions determining whether the MMU has to be reset and/or - * which PCIDs have to be flushed. However, CR0.WP and the paging-related - * bits in CR4 and EFER are irrelevant if CR0.PG was '0'; and a reset+flush - * is needed anyway if CR0.PG was '1' (which can only happen for INIT, as - * CR0 will be '0' prior to RESET). So we only need to check CR0.PG here. + * Unconditionally reset the MMU, even though super strictly speaking, + * a MMU reset is only necessary if and only one of the page role bits + * is changing. All of the CR0/CR4/EFER bits effectively get covered + * by checking CR0.PG=1, as CR0.WP and the paging-related bits in CR4 + * and EFER are irrelevant if CR0.PG was '0'. Subtly, if the vCPU was + * in guest mode (L2) or SMM (although emulating INIT in SMM _should_ + * be impossible), an MMU reset is also necessary as "guest mode" and + * "smm" are both encoded in the shadow page role. As a result, the + * only scenarios where an MMU reset is *not* needed is if the vCPU is + * in Real Mode or Unpaged Protected Mode, and micro-optimizing those + * paths are not worth the risk of running with a stale MMU context. */ - if (old_cr0 & X86_CR0_PG) { - kvm_make_request(KVM_REQ_TLB_FLUSH_GUEST, vcpu); - kvm_mmu_reset_context(vcpu); - } + kvm_mmu_reset_context(vcpu); /* * Intel's SDM states that all TLB entries are flushed on INIT. AMD's -- 2.53.0