Messages in this thread Patch in this message |  | | From | "Huang, Kai" <> | | Subject | Re: [PATCH v4 01/16] x86/tdx: Move all TDX error defines into <asm/shared/tdx_errno.h> | | Date | Tue, 25 Nov 2025 22:30:08 +0000 |
| |
> --- a/arch/x86/kvm/vmx/tdx_errno.h > +++ b/arch/x86/include/asm/shared/tdx_errno.h > @@ -1,14 +1,16 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -/* architectural status code for SEAMCALL */ > +#ifndef _X86_SHARED_TDX_ERRNO_H > +#define _X86_SHARED_TDX_ERRNO_H
AFAICT other files under asm/shared/ all use
#ifdef _ASM_X86_SHARED_xx_H ...
I guess it's better to follow this pattern.
> > -#ifndef __KVM_X86_TDX_ERRNO_H > -#define __KVM_X86_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 SEAMCALL Status Codes
Nit:
I don't quite follow this change. Just curious: is it because "returned in RAX" doesn't apply to all error codes any more?
> */ > +#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 +19,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 +31,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 +54,4 @@ > #define TDX_OPERAND_ID_SEPT 0x92 > #define TDX_OPERAND_ID_TD_EPOCH 0xa9 > > -#endif /* __KVM_X86_TDX_ERRNO_H */ > +#endif /* _X86_SHARED_TDX_ERRNO_H */ > diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h > index 6b338d7f01b7..2f3e16b93b4c 100644 > --- a/arch/x86/include/asm/tdx.h > +++ b/arch/x86/include/asm/tdx.h > @@ -12,26 +12,6 @@ > #include <asm/trapnr.h>
I think you can remove <asm/trapnr.h> here since now <asm/tdx.h> is no longer using any definitions from it. And <asm/shared/tdx_errno.h> now includes it directly.
|  |