Hi,
This the v4 series to support CET (CET-SHSTK & CET-IBT) in QEMU, which
is based on the master branch at the commit 05f36f7c0512c ("Update
version for v10.2.0-rc2 release"). And you can also find the code here:
https://gitlab.com/zhao.liu/qemu/-/tree/i386-all-for-dmr-v2.1-12-10-2025
Compared to v4 [1], v5 continues to use host_cpuid for KVM's xstate
initialization and simplify the migration check for PL0_SSP MSR.
Thanks for your review!
Overview
========
Control-flow enforcement technology includes 2 x86-architectural
features:
- CET shadow stack (CET-SHSTK or CET-SS).
- CET indirect branch tracking (CET-IBT).
Intel has implemented both 2 features since Sapphire Rapids (P-core) &
Sierra Forest (E-core).
AMD also implemented shadow stack since Zen3 [2] - this series has
considerred only-shstk case and is supposed to work on AMD platform, but
I hasn't tested this on AMD.
The basic CET support (patch 11-19) includes:
* CET-S & CET-U supervisor xstates support.
* CET CPUIDs enumeration.
* CET MSRs save & load.
* CET guest SSP register (KVM treats this as a special internal
register - KVM_REG_GUEST_SSP) save & load.
* Vmstates for MSRs & guest SSP.
But before CET support, there's a lot of cleanup work needed for
supervisor xstate.
Before CET-S/CET-U, QEMU has already supports arch lbr as the 1st
supervisor xstate. Although arch LBR has not yet been merged into KVM
(still planned), this series cleans up supervisor state-related support
and avoids breaking the current arch LBR in QEMU - that's what patch
2-10 are doing.
Additionally, besides KVM, this series also supports CET for TDX.
Change Log
==========
Changes Since v4:
- Drop previous patch "i386/kvm: Initialize x86_ext_save_areas[] based
on KVM support", and continue to use host_cpuid to initialize
x86_ext_save_areas[].
- For migration, check whether pl0_ssp is in-use instead of checking
FRED & CET-SHSTK CPUIDs.
- Polish commit message of patch 6 "i386/cpu: Use x86_ext_save_areas[]
for CPUID.0XD subleaves".
Changes Since v3:
- Fill CPUID 0xD subleaves from KVM CPUID instead of host CPUID for
non-dynamic xstates (i.e., except AMX xstates for now).
- Save/restore/migrate MSR_IA32_PL0_SSP for FRED.
- Fix migratable_flags for FEAT_XSAVE_XSS_LO.
- Refine commit message for CET TDX support.
[1]: https://lore.kernel.org/qemu-devel/20251118034231.704240-1-zhao1.liu@intel.com/
[2]: https://lore.kernel.org/all/20250908201750.98824-1-john.allen@amd.com/
Thanks and Best Regards,
Zhao
---
Chao Gao (1):
i386/cpu: Fix supervisor xstate initialization
Chenyi Qiang (1):
i386/tdx: Add CET SHSTK/IBT into the supported CPUID by XFAM
Xin Li (Intel) (2):
i386/cpu: Save/restore SSP0 MSR for FRED
i386/cpu: Migrate MSR_IA32_PL0_SSP for FRED and CET-SHSTK
Yang Weijiang (5):
i386/cpu: Enable xsave support for CET states
i386/kvm: Add save/restore support for CET MSRs
i386/kvm: Add save/restore support for KVM_REG_GUEST_SSP
i386/machine: Add vmstate for cet-shstk and cet-ibt
i386/cpu: Advertise CET related flags in feature words
Zhao Liu (13):
i386/cpu: Clean up indent style of x86_ext_save_areas[]
i386/cpu: Clean up arch lbr xsave struct and comment
i386/cpu: Reorganize arch lbr structure definitions
i386/cpu: Make ExtSaveArea store an array of dependencies
i386/cpu: Add avx10 dependency for Opmask/ZMM_Hi256/Hi16_ZMM
i386/cpu: Use x86_ext_save_areas[] for CPUID.0XD subleaves
i386/cpu: Reorganize dependency check for arch lbr state
i386/cpu: Drop pmu check in CPUID 0x1C encoding
i386/cpu: Add missing migratable xsave features
i386/cpu: Add CET support in CR4
i386/cpu: Mark cet-u & cet-s xstates as migratable
i386/cpu: Enable cet-ss & cet-ibt for supported CPU models
i386/tdx: Fix missing spaces in tdx_xfam_deps[]
target/i386/cpu.c | 256 +++++++++++++++++++++++++++++-------------
target/i386/cpu.h | 107 ++++++++++++++----
target/i386/helper.c | 12 ++
target/i386/kvm/kvm.c | 117 +++++++++++++++++++
target/i386/kvm/tdx.c | 20 ++--
target/i386/machine.c | 75 +++++++++++++
6 files changed, 478 insertions(+), 109 deletions(-)
--
2.34.1