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 E66013B5318; Wed, 30 Sep 2026 05:41:17 +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=1790746882; cv=none; b=cb0kXATNWyzMP4iL4UbJCRYe/EvGYqHd1A438D+eUssyaFmLlNKDRagTwAhYTlZdWMn+ogmw1EVfmaTfVHHZkLvQn3HAJKe/USHFwtWm1/n10CjtQjUvDRavX8FRV1AQeugkznNzZ45diUmnP0uorQoKeH6tCTFGVW4JQQ9+4jE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790746882; c=relaxed/simple; bh=xrHwoJOfZBklJb6DwE80ancRVkpnUAPyNXCgdD8wRIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jDD1/nOXQWxhAfER63hcGwNGNvPGpHsRc7+4OQO9RIjczqhDk2Kydk4Jr9erCVed6I9abhbT3gbZpQFWkVK8S6/HWs3A7s+1w/y3KMQPfZe38bhRE7yXm7X2OAIsXN9YlojBzhUe4UzO9jTJxB8JmhDLPXVeeOU22quhB5xJhYQ= 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=DVAGkefY; 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="DVAGkefY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790746878; x=1822282878; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xrHwoJOfZBklJb6DwE80ancRVkpnUAPyNXCgdD8wRIg=; b=DVAGkefYZCo28Og1O/NMnM8v7f5yMwlurnl/GGF4Nwfl7BDzwqG9bK9v f1rDxhCSrYNFleUr5d0yIJDaOMPBtSWk6+UpatdRklsOBp7/1PBEBkEys eS24lWl+EVF0AtEJg/LYT8/7BNPY7gwpj9L5O86x4vqxfZcMXEY2qSWWk Z1n3aMAul4deGlQvzcSL85VZixyVQt+oI/c3+t8t/o34uH/H9He/xXhAD IhJPp4Vt7gjze1w0eABH5AONRNoXR+eYMMe8Aq7s3TsCv6tlNiG0njd5l fdEFnh2nu18JzPrpSS1zUoGEt0/EsI7M0YdlnVjHg4VLQzK707ipb67JZ Q==; X-CSE-ConnectionGUID: ca6Yq6HNTkW0z6womiHkvA== X-CSE-MsgGUID: dXgmb8IHSsyRhGSwYsgGTg== X-IronPort-AV: E=McAfee;i="6800,10657,11920"; a="102149138" X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="102149138" 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:05 -0700 X-CSE-ConnectionGUID: BKl12byaRDm98IsW1h0sxA== X-CSE-MsgGUID: 5CIFEh0KQLWWQRQfRZQzBA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="278936435" 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:04 -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 09/10] x86/virt/tdx: Use early returns in get_tdx_sys_info() Date: Tue, 29 Sep 2026 22:38:43 -0700 Message-ID: <20260930053901.22528-10-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit get_tdx_sys_info() was generated by a script. It chains its metadata reads with: ret = ret ?: get_tdx_sys_info_foo(...); The function is maintained by hand now. Use conventional early returns instead. Print the module version only after its metadata has been read successfully. The "ret ?:" chain had no early exit, so the pr_info() between the reads ran even when the version read itself failed, printing a partially read or all-zero version. That isn't considered a big problem, but early returns make it easy to avoid. AI was used under supervision to review code and workshop logs. Signed-off-by: Chao Gao --- v3: - Print the module version only after reading its metadata succeeds [Rick] --- arch/x86/virt/vmx/tdx/tdx.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 1a69beb62ec2..e7d4fc3f350f 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -537,19 +537,32 @@ static __init int get_tdx_sys_info_td_conf(struct tdx_sys_info_td_conf *td_conf) static __init int get_tdx_sys_info(struct tdx_sys_info *sysinfo) { - int ret = 0; + int ret; - ret = ret ?: read_sys_metadata_table(version_mappings, &sysinfo->version); + ret = read_sys_metadata_table(version_mappings, &sysinfo->version); + if (ret) + return ret; pr_info("Module version: " TDX_VERSION_FMT "\n", sysinfo->version.major_version, sysinfo->version.minor_version, sysinfo->version.update_version); - ret = ret ?: read_sys_metadata_table(feature_mappings, &sysinfo->features); - ret = ret ?: read_sys_metadata_table(tdmr_mappings, &sysinfo->tdmr); - ret = ret ?: read_sys_metadata_table(td_ctrl_mappings, &sysinfo->td_ctrl); - ret = ret ?: get_tdx_sys_info_td_conf(&sysinfo->td_conf); + ret = read_sys_metadata_table(feature_mappings, &sysinfo->features); + if (ret) + return ret; + + ret = read_sys_metadata_table(tdmr_mappings, &sysinfo->tdmr); + if (ret) + return ret; + + ret = read_sys_metadata_table(td_ctrl_mappings, &sysinfo->td_ctrl); + if (ret) + return ret; + + ret = get_tdx_sys_info_td_conf(&sysinfo->td_conf); + if (ret) + return ret; /* * The kernel supports using TDX without DPAMT, so @@ -557,10 +570,13 @@ static __init int get_tdx_sys_info(struct tdx_sys_info *sysinfo) * try to support buggy TDX modules that advertise * DPAMT but don't expose the metadata. */ - if (!ret && tdx_supports_dynamic_pamt(sysinfo)) + if (tdx_supports_dynamic_pamt(sysinfo)) { ret = read_sys_metadata_table(dpamt_mappings, &sysinfo->tdmr); + if (ret) + return ret; + } - return ret; + return 0; } static __init int check_features(struct tdx_sys_info *sysinfo) -- 2.52.0