From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3E3742885F; Sat, 12 Sep 2026 15:51:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789228266; cv=none; b=s5TW9dMA3j3SaN49WPRB4r3DNb5BFTr+1LkfA5hmmS0pAZPEPOvUR8ucKzpDuNhTY+6QSwA5oGo1alYPI+2VRcyHZYRKiMUZbLH6SyEJg7JAlERxdcMDRs95Pm4f3K/766Sqno4xMGeoGgXVYFmd3VyWWO0a5Lf1pmmcXj6Z/ag= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789228266; c=relaxed/simple; bh=dw799m2391P6s8b+6lG3BSdmqsi2zCFD/52F1Lk0WZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uouh9HyHEjNKYebTSwJLi0QgI6r9D0hCf2yIaikopOOOPHLhfclnoAi4shAB42uqrJE4BTWQ+VDOOk9hKwYHTnTq5SMHsDlSzA9NGkX03jbbfg31URuOOiSRce7ZBd4EcZr9R/ZDXPVyPbyng3/HmUE9zwFUvtWXWpJ7qDxu4Hs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rhRFcrF+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rhRFcrF+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E28211F000FF; Sat, 12 Sep 2026 15:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789228265; bh=hldNUlnvYD35jrYtLgLv/s3MzTnGXQOoIhHe4T4DNW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rhRFcrF+cz9IazHKlAXqu3sgmlTezlKRxxwI2zpQv4+FZn7ihVUQvRNlVxcZuRKAT tkj+HSROfBwcq+mJ4KklWaMpbSiTFneyELI4vsOZ2tlUvk8bth3Z+HdRj/GIVgWXDc sKSGt5lngK1lL3U+YX8wOE2MkpDfBRQ20BJPJogE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yosry Ahmed , Kai Huang , Jim Mattson , Sean Christopherson Subject: [PATCH 6.1 0350/1191] KVM: nVMX: Always flush vpid02 on first use Date: Sat, 12 Sep 2026 08:51:18 +0200 Message-ID: <20260912065556.089860297@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yosry Ahmed commit f0772389413dce9657c7d6950abf3edbbd511356 upstream. Make sure vpid02 is always flushed on first use by setting last_vpid=0 when allocating vpid02. nested_vmx_transition_tlb_flush() will always detect a VPID change on first VM-Enter after VMXON, because VPID=0 in vmcs12 is not allowed if L1 enables VPID. This avoids using stale TLB entries from a previous lifetime of the VPID, that might have been associated with a different vCPU (or a completely different VM). Note that last_vpid is already being initialized as 0 when the vCPU is created, but it is not reset when vpid02 is freed on VMXOFF. Hence, the problem can only occur if L1 does VMXOFF -> VMXON, runs an L2, and KVM happens to reuse a VPID that has TLB entries on the physical CPU. Cc: stable@vger.kernel.org Signed-off-by: Yosry Ahmed Reviewed-by: Kai Huang Reviewed-by: Jim Mattson Link: https://patch.msgid.link/20260616214652.2157032-2-yosry@kernel.org Signed-off-by: Sean Christopherson Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/vmx/nested.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -1164,6 +1164,9 @@ static void nested_vmx_transition_tlb_fl * is the VPID incorporated into the MMU context. I.e. KVM must assume * that the new vpid12 has never been used and thus represents a new * guest ASID that cannot have entries in the TLB. + * + * Note, last_vpid is initialized as 0, so the first nested VM-Enter + * after VMXON will always flush the TLB to avoid using stale entries. */ if (is_vmenter && vmcs12->virtual_processor_id != vmx->nested.last_vpid) { vmx->nested.last_vpid = vmcs12->virtual_processor_id; @@ -5162,6 +5165,13 @@ static int enter_vmx_operation(struct kv vmx->nested.vpid02 = allocate_vpid(); + /* + * Clear last_vpid to ensure that the VPID is flushed on the first + * nested VM-Enter. Otherwise, stale TLB entries from a previous life of + * the VPID (e.g. different vCPU or even different VM) could be used. + */ + vmx->nested.last_vpid = 0; + vmx->nested.vmcs02_initialized = false; vmx->nested.vmxon = true;