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 F32133F7B49; Sat, 28 Feb 2026 17:42:47 +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=1772300568; cv=none; b=Dpxjf3r4Vf7RVneH8aNptMs0PEj7od8nnY6QL/jOgjdp/uP7vg20pjr8o4uWjZ8WAGtvXb8TRbZGELnJp9DAaO8iG3Orqvi0sBwzjkJH/ImwrM0K/099SwZ6YD31owSR/9+PZyN9VVHTZ14NQBlHYknB7XXYFnL/fYgCKIvZMjY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300568; c=relaxed/simple; bh=la9/4Rbx3obCgEA23+q/BfF5J7ml9m6R8U3PHppltxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EwLzg/pO73tGmygx6x0fUmuV9xWSKcdGWGDviBm/gWDd/NsUo1w31wtN9vJJTg/i8jsSwWIAzCn9zlFPLT+37qwWhf5pSX3er3D0lGRMCivSc+TsI7jggE0KGuFQqUUGuL5zs89rBuENPnf4pBNdZzsLhcdkVdPR1M0EXO0E2IA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n0jchbKR; 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="n0jchbKR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38485C19423; Sat, 28 Feb 2026 17:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300567; bh=la9/4Rbx3obCgEA23+q/BfF5J7ml9m6R8U3PHppltxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n0jchbKRVSthZAer4jD0KsKa5FZrevbgVnN7JBYXl9Yjuxb2ZtWKCEUSDjenedapl awV79qQE0mvuSC+KDhzmWjKEyYUcOfSqj5l6jqIlIJbxh8YDiBUnaNPZ9WrDBNu6e0 OEtvRj8QbWmr6cXa6TMxSTczJc5ok5Ngm06Bx7tHF5S2R5Vi2kUxYvndnEa12h2QdY f5znNd8PkRdyOkz3CE/Kz05UJsay7m2Hoj6yCKZtMu/FDJKIiYFjeCCDrBGv8dTgmW lQXfSu3D3mA3075PoJJuaYTmbEiwx7DOp5fWMLn8WA/GSJOb9GcwqEtsSuv4z7gMo0 7H4G1J3NWE33g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yosry Ahmed , Maxim Levitsky , Sean Christopherson , Sasha Levin Subject: [PATCH 6.19 608/844] KVM: nSVM: Always use vmcb01 in VMLOAD/VMSAVE emulation Date: Sat, 28 Feb 2026 12:28:41 -0500 Message-ID: <20260228173244.1509663-609-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Yosry Ahmed [ Upstream commit 127ccae2c185f62e6ecb4bf24f9cb307e9b9c619 ] 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 Signed-off-by: Sasha Levin --- 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 4394be40fe78d..a58548b35b858 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2099,12 +2099,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