From nobody Tue Oct 7 03:50:43 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 4AC062D7810; Tue, 15 Jul 2025 09:21:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752571297; cv=none; b=iq/nSY41MVqVTo2gO0Vg2ZXociE4HgPQuK/wmTwObQsinbO3nEkojgkH8OjQCZoRubmAFfZpjh6cY5pWrjIt1R0QmVImEWqpGxqeUf5uVJC35wMhhUg7iOFRNVC8wt75RvnojVKMGy9d3NyDc741S2OinHJD15y+JmwLv8eCNEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752571297; c=relaxed/simple; bh=x092r1fSBa4wry6ULv5QvHdrP4+so9lToB70GqLJWdY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X/B71A+fBIeegKAltx3ymFisfhHCb8b+ANybAULrVP8P6qkw3ztIdnifhAcnUBlWZ1iXiWmra9wSuaDRQ3uw2ppMLNrC93vma4SWYn3byLEce6c1cJYsK1wDYk4CcdMmmOUuzqpycSSELbUdBIvmW74kCDeuxaLK4x55IsvONKA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=nwGLhbNt; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="nwGLhbNt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1752571296; x=1784107296; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x092r1fSBa4wry6ULv5QvHdrP4+so9lToB70GqLJWdY=; b=nwGLhbNtBNfoF9GTT5h5kVhDt7WCI/+ZkT+5rywQWNUUF3yMYr2IdCg7 XUuLSq141RtWIPMUzEbXsNumEMDvEkHxQ+s64HhfyX4H/aUXzwa0b4+BR dihzQKvN76z5YqMLQqytqCwIUjFd5KJpFjHJ1e090N9bg8FpTMgJJFIFs 0dFfvs9QpVsT8OAfrZ5b4xEGKZdsZB1abWWBUahSL5Iwtc8a778/S8eLS p01Y8kUxEhhMf8aWSck8Yo0+MtsrSp041659/NxnKo+yV8fIeMcSw6xLh IoSMw7PgwgNfFb8mm/K2kyvxlSglP/OUjnoTvXfQ9OwFjlQ9/C/fF+gV+ w==; X-CSE-ConnectionGUID: AvrbvQnCQ6uymaH9Az09IA== X-CSE-MsgGUID: s7mlzyBuTs+ZBGRoEQEEpQ== X-IronPort-AV: E=McAfee;i="6800,10657,11491"; a="54003351" X-IronPort-AV: E=Sophos;i="6.16,313,1744095600"; d="scan'208";a="54003351" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2025 02:21:36 -0700 X-CSE-ConnectionGUID: 19HcrPZkQyaUkFNFIdbYUA== X-CSE-MsgGUID: 8P4M9pqnQOmbtc9nqXq5vg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,313,1744095600"; d="scan'208";a="188183701" Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by fmviesa001.fm.intel.com with ESMTP; 15 Jul 2025 02:21:31 -0700 From: Xiaoyao Li To: "Kirill A. Shutemov" , Dave Hansen , Sean Christopherson , Paolo Bonzini Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , linux-coco@lists.linux.dev, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, Rick Edgecombe , Kai Huang , binbin.wu@linux.intel.com, yan.y.zhao@intel.com, reinette.chatre@intel.com, adrian.hunter@intel.com, tony.lindgren@intel.com, xiaoyao.li@intel.com Subject: [PATCH v3 2/4] KVM: TDX: Remove redundant definitions of TDX_TD_ATTR_* Date: Tue, 15 Jul 2025 17:13:10 +0800 Message-ID: <20250715091312.563773-3-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250715091312.563773-1-xiaoyao.li@intel.com> References: <20250715091312.563773-1-xiaoyao.li@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Kirill A. Shutemov Reviewed-by: Kai Huang Signed-off-by: Xiaoyao Li Reviewed-by: Rick Edgecombe --- arch/x86/kvm/vmx/tdx.c | 4 ++-- arch/x86/kvm/vmx/tdx_arch.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index c539c2e6109f..efb7d589b672 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -62,7 +62,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); } =20 -#define KVM_SUPPORTED_TD_ATTRS (TDX_TD_ATTR_SEPT_VE_DISABLE) +#define KVM_SUPPORTED_TD_ATTRS (TDX_ATTR_SEPT_VE_DISABLE) =20 static __always_inline struct kvm_tdx *to_kvm_tdx(struct kvm *kvm) { @@ -700,7 +700,7 @@ int tdx_vcpu_create(struct kvm_vcpu *vcpu) vcpu->arch.l1_tsc_scaling_ratio =3D kvm_tdx->tsc_multiplier; =20 vcpu->arch.guest_state_protected =3D - !(to_kvm_tdx(vcpu->kvm)->attributes & TDX_TD_ATTR_DEBUG); + !(to_kvm_tdx(vcpu->kvm)->attributes & TDX_ATTR_DEBUG); =20 if ((kvm_tdx->xfam & XFEATURE_MASK_XTILE) =3D=3D XFEATURE_MASK_XTILE) vcpu->arch.xfd_no_write_intercept =3D true; diff --git a/arch/x86/kvm/vmx/tdx_arch.h b/arch/x86/kvm/vmx/tdx_arch.h index a30e880849e3..350143b9b145 100644 --- 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; =20 -#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 /* --=20 2.43.0