From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 0066F4FD29D; Fri, 18 Sep 2026 13:31:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789738317; cv=none; b=G0mORQgCd97K8L27G9lHyCgeAGImxVXWkqBlAoEJn70oAuTU6ONTULDvOD8sy/Y1iEXH4s9K3iSPczA/0K6Lz5pJ56TalNwuOLb/cYrMroOEyueiXqNb0wq+aEcqyYBd4Lh+J9znsAFPyceG4161jtGne+tTGtmvkkPPAdFu7q8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789738317; c=relaxed/simple; bh=fKmfnpJ5kVfOzdLTI5grolxxwlUvkZawqEiCJanMfzo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kZgDHe9bNxvT6WUGo5qwzS69KWffSJNdaASidp6eWTCjlnCGIgGGwSCtznmAGmshaI8UcjKT2ewdCCrBlPpEsvz38aZXb2NFfqsGwtyXZKUOXyvQSZQwe9q8nz24q3g4gTU80hzf2C1n1x+m0pfSuy7w+HCrsRfJnQdNyh4LZQM= 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=KCl6lnGb; arc=none smtp.client-ip=192.198.163.7 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="KCl6lnGb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789738313; x=1821274313; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fKmfnpJ5kVfOzdLTI5grolxxwlUvkZawqEiCJanMfzo=; b=KCl6lnGbmbm/hl4OyRSplkSSl+PxJ1uqmP1F79klMFC/y2zaveUXJFgb mG6aBcxF4Mw0HZ6e4z8dsa8ZMnt2wPMLLYtrqMXn7zSJ05kPrb52/Tpj5 OPBqRvhrTyrJyfeul6C7C+b1FLgCSpZMq/bF7Xss9oMQcizfqmlUtJtgp /HnYvBaMdwmb0/drxR/lTguzSkgnK8ZWY+reJTOVyFe9W3Ob+Y2ftSpgQ JkjklFRsgpv2hTT/tfo1vGkl+j4IoLK4rpJp81yTQh1uP8BcYxlLj+aIH c4XI7Uyj2LaocmBrfCxsNhPmvF9q24tOBGCBofJYRSs3toonRyOISGJG+ w==; X-CSE-ConnectionGUID: Lp5hDSlgSNKGW8+WEofJpw== X-CSE-MsgGUID: nMufvkT0SQS842k/l3xv9w== X-IronPort-AV: E=McAfee;i="6800,10657,11908"; a="115776172" X-IronPort-AV: E=Sophos;i="6.27,109,1787036400"; d="scan'208";a="115776172" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2026 06:31:46 -0700 X-CSE-ConnectionGUID: zbHHxWCuRx+WBVmX7P34lg== X-CSE-MsgGUID: rngrD0LATMy6ccLzJ2AwCw== X-ExtLoop1: 1 Received: from 984fee019967.jf.intel.com ([10.23.153.244]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2026 06:31:46 -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 , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Kiryl Shutsemau , Rick Edgecombe Subject: [RFC PATCH v2 09/10] x86/virt/tdx: Use early returns in get_tdx_sys_info() Date: Fri, 18 Sep 2026 06:29:28 -0700 Message-ID: <20260918132946.76533-10-chao.gao@intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260918132946.76533-1-chao.gao@intel.com> References: <20260918132946.76533-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. AI was used under supervision to review code and workshop logs. Signed-off-by: Chao Gao --- arch/x86/virt/vmx/tdx/tdx.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 9f9f2ef80f55..9d5a3296d3c0 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -564,19 +564,33 @@ 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 ?: get_tdx_sys_info_version(&sysinfo->version); + ret = get_tdx_sys_info_version(&sysinfo->version); pr_info("Module version: " TDX_VERSION_FMT "\n", sysinfo->version.major_version, sysinfo->version.minor_version, sysinfo->version.update_version); - ret = ret ?: get_tdx_sys_info_features(&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); + if (ret) + return ret; + + ret = get_tdx_sys_info_features(&sysinfo->features); + if (ret) + return ret; + + ret = get_tdx_sys_info_tdmr(&sysinfo->tdmr); + if (ret) + return ret; + + ret = get_tdx_sys_info_td_ctrl(&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 @@ -584,10 +598,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 = get_tdx_sys_info_tdmr_dpamt(&sysinfo->tdmr); + if (ret) + return ret; + } - return ret; + return 0; } static __init int check_features(struct tdx_sys_info *sysinfo) -- 2.52.0