From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, Chao Gao <chao.gao@intel.com>,
Mathias Krause <minipli@grsecurity.net>,
Sean Christopherson <seanjc@google.com>
Subject: [kvm-unit-tests PATCH v4 08/18] x86: cet: Validate CET states during VMX transitions
Date: Fri, 14 Nov 2025 12:50:50 -0800 [thread overview]
Message-ID: <20251114205100.1873640-9-seanjc@google.com> (raw)
In-Reply-To: <20251114205100.1873640-1-seanjc@google.com>
From: Chao Gao <chao.gao@intel.com>
Add tests to verify that CET states are correctly handled during VMX
transitions.
The following behaviors are verified:
1. Host states are loaded from VMCS iff "Load CET" VM-exit control is set
2. Guest states are loaded from VMCS iff "Load CET" VM-entry control is set
3. Guest states are saved to VMCS during VM exits unconditionally
4. Invalid guest or host CET states leads to VM entry failures.
Signed-off-by: Chao Gao <chao.gao@intel.com>
Signed-off-by: Mathias Krause <minipli@grsecurity.net>
[sean: drop "_test" from config name]
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
lib/x86/msr.h | 1 +
x86/unittests.cfg | 8 +++++
x86/vmx.h | 8 +++--
x86/vmx_tests.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/lib/x86/msr.h b/lib/x86/msr.h
index e586a8e9..7397809c 100644
--- a/lib/x86/msr.h
+++ b/lib/x86/msr.h
@@ -300,6 +300,7 @@
#define MSR_IA32_FEATURE_CONTROL 0x0000003a
#define MSR_IA32_TSC_ADJUST 0x0000003b
#define MSR_IA32_U_CET 0x000006a0
+#define MSR_IA32_S_CET 0x000006a2
#define MSR_IA32_PL3_SSP 0x000006a7
#define MSR_IA32_PKRS 0x000006e1
diff --git a/x86/unittests.cfg b/x86/unittests.cfg
index acb8a8ba..ff537d3f 100644
--- a/x86/unittests.cfg
+++ b/x86/unittests.cfg
@@ -453,6 +453,14 @@ arch = x86_64
groups = vmx nested_exception
check = /sys/module/kvm_intel/parameters/allow_smaller_maxphyaddr=Y
+[vmx_cet]
+file = vmx.flat
+test_args = "vmx_cet_test"
+qemu_params = -cpu max,+vmx
+arch = x86_64
+groups = vmx
+timeout = 240
+
[debug]
file = debug.flat
arch = x86_64
diff --git a/x86/vmx.h b/x86/vmx.h
index 9cd90488..33373bd1 100644
--- a/x86/vmx.h
+++ b/x86/vmx.h
@@ -356,6 +356,7 @@ enum Encoding {
GUEST_PENDING_DEBUG = 0x6822ul,
GUEST_SYSENTER_ESP = 0x6824ul,
GUEST_SYSENTER_EIP = 0x6826ul,
+ GUEST_S_CET = 0x6828ul,
/* Natural-Width Host State Fields */
HOST_CR0 = 0x6c00ul,
@@ -369,7 +370,8 @@ enum Encoding {
HOST_SYSENTER_ESP = 0x6c10ul,
HOST_SYSENTER_EIP = 0x6c12ul,
HOST_RSP = 0x6c14ul,
- HOST_RIP = 0x6c16ul
+ HOST_RIP = 0x6c16ul,
+ HOST_S_CET = 0x6c18ul,
};
#define VMX_ENTRY_FAILURE (1ul << 31)
@@ -449,6 +451,7 @@ enum Ctrl_exi {
EXI_SAVE_EFER = 1UL << 20,
EXI_LOAD_EFER = 1UL << 21,
EXI_SAVE_PREEMPT = 1UL << 22,
+ EXI_LOAD_CET = 1UL << 28,
};
enum Ctrl_ent {
@@ -457,7 +460,8 @@ enum Ctrl_ent {
ENT_LOAD_PERF = 1UL << 13,
ENT_LOAD_PAT = 1UL << 14,
ENT_LOAD_EFER = 1UL << 15,
- ENT_LOAD_BNDCFGS = 1UL << 16
+ ENT_LOAD_BNDCFGS = 1UL << 16,
+ ENT_LOAD_CET = 1UL << 20,
};
enum Ctrl_pin {
diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 5c8c9f31..5ffb80a3 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -11382,6 +11382,85 @@ static void vmx_posted_interrupts_test(void)
enter_guest();
}
+static u64 guest_s_cet = -1;
+
+static void vmx_cet_test_guest(void)
+{
+ guest_s_cet = rdmsr(MSR_IA32_S_CET);
+ vmcall();
+}
+
+static void vmx_cet_test(void)
+{
+ struct vmcs *curr;
+ u64 val;
+
+ if (!(ctrl_exit_rev.clr & EXI_LOAD_CET)) {
+ report_skip("Load CET state exit control is not available");
+ return;
+ }
+
+ if (!(ctrl_enter_rev.clr & ENT_LOAD_CET)) {
+ report_skip("Load CET state entry control is not available");
+ return;
+ }
+
+ /* Allow the guest to read GUEST_S_CET directly */
+ msr_bmp_init();
+
+ /*
+ * Check whether VMCS transitions load host and guest values
+ * according to the settings of the relevant VM-entry and exit
+ * controls.
+ */
+ vmcs_write(HOST_S_CET, 2);
+ vmcs_write(GUEST_S_CET, 2);
+ test_set_guest(vmx_cet_test_guest);
+
+ enter_guest();
+ val = rdmsr(MSR_IA32_S_CET);
+
+ /* Validate both guest/host S_CET MSR have the default values */
+ report(val == 0 && guest_s_cet == 0, "Load CET state disabled");
+
+ /*
+ * CPU supports the 1-setting of the 'load CET' VM-entry control,
+ * the contents of the IA32_S_CET and IA32_INTERRUPT_SSP_TABLE_ADDR
+ * MSRs are saved into the corresponding fields
+ */
+ report(vmcs_read(GUEST_S_CET) == 0, "S_CET is unconditionally saved");
+
+ /* Enable load CET state entry/exit controls and retest */
+ vmcs_set_bits(EXI_CONTROLS, EXI_LOAD_CET);
+ vmcs_set_bits(ENT_CONTROLS, ENT_LOAD_CET);
+ vmcs_write(GUEST_S_CET, 2);
+ test_override_guest(vmx_cet_test_guest);
+
+ enter_guest();
+ val = rdmsr(MSR_IA32_S_CET);
+
+ /* Validate both guest/host S_CET MSR are loaded from VMCS */
+ report(val == 2 && guest_s_cet == 2, "Load CET state enabled");
+
+ /*
+ * Validate that bit 10 (SUPPRESS) and Bit 11 (TRACKER) cannot be
+ * both set
+ */
+ val = BIT(10) | BIT(11);
+ vmcs_write(GUEST_S_CET, val);
+ test_guest_state("Load invalid guest CET state", true, val, "GUEST_S_CET");
+
+ /* Following test_vmx_vmlaunch() needs a "not launched" VMCS */
+ vmcs_save(&curr);
+ vmcs_clear(curr);
+ make_vmcs_current(curr);
+
+ vmcs_write(HOST_S_CET, val);
+ test_vmx_vmlaunch(VMXERR_ENTRY_INVALID_HOST_STATE_FIELD);
+
+ test_set_guest_finished();
+}
+
#define TEST(name) { #name, .v2 = name }
/* name/init/guest_main/exit_handler/syscall_handler/guest_regs */
@@ -11495,5 +11574,7 @@ struct vmx_test vmx_tests[] = {
TEST(vmx_pf_vpid_test),
TEST(vmx_exception_test),
TEST(vmx_canonical_test),
+ /* "Load CET" VM-entry/exit controls tests. */
+ TEST(vmx_cet_test),
{ NULL, NULL, NULL, NULL, NULL, {0} },
};
--
2.52.0.rc1.455.g30608eb744-goog
next prev parent reply other threads:[~2025-11-14 20:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-14 20:50 [kvm-unit-tests PATCH v4 00/18] x86: Improve CET tests Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 01/18] x86: cet: Pass virtual addresses to invlpg Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 02/18] x86: cet: Remove unnecessary memory zeroing for shadow stack Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 03/18] x86: cet: Directly check for #CP exception in run_in_user() Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 04/18] x86: cet: Validate #CP error code Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 05/18] x86: cet: Use report_skip() Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 06/18] x86: cet: Drop unnecessary casting Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 07/18] x86: cet: Validate writing unaligned values to SSP MSR causes #GP Sean Christopherson
2025-11-14 20:50 ` Sean Christopherson [this message]
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 09/18] x86: cet: Make shadow stack less fragile Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 10/18] x86: cet: Simplify IBT test Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 11/18] x86: cet: Use symbolic values for the #CP error codes Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 12/18] x86: cet: Test far returns too Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 13/18] x86: Avoid top-most page for vmalloc on x86-64 Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 14/18] x86: cet: Run SHSTK and IBT tests as appropriate if either feature is supported Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 15/18] x86: cet: Drop the "intel_" prefix from the CET testcase Sean Christopherson
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 16/18] x86: cet: Enable NOTRACK handling for IBT tests Sean Christopherson
2025-11-15 5:30 ` Mathias Krause
2025-11-14 20:50 ` [kvm-unit-tests PATCH v4 17/18] x86: cet: Reset IBT tracker state on #CP violations Sean Christopherson
2025-11-15 5:40 ` Mathias Krause
2025-11-14 20:51 ` [kvm-unit-tests PATCH v4 18/18] x86: cet: Add testcases to verify KVM rejects emulation of CET instructions Sean Christopherson
2025-11-15 6:15 ` Mathias Krause
2025-11-17 7:32 ` Mathias Krause
2025-11-18 22:26 ` [kvm-unit-tests PATCH v4 00/18] x86: Improve CET tests 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=20251114205100.1873640-9-seanjc@google.com \
--to=seanjc@google.com \
--cc=chao.gao@intel.com \
--cc=kvm@vger.kernel.org \
--cc=minipli@grsecurity.net \
--cc=pbonzini@redhat.com \
/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