From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (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 CFD973AE71E for ; Wed, 30 Sep 2026 05:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790746867; cv=none; b=MBtnya84Y4VTnSldUSmQip5tQLjHkHJa9CPj/MbGmfktlOIk6tX100hwEfx/6sr78Sszu9USbVwF/4bVjI/G9EkznmlzcErTJ1jKxf4LOkB6VXuwucRjEOw0h/3JgPn9g73J0PjdX3FFWmnCiippLz5pSGu0A1Q/IBWG+mf5WzQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790746867; c=relaxed/simple; bh=pbFuUbGzpIZoG5uC6Tm5ggE5txSjxZHHrdMa2QBn85c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=anCZ2ndcfdx1bouD9myDbNrGJmDaQpfG3svHGSslxBcIshSoCq04UYnwiBejMgm1QvJNlQi2gQdFb/xo3X6i4+Ew0g4HmJH8oonbpbp35wnaL+pAYcmq1xL5KtKye5OSkpnrI8jgTdB3OI18hFZZ6k4FMKkblN0xiVGg3xgerNs= 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=RkP6wSCU; arc=none smtp.client-ip=192.198.163.9 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="RkP6wSCU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790746866; x=1822282866; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pbFuUbGzpIZoG5uC6Tm5ggE5txSjxZHHrdMa2QBn85c=; b=RkP6wSCUYjGi5rBg3UqeTfP+S2G6FM2OcQ1vIOL/YF4j/ndXnbfZrVuc JHtjcGPXJTkPHfEISYoM9culrKH9f2XJ9JF9ISsHD+MX3XhVjhCV5hoRV nBT/MNRBNWNrBrhbpfb/p/7wyVkJDPooHhTx3qhxeAb1zXHCqV/TIRI6S UWHpPUebFH3AkvjXNzP1WjLFXZeJIZfvIGlCKyyajN1vJuwmdRhncCqSs MLLh5n1BV46OkBD9GnIdMzFv7SzfeRQ5iMJAkWrmCRt4RX20vbvdJV4/P FIidCBDAwvc0Q8yt8k0EdEa/ZkdK10i+noC1AWfC6VNMCrMAQp7k5FepS g==; X-CSE-ConnectionGUID: V8rgYnHMRt26OiRNGdsF6A== X-CSE-MsgGUID: kdxS0J8WTua5wN0YG+SdLg== X-IronPort-AV: E=McAfee;i="6800,10657,11920"; a="102149090" X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="102149090" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2026 22:41:00 -0700 X-CSE-ConnectionGUID: Cov5FLUhSaSj+fs3XhCVxw== X-CSE-MsgGUID: 7yb5u6H+QRmCbIVyX7M8wg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="278936399" Received: from 984fee019967.jf.intel.com ([10.23.153.244]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2026 22:41:00 -0700 From: Chao Gao To: linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org Cc: yilun.xu@linux.intel.com, chao.gao@intel.com, binbin.wu@linux.intel.com, tony.lindgren@linux.intel.com, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Kiryl Shutsemau , Rick Edgecombe Subject: [PATCH v3 03/10] x86/virt/tdx: Convert the features metadata reader Date: Tue, 29 Sep 2026 22:38:37 -0700 Message-ID: <20260930053901.22528-4-chao.gao@intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260930053901.22528-1-chao.gao@intel.com> References: <20260930053901.22528-1-chao.gao@intel.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Continue converting the metadata readers to the table-driven helper. Add a table that pairs each field ID with the 'struct tdx_sys_info_features' member that holds its value, and read all fields by walking that table. Even though the structure has only one field, add a table anyway for symmetry with the other classes. Adding a field later then becomes a one-line change. Annotate the table as __initconst as it is referenced only during init. AI was used under supervision to review code and workshop logs. Signed-off-by: Chao Gao --- arch/x86/virt/vmx/tdx/tdx.c | 7 +++++++ arch/x86/virt/vmx/tdx/tdx.h | 3 +++ arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 13 +------------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 9d8a55a5da31..c78bb3be6303 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -443,6 +443,13 @@ static const struct field_mapping version_mappings[] = { TDX_SYSINFO_MAP_VERSION(TDX_FIELD_UPDATE_VERSION, update_version), }; +#define TDX_SYSINFO_MAP_FEATURES(_field_id, _member) \ + TDX_SYSINFO_MAP(_field_id, struct tdx_sys_info_features, _member) + +static const struct field_mapping feature_mappings[] __initconst = { + TDX_SYSINFO_MAP_FEATURES(TDX_FIELD_TDX_FEATURES0, tdx_features0), +}; + #include "tdx_global_metadata.c" static __init int check_features(struct tdx_sys_info *sysinfo) diff --git a/arch/x86/virt/vmx/tdx/tdx.h b/arch/x86/virt/vmx/tdx/tdx.h index 10cbc2d77a5a..87e055a2546c 100644 --- a/arch/x86/virt/vmx/tdx/tdx.h +++ b/arch/x86/virt/vmx/tdx/tdx.h @@ -62,6 +62,9 @@ #define TDX_FIELD_MAJOR_VERSION 0x0800000100000004ULL #define TDX_FIELD_UPDATE_VERSION 0x0800000100000005ULL +/* Class "TDX Module Info" */ +#define TDX_FIELD_TDX_FEATURES0 0x0A00000300000008ULL + /* TDX page types */ #define PT_NDA 0x0 #define PT_RSVD 0x1 diff --git a/arch/x86/virt/vmx/tdx/tdx_global_metadata.c b/arch/x86/virt/vmx/tdx/tdx_global_metadata.c index c55674cd4ce6..3996af787ff8 100644 --- a/arch/x86/virt/vmx/tdx/tdx_global_metadata.c +++ b/arch/x86/virt/vmx/tdx/tdx_global_metadata.c @@ -7,17 +7,6 @@ * Include this file to other C file instead. */ -static __init int get_tdx_sys_info_features(struct tdx_sys_info_features *sysinfo_features) -{ - int ret = 0; - u64 val; - - if (!ret && !(ret = read_sys_metadata_field(0x0A00000300000008, &val))) - sysinfo_features->tdx_features0 = val; - - return ret; -} - static __init int get_tdx_sys_info_tdmr_dpamt(struct tdx_sys_info_tdmr *sysinfo_tdmr) { int ret; @@ -121,7 +110,7 @@ static __init int get_tdx_sys_info(struct tdx_sys_info *sysinfo) sysinfo->version.minor_version, sysinfo->version.update_version); - ret = ret ?: get_tdx_sys_info_features(&sysinfo->features); + ret = ret ?: read_sys_metadata_table(feature_mappings, &sysinfo->features); ret = ret ?: get_tdx_sys_info_tdmr(&sysinfo->tdmr); ret = ret ?: get_tdx_sys_info_td_ctrl(&sysinfo->td_ctrl); ret = ret ?: get_tdx_sys_info_td_conf(&sysinfo->td_conf); -- 2.52.0