The TDX architecture identifies some features that are off by default but can be enabled by the host during TDX module initialization. They are classified as add-on features because enabling them affects existing TDX systems: they may change existing feature behavior, or reserve more memory. The TDX module extends TDH.SYS.CONFIG with a new register argument to specify which add-on features to enable. This new argument is a bitmap that uses the same feature bits as TDX_FEATURES0. Note that Dynamic PAMT is an exception: although it is an add-on feature, it is controlled via a legacy, dedicated register argument [1]. The kernel needs to enable these add-on features when it supports them. Add a get_tdx_addon_features0() helper to return the bitmap of the add-on features that the module & kernel both support. Initially, this helper returns 0. It will be updated to return specific feature bits as full kernel support lands. Pass this extra bitmap to TDH.SYS.CONFIG wrapper. The TDX module requires SEAMCALL leaf version 1 for TDH.SYS.CONFIG when passing the new bitmap argument. A previous change [2] supports the versioned SEAMCALL leafs by adding a "version" field in struct tdx_module_args. Set the version field to 1 if the new bitmap argument is used to enable any add-on feature, otherwise keep the version as 0. This retains backward compatibility with older modules that don't recognize version 1. Signed-off-by: Xu Yilun Link: https://lore.kernel.org/all/20260904215841.303070-10-rick.p.edgecombe@intel.com/ # [1] Link: https://lore.kernel.org/all/20260722084634.131020-1-yilun.xu@linux.intel.com/ # [2] --- v2: - Don't pass addon_features0 parameter around, get it in the wrappers (Dave) - Remove TDH.SYS.UPDATE wrapper (Dave & Rick) - Drop the changelog section explaining why add-on feature enabling is needed in this series, as it is a generally understood pattern (Rick) - Add a note in the changelog that Dynamic PAMT is not enabled via the new bitmap argument (Rick) - Add __init tag for get_tdx_addon_features0() (AI nitpicker) v1: - Use tdx_module_args.version to assign SEAMCALL leaf versions (Dave) - Remove DICE specific descriptions (Rick) - Remove the global var tdx_addon_features0 (Chao) - Add a Macro to collect kernel supported add-on feature bits (Rick) - Changelog & code comments change --- arch/x86/virt/vmx/tdx/tdx.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index e06932f80395..763c2d1b25d0 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -998,6 +998,15 @@ static __init int construct_tdmrs(struct list_head *tmb_list, return ret; } +/* List all kernel supported add-on features0 bits here */ +#define TDX_KERNEL_SUPPORTED_ADDON_FEATURES0 (0) + +static __init u64 get_tdx_addon_features0(void) +{ + return tdx_sysinfo.features.tdx_features0 & + TDX_KERNEL_SUPPORTED_ADDON_FEATURES0; +} + /* * This is an array of HPAs, each points to a TDMR_INFO data structure (see * struct tdmr_info). @@ -1012,12 +1021,22 @@ struct tdmr_info_pa_array { static __init int tdx_sys_config(struct tdmr_info_pa_array *tdmr_pa_array, unsigned int nr_tdmr_pa, u64 global_keyid) { + u64 addon_features0 = get_tdx_addon_features0(); struct tdx_module_args args = { .rcx = __pa(tdmr_pa_array), .rdx = nr_tdmr_pa, .r8 = global_keyid, }; + /* + * Use SEAMCALL version 1 that supports add-on features if any are + * requested. Otherwise use version 0 for backward compatibility. + */ + if (addon_features0) { + args.r9 = addon_features0; + args.version = 1; + } + return seamcall_prerr(TDH_SYS_CONFIG, &args); } -- 2.25.1