From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3FAE929A9E9; Sun, 1 Mar 2026 01:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772328763; cv=none; b=CMavcugjx0nRGNr36edurUwIaqYe00qDtDXA6AafZZ1/ZuQ2KuvPiA7uY/8dJ3sYo5LpZWkVoX+RpWp1if93ivIsxI6e0ayZiltVbRvA2LfUs3nc0nLFeI54u2Wf6DZhzMaG4bf2iZfuIwHWYOLZ7nkMhiW2i1vg4VDbhqMTNNM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772328763; c=relaxed/simple; bh=RR0DWG+igudPtxILEgmvaTUm9DW+EU+t8snrhECsS54=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AE+KtO2OfLVnqgjhz4egX5tBTEFWaz9eCaj0WdPOCZdzioTinIt6QIvlWCenKXz00nAN8JBmMhV0q3tJdx0z+GcBGy/W/1xs2TkF1x861an0mlpWfqOU4zGe0XNwcJpdgFfjCUw4gCHI4QxLFyWYsw4jzjDnwYs0Xolq++Xvyjk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ddETAojx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ddETAojx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71F98C19421; Sun, 1 Mar 2026 01:32:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772328763; bh=RR0DWG+igudPtxILEgmvaTUm9DW+EU+t8snrhECsS54=; h=From:To:Cc:Subject:Date:From; b=ddETAojxw0HUMuYzVejCihVnkbp7g/wTWxpb1TMQEWmnbvC+Lg+oh/3R1ZZGZdRM7 HS7oBQ6gwnxNbhdtdGuhsRHS8IFpZejCe1NvcI7GFi43FqsBt9tUVxbzZA60AteoK9 J2zrtS8rlw7fElHm9EGzdE4AmypZBgD2AcEGxEojuOa1UIOqb2mNZwNSEC8J3Kw05B fblx9qD6XmI3h9+7M6/b4uG0zC2rl7wE8NKsOfMSRs+jpEz627JOloWFCS051zq56L lglTu0oXdMhOTJWnnatmIM4zb4+LY3U2OVmKTHPrdf507PuRuWrmWAKQ874XhqbFNL BNlySZZnl+wtQ== From: Sasha Levin To: stable@vger.kernel.org, yosry@kernel.org Cc: Maxim Levitsky , Yosry Ahmed , Sean Christopherson , kvm@vger.kernel.org Subject: FAILED: Patch "KVM: nSVM: Always use vmcb01 in VMLOAD/VMSAVE emulation" failed to apply to 6.6-stable tree Date: Sat, 28 Feb 2026 20:32:41 -0500 Message-ID: <20260301013241.1691709-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-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 . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 127ccae2c185f62e6ecb4bf24f9cb307e9b9c619 Mon Sep 17 00:00:00 2001 From: Yosry Ahmed Date: Sat, 10 Jan 2026 00:48:18 +0000 Subject: [PATCH] KVM: nSVM: Always use vmcb01 in VMLOAD/VMSAVE emulation Commit cc3ed80ae69f ("KVM: nSVM: always use vmcb01 to for vmsave/vmload of guest state") made KVM always use vmcb01 for the fields controlled by VMSAVE/VMLOAD, but it missed updating the VMLOAD/VMSAVE emulation code to always use vmcb01. As a result, if VMSAVE/VMLOAD is executed by an L2 guest and is not intercepted by L1, KVM will mistakenly use vmcb02. Always use vmcb01 instead of the current VMCB. Fixes: cc3ed80ae69f ("KVM: nSVM: always use vmcb01 to for vmsave/vmload of guest state") Cc: Maxim Levitsky Cc: stable@vger.kernel.org Signed-off-by: Yosry Ahmed Link: https://patch.msgid.link/20260110004821.3411245-2-yosry.ahmed@linux.dev Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index e454ae095cf7c..f1a5b61bdb5bc 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2122,12 +2122,13 @@ static int vmload_vmsave_interception(struct kvm_vcpu *vcpu, bool vmload) ret = kvm_skip_emulated_instruction(vcpu); + /* KVM always performs VMLOAD/VMSAVE on VMCB01 (see __svm_vcpu_run()) */ if (vmload) { - svm_copy_vmloadsave_state(svm->vmcb, vmcb12); + svm_copy_vmloadsave_state(svm->vmcb01.ptr, vmcb12); svm->sysenter_eip_hi = 0; svm->sysenter_esp_hi = 0; } else { - svm_copy_vmloadsave_state(vmcb12, svm->vmcb); + svm_copy_vmloadsave_state(vmcb12, svm->vmcb01.ptr); } kvm_vcpu_unmap(vcpu, &map); -- 2.51.0