From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Today there are two separate locations where TDX error codes are defined:
arch/x86/include/asm/tdx.h
arch/x86/kvm/vmx/tdx_errno.h
They have some overlap that is already defined similarly. Reduce the
duplication and prepare to introduce some helpers for these error codes in
the central place by unifying them. Join them at:
asm/shared/tdx_errno.h
...and update the headers that contained the duplicated definitions to
include the new unified header.
"asm/shared" is used for sharing TDX code between the early compressed
code and the normal kernel code. While the compressed code for the guest
doesn't use these error code header definitions today, it does make the
types of calls that return the values they define. So place the defines in
"shared" location so that it can, but leave such cleanups for future
changes.
Also, adjust BITUL() -> _BITULL() to address 32 bit build errors after the
move.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
[enhance log]
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
arch/x86/include/asm/shared/tdx.h | 1 +
.../{kvm/vmx => include/asm/shared}/tdx_errno.h | 28 +++++++++++++++++-----
arch/x86/include/asm/tdx.h | 21 ----------------
arch/x86/kvm/vmx/tdx.h | 1 -
4 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h
index 8bc074c8d7c6..6a1646fc2b2f 100644
--- a/arch/x86/include/asm/shared/tdx.h
+++ b/arch/x86/include/asm/shared/tdx.h
@@ -4,6 +4,7 @@
#include <linux/bits.h>
#include <linux/types.h>
+#include <asm/shared/tdx_errno.h>
#define TDX_HYPERCALL_STANDARD 0
diff --git a/arch/x86/kvm/vmx/tdx_errno.h b/arch/x86/include/asm/shared/tdx_errno.h
similarity index 64%
rename from arch/x86/kvm/vmx/tdx_errno.h
rename to arch/x86/include/asm/shared/tdx_errno.h
index 6ff4672c4181..8bf6765cf082 100644
--- a/arch/x86/kvm/vmx/tdx_errno.h
+++ b/arch/x86/include/asm/shared/tdx_errno.h
@@ -1,14 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* architectural status code for SEAMCALL */
-
-#ifndef __KVM_X86_TDX_ERRNO_H
-#define __KVM_X86_TDX_ERRNO_H
+#ifndef _ASM_X86_SHARED_TDX_ERRNO_H
+#define _ASM_X86_SHARED_TDX_ERRNO_H
+#include <asm/trapnr.h>
+/* Upper 32 bit of the TDX error code encodes the status */
#define TDX_SEAMCALL_STATUS_MASK 0xFFFFFFFF00000000ULL
/*
- * TDX SEAMCALL Status Codes (returned in RAX)
+ * TDX Status Codes (returned in RAX)
*/
+#define TDX_SUCCESS 0ULL
#define TDX_NON_RECOVERABLE_VCPU 0x4000000100000000ULL
#define TDX_NON_RECOVERABLE_TD 0x4000000200000000ULL
#define TDX_NON_RECOVERABLE_TD_NON_ACCESSIBLE 0x6000000500000000ULL
@@ -17,6 +18,7 @@
#define TDX_OPERAND_INVALID 0xC000010000000000ULL
#define TDX_OPERAND_BUSY 0x8000020000000000ULL
#define TDX_PREVIOUS_TLB_EPOCH_BUSY 0x8000020100000000ULL
+#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL
#define TDX_PAGE_METADATA_INCORRECT 0xC000030000000000ULL
#define TDX_VCPU_NOT_ASSOCIATED 0x8000070200000000ULL
#define TDX_KEY_GENERATION_FAILED 0x8000080000000000ULL
@@ -28,6 +30,20 @@
#define TDX_EPT_ENTRY_STATE_INCORRECT 0xC0000B0D00000000ULL
#define TDX_METADATA_FIELD_NOT_READABLE 0xC0000C0200000000ULL
+/*
+ * SW-defined error codes.
+ *
+ * Bits 47:40 == 0xFF indicate Reserved status code class that never used by
+ * TDX module.
+ */
+#define TDX_ERROR _BITULL(63)
+#define TDX_NON_RECOVERABLE _BITULL(62)
+#define TDX_SW_ERROR (TDX_ERROR | GENMASK_ULL(47, 40))
+#define TDX_SEAMCALL_VMFAILINVALID (TDX_SW_ERROR | _ULL(0xFFFF0000))
+
+#define TDX_SEAMCALL_GP (TDX_SW_ERROR | X86_TRAP_GP)
+#define TDX_SEAMCALL_UD (TDX_SW_ERROR | X86_TRAP_UD)
+
/*
* TDX module operand ID, appears in 31:0 part of error code as
* detail information
@@ -37,4 +53,4 @@
#define TDX_OPERAND_ID_SEPT 0x92
#define TDX_OPERAND_ID_TD_EPOCH 0xa9
-#endif /* __KVM_X86_TDX_ERRNO_H */
+#endif /* _ASM_X86_SHARED_TDX_ERRNO_H */
diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
index a149740b24e8..2917b3451491 100644
--- a/arch/x86/include/asm/tdx.h
+++ b/arch/x86/include/asm/tdx.h
@@ -9,29 +9,8 @@
#include <asm/errno.h>
#include <asm/ptrace.h>
-#include <asm/trapnr.h>
#include <asm/shared/tdx.h>
-/*
- * SW-defined error codes.
- *
- * Bits 47:40 == 0xFF indicate Reserved status code class that never used by
- * TDX module.
- */
-#define TDX_ERROR _BITUL(63)
-#define TDX_NON_RECOVERABLE _BITUL(62)
-#define TDX_SW_ERROR (TDX_ERROR | GENMASK_ULL(47, 40))
-#define TDX_SEAMCALL_VMFAILINVALID (TDX_SW_ERROR | _UL(0xFFFF0000))
-
-#define TDX_SEAMCALL_GP (TDX_SW_ERROR | X86_TRAP_GP)
-#define TDX_SEAMCALL_UD (TDX_SW_ERROR | X86_TRAP_UD)
-
-/*
- * TDX module SEAMCALL leaf function error codes
- */
-#define TDX_SUCCESS 0ULL
-#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL
-
#ifndef __ASSEMBLER__
#include <uapi/asm/mce.h>
diff --git a/arch/x86/kvm/vmx/tdx.h b/arch/x86/kvm/vmx/tdx.h
index b5cd2ffb303e..ac8323a68b16 100644
--- a/arch/x86/kvm/vmx/tdx.h
+++ b/arch/x86/kvm/vmx/tdx.h
@@ -3,7 +3,6 @@
#define __KVM_X86_VMX_TDX_H
#include "tdx_arch.h"
-#include "tdx_errno.h"
#ifdef CONFIG_KVM_INTEL_TDX
#include "common.h"
--
2.53.0On Mon, Mar 23, 2026, Vishal Verma wrote: > diff --git a/arch/x86/kvm/vmx/tdx_errno.h b/arch/x86/include/asm/shared/tdx_errno.h > similarity index 64% > rename from arch/x86/kvm/vmx/tdx_errno.h > rename to arch/x86/include/asm/shared/tdx_errno.h > index 6ff4672c4181..8bf6765cf082 100644 > --- a/arch/x86/kvm/vmx/tdx_errno.h > +++ b/arch/x86/include/asm/shared/tdx_errno.h > @@ -1,14 +1,15 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -/* architectural status code for SEAMCALL */ > - > -#ifndef __KVM_X86_TDX_ERRNO_H > -#define __KVM_X86_TDX_ERRNO_H > +#ifndef _ASM_X86_SHARED_TDX_ERRNO_H > +#define _ASM_X86_SHARED_TDX_ERRNO_H > +#include <asm/trapnr.h> > > +/* Upper 32 bit of the TDX error code encodes the status */ > #define TDX_SEAMCALL_STATUS_MASK 0xFFFFFFFF00000000ULL > > /* > - * TDX SEAMCALL Status Codes (returned in RAX) > + * TDX Status Codes (returned in RAX) > */ > +#define TDX_SUCCESS 0ULL > #define TDX_NON_RECOVERABLE_VCPU 0x4000000100000000ULL > #define TDX_NON_RECOVERABLE_TD 0x4000000200000000ULL > #define TDX_NON_RECOVERABLE_TD_NON_ACCESSIBLE 0x6000000500000000ULL > @@ -17,6 +18,7 @@ > #define TDX_OPERAND_INVALID 0xC000010000000000ULL > #define TDX_OPERAND_BUSY 0x8000020000000000ULL > #define TDX_PREVIOUS_TLB_EPOCH_BUSY 0x8000020100000000ULL > +#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL > #define TDX_PAGE_METADATA_INCORRECT 0xC000030000000000ULL > #define TDX_VCPU_NOT_ASSOCIATED 0x8000070200000000ULL > #define TDX_KEY_GENERATION_FAILED 0x8000080000000000ULL > @@ -28,6 +30,20 @@ > #define TDX_EPT_ENTRY_STATE_INCORRECT 0xC0000B0D00000000ULL > #define TDX_METADATA_FIELD_NOT_READABLE 0xC0000C0200000000ULL > > +/* > + * SW-defined error codes. > + * > + * Bits 47:40 == 0xFF indicate Reserved status code class that never used by > + * TDX module. > + */ > +#define TDX_ERROR _BITULL(63) > +#define TDX_NON_RECOVERABLE _BITULL(62) > +#define TDX_SW_ERROR (TDX_ERROR | GENMASK_ULL(47, 40)) > +#define TDX_SEAMCALL_VMFAILINVALID (TDX_SW_ERROR | _ULL(0xFFFF0000)) > + > +#define TDX_SEAMCALL_GP (TDX_SW_ERROR | X86_TRAP_GP) > +#define TDX_SEAMCALL_UD (TDX_SW_ERROR | X86_TRAP_UD) I don't think the host's SW-defined error codes should be used by the guest. The guest can't even make SEAMCALLs. So unless I'm misunderstanding the purpose, I don't think it makes sense to move these into tdx_errno.h. Regardless, please split this up into two patches: 1. Move tdx_errno.h 2. Land more #defines in tdx_errno.h Because IIUC, tdx_errno.h holds *only* architecturally defined values, which makes (1) super duper trivial to review and ack.
On Tue, 2026-03-31 at 12:30 -0700, Sean Christopherson wrote: > +#define TDX_SW_ERROR (TDX_ERROR | GENMASK_ULL(47, 40)) > > +#define TDX_SEAMCALL_VMFAILINVALID (TDX_SW_ERROR | _ULL(0xFFFF0000)) > > + > > +#define TDX_SEAMCALL_GP (TDX_SW_ERROR | X86_TRAP_GP) > > +#define TDX_SEAMCALL_UD (TDX_SW_ERROR | X86_TRAP_UD) > > I don't think the host's SW-defined error codes should be used by the guest. The > guest can't even make SEAMCALLs. So unless I'm misunderstanding the purpose, I > don't think it makes sense to move these into tdx_errno.h. Seems reasonable. > > Regardless, please split this up into two patches: > > 1. Move tdx_errno.h > 2. Land more #defines in tdx_errno.h > > Because IIUC, tdx_errno.h holds *only* architecturally defined values, which makes > (1) super duper trivial to review and ack. Thanks!
On Mon, Mar 23, 2026 at 02:59:04PM -0600, Vishal Verma wrote: >From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> > >Today there are two separate locations where TDX error codes are defined: > arch/x86/include/asm/tdx.h > arch/x86/kvm/vmx/tdx_errno.h > >They have some overlap that is already defined similarly. Reduce the >duplication and prepare to introduce some helpers for these error codes in >the central place by unifying them. Join them at: > asm/shared/tdx_errno.h >...and update the headers that contained the duplicated definitions to >include the new unified header. > >"asm/shared" is used for sharing TDX code between the early compressed >code and the normal kernel code. While the compressed code for the guest >doesn't use these error code header definitions today, it does make the >types of calls that return the values they define. So place the defines in >"shared" location so that it can, but leave such cleanups for future >changes. > >Also, adjust BITUL() -> _BITULL() to address 32 bit build errors after the >move. > >Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> >[enhance log] >Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> >Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> Reviewed-by: Chao Gao <chao.gao@intel.com>
© 2016 - 2026 Red Hat, Inc.