From nobody Wed Jun 17 05:14:19 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F22093A6F06; Mon, 27 Apr 2026 22:26:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777328802; cv=none; b=S/sZ38RtYecj6yYICwWCktOMbU+LAslEqGhZnhKaBIXCO4fTy/e7f4Vp24gs+FqrISFNCNQqj0gGp6LYiX7ns1c3GNkelxTp7/HAB2F6lDX1D4x930Xg0MWLP6kbjIRVuGW2+/uT9jWRPiiWlbQ9FPcOHlBYk+WAzfQ2DTTQ6eE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777328802; c=relaxed/simple; bh=KFuhYwNu4t0PzicVTmLOydy/aP/ZhkDlln2NxOoeDn8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=PyoWb0v2TiGLnAMysiJorJwMDqlnjy0gBNfgDoXbocfP2dkhSBRp/P64LpO66Xck1xSej8rnEBIz354cON/O89DJcXF4lQm+6GqbIfGbyRB4aIc/cJpzOXcpmS/7RF0jYlv8kNQNCzwfJRZb57DGzD6CITUP+pS1RKk2ElVDYlw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=o13oHmui; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=AHZbDYh6; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="o13oHmui"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="AHZbDYh6" Date: Mon, 27 Apr 2026 22:26:37 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777328799; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7o4zqVpygAxygJrIX7EvFv5e+1icFmOTRL6lPiXvaz4=; b=o13oHmuiMNWdvmSwnYi28JGSvC+Mu8PE+0MSC9hchsMhtFwP+PNNvnNajuokEqcC5v6Pm/ pSiG0JXoRveV1njJPLtmYOpb7jk5l8TCUrCNcwwArGKr1UssGxL3R7cX0eMuEP5j0cTZlU caLU0TNDhmJqHk5is5MkQ2+lzCClBFM+hnWfmHnVW2s3f5eI/VR6IgQpGzcVIPensd0WUI o++iClVhL2XX2+PwvZAYXlGlM9wAL3/O+AZWvE0DaVeXAbVxqE4Dwn/PKVxfOKLkQPr4po TX2YRMRTt+2Ao944MFHdUo/+rSo+9UnJuW1tHslXjsyEODtoIGm3NACj8E0L6Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777328799; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7o4zqVpygAxygJrIX7EvFv5e+1icFmOTRL6lPiXvaz4=; b=AHZbDYh6vGQo5uRk8F3yD6psNloNCPZUFReuX7ZCSSjnZ+EDTh7mte56HQr9NRuqgo+BWo 6XsO2mmznGV2yOBg== From: "tip-bot2 for Vishal Verma" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/tdx] x86/virt/tdx: Add SEAMCALL wrapper for TDH.SYS.DISABLE Cc: Rick Edgecombe , Vishal Verma , Dave Hansen , Chao Gao , "Kiryl Shutsemau (Meta)" , Kai Huang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260402-fuller_tdx_kexec_support-v3-3-34438d7094bf@intel.com> References: <20260402-fuller_tdx_kexec_support-v3-3-34438d7094bf@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177732879757.3521451.17995256759524893162.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/tdx branch of tip: Commit-ID: b7d2173946efa20434aefd7421b46a90f1080fbe Gitweb: https://git.kernel.org/tip/b7d2173946efa20434aefd7421b46a90f= 1080fbe Author: Vishal Verma AuthorDate: Thu, 02 Apr 2026 00:32:03 -06:00 Committer: Dave Hansen CommitterDate: Mon, 27 Apr 2026 15:13:38 -07:00 x86/virt/tdx: Add SEAMCALL wrapper for TDH.SYS.DISABLE Some early TDX-capable platforms have an erratum where a partial write to TDX private memory can cause a machine check on a subsequent read. On these platforms, kexec and kdump have been disabled in these cases, because the old kernel cannot safely hand off TDX state to the new kernel. Later TDX modules support the TDH.SYS.DISABLE SEAMCALL, which provides a way to cleanly disable TDX and allow kexec to proceed. The new SEAMCALL has an enumeration bit, but that is ignored. It is expected that users will be using the latest TDX module, and the failure mode for running the missing SEAMCALL on an older module is not fatal. This can be a long running operation, and the time needed largely depends on the amount of memory that has been allocated to TDs. If all TDs have been destroyed prior to the sys_disable call, then it is fast, with only needing to override the TDX module memory. After the SEAMCALL completes, the TDX module is disabled and all memory resources allocated to TDX are freed and reset. The next kernel can then re-initialize the TDX module from scratch via the normal TDX bring-up sequence. The SEAMCALL can return two different error codes that expect a retry. - TDX_INTERRUPTED_RESUMABLE can be returned in the case of a host interrupt. However, it will not return until it makes some forward progress, so we can expect to complete even in the case of interrupt storms. - TDX_SYS_BUSY will be returned on contention with other TDH.SYS.* SEAMCALLs, however a side effect of TDH.SYS.DISABLE is that it will block other SEAMCALLs once it gets going. So this contention will be short lived. So loop infinitely on either of these error codes, until success or other error. An error is printed if the SEAMCALL fails with anything other than the error codes that cause retries, or 'synthesized' error codes produced for #GP or #UD. e.g., an old module that has been properly initialized, that doesn't implement SYS_DISABLE, returns TDX_OPERAND_INVALID. This prints: virt/tdx: TDH.SYS.DISABLE failed: 0xc000010000000000 But a system that doesn't have any TDX support at all doesn't print anything. Co-developed-by: Rick Edgecombe Signed-off-by: Rick Edgecombe Signed-off-by: Vishal Verma Signed-off-by: Dave Hansen Reviewed-by: Chao Gao Reviewed-by: Kiryl Shutsemau (Meta) Acked-by: Kai Huang Link: https://patch.msgid.link/20260402-fuller_tdx_kexec_support-v3-3-34438= d7094bf@intel.com --- arch/x86/include/asm/shared/tdx_errno.h | 1 +- arch/x86/include/asm/tdx.h | 3 ++- arch/x86/virt/vmx/tdx/tdx.c | 31 ++++++++++++++++++++++++- arch/x86/virt/vmx/tdx/tdx.h | 1 +- 4 files changed, 36 insertions(+) diff --git a/arch/x86/include/asm/shared/tdx_errno.h b/arch/x86/include/asm= /shared/tdx_errno.h index 3c1e8ce..ee411b3 100644 --- a/arch/x86/include/asm/shared/tdx_errno.h +++ b/arch/x86/include/asm/shared/tdx_errno.h @@ -13,6 +13,7 @@ #define TDX_NON_RECOVERABLE_TD_NON_ACCESSIBLE 0x6000000500000000ULL #define TDX_NON_RECOVERABLE_TD_WRONG_APIC_MODE 0x6000000700000000ULL #define TDX_INTERRUPTED_RESUMABLE 0x8000000300000000ULL +#define TDX_SYS_BUSY 0x8000020200000000ULL #define TDX_OPERAND_INVALID 0xC000010000000000ULL #define TDX_OPERAND_BUSY 0x8000020000000000ULL #define TDX_PREVIOUS_TLB_EPOCH_BUSY 0x8000020100000000ULL diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h index bf83a97..15eac89 100644 --- a/arch/x86/include/asm/tdx.h +++ b/arch/x86/include/asm/tdx.h @@ -193,6 +193,8 @@ static inline int pg_level_to_tdx_sept_level(enum pg_le= vel level) return level - 1; } =20 +void tdx_sys_disable(void); + u64 tdh_vp_enter(struct tdx_vp *vp, struct tdx_module_args *args); u64 tdh_mng_addcx(struct tdx_td *td, struct page *tdcs_page); u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, struct page *page, struct= page *source, u64 *ext_err1, u64 *ext_err2); @@ -224,6 +226,7 @@ static inline void tdx_init(void) { } static inline u32 tdx_get_nr_guest_keyids(void) { return 0; } static inline const char *tdx_dump_mce_info(struct mce *m) { return NULL; } static inline const struct tdx_sys_info *tdx_get_sysinfo(void) { return NU= LL; } +static inline void tdx_sys_disable(void) { } #endif /* CONFIG_INTEL_TDX_HOST */ =20 #endif /* !__ASSEMBLER__ */ diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 1b2d854..1ae558b 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -1947,3 +1948,33 @@ u64 tdh_phymem_page_wbinvd_hkid(u64 hkid, struct pag= e *page) return seamcall(TDH_PHYMEM_PAGE_WBINVD, &args); } EXPORT_SYMBOL_FOR_KVM(tdh_phymem_page_wbinvd_hkid); + +void tdx_sys_disable(void) +{ + struct tdx_module_args args =3D {}; + u64 ret; + + /* + * Don't loop forever. + * + * - TDX_INTERRUPTED_RESUMABLE guarantees forward progress between + * calls. + * + * - TDX_SYS_BUSY could be returned due to contention with other + * TDH.SYS.* SEAMCALLs, but will lock out *new* TDH.SYS.* SEAMCALLs, + * so that SYS.DISABLE can eventually make progress. + * + * This is a 'destructive' SEAMCALL, in that no other SEAMCALL can be + * run after this until a full reinitialization is done. + */ + do { + ret =3D seamcall(TDH_SYS_DISABLE, &args); + } while (ret =3D=3D TDX_INTERRUPTED_RESUMABLE || ret =3D=3D TDX_SYS_BUSY); + + /* + * Print SEAMCALL failures, but not SW-defined error codes + * (SEAMCALL faulted with #GP/#UD, TDX not supported). + */ + if (ret && (ret & TDX_SW_ERROR) !=3D TDX_SW_ERROR) + pr_err("TDH.SYS.DISABLE failed: 0x%016llx\n", ret); +} diff --git a/arch/x86/virt/vmx/tdx/tdx.h b/arch/x86/virt/vmx/tdx/tdx.h index dde219c..e2cf2dd 100644 --- a/arch/x86/virt/vmx/tdx/tdx.h +++ b/arch/x86/virt/vmx/tdx/tdx.h @@ -46,6 +46,7 @@ #define TDH_PHYMEM_PAGE_WBINVD 41 #define TDH_VP_WR 43 #define TDH_SYS_CONFIG 45 +#define TDH_SYS_DISABLE 69 =20 /* * SEAMCALL leaf: