public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: John Allen <john.allen@amd.com>
To: <kvm@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <pbonzini@redhat.com>,
	<weijiang.yang@intel.com>, <rick.p.edgecombe@intel.com>,
	<seanjc@google.com>, <x86@kernel.org>, <thomas.lendacky@amd.com>,
	<bp@alien8.de>, John Allen <john.allen@amd.com>
Subject: [RFC PATCH v2 4/6] KVM: SVM: Save shadow stack host state on VMRUN
Date: Wed, 24 May 2023 15:53:37 +0000	[thread overview]
Message-ID: <20230524155339.415820-5-john.allen@amd.com> (raw)
In-Reply-To: <20230524155339.415820-1-john.allen@amd.com>

When running as an SEV-ES guest, the PL0_SSP, PL1_SSP, PL2_SSP, PL3_SSP,
and U_CET fields in the VMCB save area are type B, meaning the host
state is automatically loaded on a VMEXIT, but is not saved on a VMRUN.
The other shadow stack MSRs, S_CET, SSP, and ISST_ADDR are type A,
meaning they are loaded on VMEXIT and saved on VMRUN. Manually save the
type B host MSR values before VMRUN.

Signed-off-by: John Allen <john.allen@amd.com>
---
 arch/x86/kvm/svm/sev.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index c25aeb550cd9..03dd68bddd51 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -3028,6 +3028,19 @@ void sev_es_prepare_switch_to_guest(struct sev_es_save_area *hostsa)
 
 	/* MSR_IA32_XSS is restored on VMEXIT, save the currnet host value */
 	hostsa->xss = host_xss;
+
+	if (boot_cpu_has(X86_FEATURE_SHSTK)) {
+		/*
+		 * MSR_IA32_U_CET, MSR_IA32_PL0_SSP, MSR_IA32_PL1_SSP,
+		 * MSR_IA32_PL2_SSP, and MSR_IA32_PL3_SSP are restored on
+		 * VMEXIT, save the current host values.
+		 */
+		rdmsrl(MSR_IA32_U_CET, hostsa->u_cet);
+		rdmsrl(MSR_IA32_PL0_SSP, hostsa->vmpl0_ssp);
+		rdmsrl(MSR_IA32_PL1_SSP, hostsa->vmpl1_ssp);
+		rdmsrl(MSR_IA32_PL2_SSP, hostsa->vmpl2_ssp);
+		rdmsrl(MSR_IA32_PL3_SSP, hostsa->vmpl3_ssp);
+	}
 }
 
 void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector)
-- 
2.39.1


  parent reply	other threads:[~2023-05-24 15:55 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-24 15:53 [RFC PATCH v2 0/6] SVM guest shadow stack support John Allen
2023-05-24 15:53 ` [RFC PATCH v2 1/6] KVM: x86: SVM: Emulate reads and writes to shadow stack MSRs John Allen
2023-05-24 15:53 ` [RFC PATCH v2 2/6] KVM: x86: SVM: Update dump_vmcb with shadow stack save area additions John Allen
2023-05-24 15:53 ` [RFC PATCH v2 3/6] KVM: x86: SVM: Pass through shadow stack MSRs John Allen
2023-06-24  0:05   ` Sean Christopherson
2023-08-01 15:25     ` John Allen
2023-08-01 16:42       ` Sean Christopherson
2023-08-01 16:51         ` John Allen
2023-05-24 15:53 ` John Allen [this message]
2023-06-23 21:11   ` [RFC PATCH v2 4/6] KVM: SVM: Save shadow stack host state on VMRUN Sean Christopherson
2023-08-01 15:19     ` John Allen
2023-08-01 16:28       ` Sean Christopherson
2023-08-01 17:03         ` John Allen
2023-08-02  2:18           ` Yang, Weijiang
2023-08-02 16:38             ` Sean Christopherson
2023-08-03  5:11               ` Yang, Weijiang
2023-05-24 15:53 ` [RFC PATCH v2 5/6] KVM: SVM: Add MSR_IA32_XSS to the GHCB for hypervisor kernel John Allen
2023-05-24 15:53 ` [RFC PATCH v2 6/6] KVM: SVM: Add CET features to supported_xss John Allen
2023-05-24 17:24   ` Edgecombe, Rick P
2023-06-09 15:34     ` John Allen
2023-06-09 16:46       ` Edgecombe, Rick P
2023-06-23 22:18         ` Sean Christopherson
2023-06-26 15:57           ` Tom Lendacky
2023-06-26 16:28             ` Sean Christopherson
2023-06-26 16:45               ` Tom Lendacky
2023-06-26 18:22                 ` Sean Christopherson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230524155339.415820-5-john.allen@amd.com \
    --to=john.allen@amd.com \
    --cc=bp@alien8.de \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=rick.p.edgecombe@intel.com \
    --cc=seanjc@google.com \
    --cc=thomas.lendacky@amd.com \
    --cc=weijiang.yang@intel.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox