Commit 87686987 authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Dave Hansen
Browse files

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: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Reviewed-by: default avatarRick Edgecombe <rick.p.edgecombe@intel.com>
Acked-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://patch.msgid.link/20260303030335.766779-3-xiaoyao.li@intel.com
parent 3aecb2e7

arch/x86/kvm/vmx/tdx.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/x86/kvm/vmx/tdx_arch.h

+0 −6
Original line number Diff line number Diff line
@@ -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

/*