KVM/TDX: Remove redundant definitions of TDX_TD_ATTR_*

There are definitions of TD attributes bits inside asm/shared/tdx.h as
TDX_ATTR_*.

Remove KVM's definitions and use the ones in asm/shared/tdx.h

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Kai Huang <kai.huang@intel.com>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Acked-by: Sean Christopherson <seanjc@google.com>
Link: https://patch.msgid.link/20260303030335.766779-3-xiaoyao.li@intel.com

diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
index c5065f84b78be3ca09cd854611e6c9dc3ec61ae4..f38e492fb3d59d9361e50c6a07486e949b06237a 100644 (file)
--- a/arch/x86/kvm/vmx/tdx.c
+++ b/arch/x86/kvm/vmx/tdx.c
@@ -75,7 +75,7 @@ void tdh_vp_wr_failed(struct vcpu_tdx *tdx, char *uclass, char *op, u32 field,
        pr_err("TDH_VP_WR[%s.0x%x]%s0x%llx failed: 0x%llx\n", uclass, field, op, val, err);
 }
 
-#define KVM_SUPPORTED_TD_ATTRS (TDX_TD_ATTR_SEPT_VE_DISABLE)
+#define KVM_SUPPORTED_TD_ATTRS (TDX_ATTR_SEPT_VE_DISABLE)
 
 static __always_inline struct kvm_tdx *to_kvm_tdx(struct kvm *kvm)
 {
@@ -707,7 +707,7 @@ int tdx_vcpu_create(struct kvm_vcpu *vcpu)
        vcpu->arch.l1_tsc_scaling_ratio = kvm_tdx->tsc_multiplier;
 
        vcpu->arch.guest_state_protected =
-               !(to_kvm_tdx(vcpu->kvm)->attributes & TDX_TD_ATTR_DEBUG);
+               !(to_kvm_tdx(vcpu->kvm)->attributes & TDX_ATTR_DEBUG);
 
        if ((kvm_tdx->xfam & XFEATURE_MASK_XTILE) == XFEATURE_MASK_XTILE)
                vcpu->arch.xfd_no_write_intercept = true;

diff --git a/arch/x86/kvm/vmx/tdx_arch.h b/arch/x86/kvm/vmx/tdx_arch.h
index a30e880849e33459a8487ae700808a113374cacd..350143b9b1451cc8b29d6132849e24c7bd0392ce 100644 (file)
--- a/arch/x86/kvm/vmx/tdx_arch.h
+++ b/arch/x86/kvm/vmx/tdx_arch.h
@@ -75,12 +75,6 @@ struct tdx_cpuid_value {
        u32 edx;
 } __packed;
 
-#define TDX_TD_ATTR_DEBUG              BIT_ULL(0)
-#define TDX_TD_ATTR_SEPT_VE_DISABLE    BIT_ULL(28)
-#define TDX_TD_ATTR_PKS                        BIT_ULL(30)
-#define TDX_TD_ATTR_KL                 BIT_ULL(31)
-#define TDX_TD_ATTR_PERFMON            BIT_ULL(63)
-
 #define TDX_EXT_EXIT_QUAL_TYPE_MASK    GENMASK(3, 0)
 #define TDX_EXT_EXIT_QUAL_TYPE_PENDING_EPT_VIOLATION  6
 /*