From: Nikunj A Dadhania <nikunj@amd.com>
To: <linux-kernel@vger.kernel.org>, <x86@kernel.org>
Cc: <bp@alien8.de>, <thomas.lendacky@amd.com>,
<dionnaglaze@google.com>, <pgonda@google.com>,
<seanjc@google.com>, <pbonzini@redhat.com>, <nikunj@amd.com>
Subject: [PATCH v4 11/14] x86/sev: Prevent RDTSC/RDTSCP interception for Secure TSC enabled guests
Date: Mon, 14 Aug 2023 11:22:19 +0530 [thread overview]
Message-ID: <20230814055222.1056404-12-nikunj@amd.com> (raw)
In-Reply-To: <20230814055222.1056404-1-nikunj@amd.com>
The hypervisor should not be intercepting RDTSC/RDTSCP when Secure TSC
is enabled. A #VC exception will be generated if the RDTSC/RDTSCP
instructions are being intercepted. If this should occur and Secure
TSC is enabled, terminate guest execution.
Signed-off-by: Nikunj A Dadhania <nikunj@amd.com>
---
arch/x86/kernel/sev-shared.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c
index 3a5b0c9c4fcc..1c22025b298f 100644
--- a/arch/x86/kernel/sev-shared.c
+++ b/arch/x86/kernel/sev-shared.c
@@ -912,6 +912,13 @@ static enum es_result vc_handle_rdtsc(struct ghcb *ghcb,
bool rdtscp = (exit_code == SVM_EXIT_RDTSCP);
enum es_result ret;
+ /*
+ * RDTSC and RDTSCP should not be intercepted when Secure TSC is
+ * enabled. Terminate the SNP guest when the interception is enabled.
+ */
+ if (sev_status & MSR_AMD64_SNP_SECURE_TSC)
+ return ES_VMM_ERROR;
+
ret = sev_es_ghcb_hv_call(ghcb, ctxt, exit_code, 0, 0);
if (ret != ES_OK)
return ret;
--
2.34.1
next prev parent reply other threads:[~2023-08-14 5:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 5:52 [PATCH v4 00/14] Add Secure TSC support for SNP guests Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 01/14] virt: sev-guest: Use AES GCM crypto library Nikunj A Dadhania
2023-10-11 18:56 ` Borislav Petkov
2023-10-12 4:40 ` Nikunj A. Dadhania
2023-10-12 7:45 ` Borislav Petkov
2023-10-12 8:27 ` Nikunj A. Dadhania
2023-08-14 5:52 ` [PATCH v4 02/14] virt: sev-guest: Move mutex to SNP guest device structure Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 03/14] virt: sev-guest: Replace dev_dbg with pr_debug Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 04/14] virt: sev-guest: Add SNP guest request structure Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 05/14] virt: sev-guest: Add vmpck_id to snp_guest_dev struct Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 06/14] x86/sev: Cache the secrets page address Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 07/14] x86/sev: Move and reorganize sev guest request api Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 08/14] x86/mm: Add generic guest initialization hook Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 09/14] x86/sev: Add Secure TSC support for SNP guests Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 10/14] x86/sev: Change TSC MSR behavior for Secure TSC enabled guests Nikunj A Dadhania
2023-08-14 5:52 ` Nikunj A Dadhania [this message]
2023-08-14 5:52 ` [PATCH v4 12/14] x86/kvmclock: Skip kvmclock when Secure TSC is available Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 13/14] x86/tsc: Mark Secure TSC as reliable clocksource Nikunj A Dadhania
2023-08-14 5:52 ` [PATCH v4 14/14] x86/sev: Enable Secure TSC for SNP guests Nikunj A Dadhania
2023-08-28 3:47 ` [PATCH v4 00/14] Add Secure TSC support " Nikunj A. Dadhania
2023-10-04 5:35 ` Nikunj A. Dadhania
2023-10-04 7:01 ` Borislav Petkov
2023-10-05 13:57 ` Nikunj A. Dadhania
2023-10-05 14:32 ` Borislav Petkov
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=20230814055222.1056404-12-nikunj@amd.com \
--to=nikunj@amd.com \
--cc=bp@alien8.de \
--cc=dionnaglaze@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=pgonda@google.com \
--cc=seanjc@google.com \
--cc=thomas.lendacky@amd.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