From nobody Mon May 25 05:12:51 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010016.outbound.protection.outlook.com [40.93.198.16]) (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 25E252DECDE for ; Mon, 18 May 2026 10:23:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.16 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779099790; cv=fail; b=MRXAbG+ZD2JfmqSVF3bzt9VwZFqFXy5/F0nQGAeHq402eveFJetq7ZvK1+8M5jir/OkXB6P9FMEThabQBeeHgjgKhcqLSuFBZFqtST37vytvv3lulAXEWNJovyKbm1sY4R7yyOhp1FqR/9kglHCwVF7nAtNc/ecskxOIys7+Gh0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779099790; c=relaxed/simple; bh=HkCpWBMNLuuDkk+CYD4YK/g00FZVt81OwD+rggywzo8=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=IfBc/jzFHngi3KIiwbnm66Z/wV8C9I+k2Ft6YWxpyJMhuzMNtZpmIsD3pO3dO0ijiwZWD98k3vMz+4tkrkZBWI5JchBxQS/8ndjC7WfbzCCmUj+p6nTMWo+yDFfAfHGLeMJhtikHPhdfOn2TNsJRthNUfzdL1hd8oIvx7m+I9No= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=KiwaTnQT; arc=fail smtp.client-ip=40.93.198.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="KiwaTnQT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M2zjXNgYq0UZXMGUenoaFnjO16R77EEWT66+gIYOAf1bg2ujijmc1mggWHnRUoAtdDXBCosd2Pm5wiGhdfYrXNJkbEdQNNqAg8e200LT6UepvaOLfUv1Eyn4UiJ8RSGNvNnqHCaMosiSe5Pk5GYjnD4yMPsRZ7RYqBnfeOfc/yFto8Jq9WaiXO+Q5je9PkPdjlBkVX4DWJKau+32CXc7wKqAytujkmNdhuKCVikuQrFkel/ULDEmRrmwAwOOj5k0eNdZ6Dq0+zp3mqQMbtDdogp/AZp/d44FQwKmXm/40xkD+auLd5SN7eYJZRJfqmi/AllU055zllR+jZaSwPG1CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wbkkx59UdpSkT5u4dfNXZGGRMZMXmLygvxmJM2YoFZo=; b=Q9jfBKeyySLT1x3SCLiIfyXGzFZTUcYokZQn4YeheUT6YIbvOEDmTmMM4sFc/Ph80Sl10SJIEAJx0vumup61AQbf5cIKmdYdR2O89k50c7XK9wGJW/pftOUMBVV5dh2Zp439W56RRBjq1dqOkaH2zPl6UuB45ij0/BPYh4AIZ8iCqrnZBRRvOsKNQQ6EQMfFZBmvGdtX3nzwPAE8QbVrwXygh3WReLB88YNbOQ6rsgH2G0RZfS7yDy2vB93XFKkYUSCrUM1s1phjtoRehzNgkpY7Sw9hoShv2oYh3xMzqVi7PibDjIYuLsts1bvZU+P6xMvey770PEAVDLwZt6LNjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wbkkx59UdpSkT5u4dfNXZGGRMZMXmLygvxmJM2YoFZo=; b=KiwaTnQTaCLbbHXmXZmjAu0HYHTVhJOfIAe+fyCixUPcuvXll8j8ltOjHX1CnAAOvUgYX4G3Pen3XXePgxqOjetOtb1DZjT4qiovQnRKVKxsrh1Cf9dDQyTglEoTmgkC7HISHOeAsvfDPfxdmGFVHuYApz1S32yHjlAiIevFa98= Received: from CH2PR18CA0039.namprd18.prod.outlook.com (2603:10b6:610:55::19) by MW3PR12MB4476.namprd12.prod.outlook.com (2603:10b6:303:2d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.25.23; Mon, 18 May 2026 10:23:05 +0000 Received: from CH3PEPF00000012.namprd21.prod.outlook.com (2603:10b6:610:55:cafe::e1) by CH2PR18CA0039.outlook.office365.com (2603:10b6:610:55::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9913.12 via Frontend Transport; Mon, 18 May 2026 10:23:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH3PEPF00000012.mail.protection.outlook.com (10.167.244.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.71.0 via Frontend Transport; Mon, 18 May 2026 10:23:05 +0000 Received: from gomati.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Mon, 18 May 2026 05:22:50 -0500 From: Nikunj A Dadhania To: , , CC: , , , , , Subject: [PATCH] x86/sev: Remove redundant ghcbs_initialized checks around __sev_{get,put}_ghcb() Date: Mon, 18 May 2026 10:22:30 +0000 Message-ID: <20260518102230.3394603-1-nikunj@amd.com> X-Mailer: git-send-email 2.48.1 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 X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF00000012:EE_|MW3PR12MB4476:EE_ X-MS-Office365-Filtering-Correlation-Id: 136f61d1-960c-433c-29fe-08deb4c772fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700016|1800799024|3023799003|11063799003|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: 0U4QrElRIex/2zscGJxJN0s/N06I2fJIn6uEKFam/ViEx42pd09IWxBCptj43YajcxSVc11gIH02yKRZIlMg52g7Mf2PCJO/ywqvecZFXq983lVlgx6+3ZfL4RMcg+TZvZYREYHeXWNNZ2FdTTny882NiT5ftEkYV5QR9DvbDpfFZpG2bZPY/DvP4PJp5MFGRnYw7IQ81lbtIE94WP7jr9EsmrZ2w3BmYoF8K1OMaKRprMTMEBC2D+Lp0PpHDifFEIJnJS4eP+GR+leP0Xu4sTfx2vapT8TLpS/cL5U7xPRvF/huphajS9QcgrIyOP9gC6dNUs/6B/t11j8bHszP88Q98UDIuC81z53oanqriOl3hq/FVaCaHQGXX77NIzpDwQybGfQ9e3a9HmMngwID6m+N06dAP7KaOhml3dmx7MeiHzpzqDHQ/2xTVdsZsHKtv3uZqHDaUXbZDTcguxgm2qLihoot94vEAUlkpfDpeTzC6SQetLzQzrMG0wlQBH/nVDGIcNguEtFbEiuLYPs0iOmGqNYsLw5ahJFXJLEz6sKaN/ojd2Soy03j18PuPS/XLoUOO9OpLMlUiFFu27w4fEm/2hmW6ckyxviJ4JMgILeY00oMffkUQkT9SI5nrmS5QmovOQg+0PV4H8derIbOJmtp643KPPauLMsOAqy3oc4H39d2mxxx3CBUwfYH4Py+k4p3H26ux/GjK4jOFwBCjt1y8VF6ldDQeGrprfeheGs= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700016)(1800799024)(3023799003)(11063799003)(56012099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QsOfz0Yf7yd8KuCskDrg+3UHtCmxyyLVr0Ik7mYVDag6jiEO8HbQ1tWGoaWd2fhnka37znNF9TG2S7GBfPg//UbAMEqHsmZp/fTLhe6fawaZfF9zFTI/PYLHRVelqHPriFkRHKb9lj86HHEARcFzW1IC8I7viakOYcglxggm7if3Y7jncKhmqAH2BmBtvl6LIlPQsaoSAWhCcGKyoKP8l0R6DYmPKhwktRJk+vBuwFRquYuCUL9pm7eER5H/OxmvT7DnA0P482StOfgcs4jxcSyX19bJN3Z4eSIQ7a4WPupSU9p3g89yHKBpiDDOKhrDj9Np/9E9kDoIz/Whn1v1P6m8NV/uS2gTyU3M7Jo0AluPM8uZgEjZ9NgAzXqe/MQ9Ec507Ahdy2+cVsYKrvIOzxtwZ8RC0+tl/YxZoG5TdxTl/wn5KO//TRcuWa3/G9tj X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2026 10:23:05.3262 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 136f61d1-960c-433c-29fe-08deb4c772fc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH3PEPF00000012.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4476 Content-Type: text/plain; charset="utf-8" After commit 3645eb7e3915 ("x86/fred: Fix early boot failures on SEV-ES/SNP guests"), __sev_{get,put}_ghcb() handle the early-boot GHCB fallback internally, making the ghcbs_initialized guards in __set_pages_state() and svsm_perform_call_protocol() redundant. Remove these redundant conditionals and call __sev_{get,put}_ghcb() unconditionally. Also initialize state->ghcb to NULL in the early-boot path of __sev_get_ghcb() so that the ghcb_state is well-defined for all callers, even though __sev_put_ghcb() currently returns early before reading it. No functional change intended. Suggested-by: Tom Lendacky Signed-off-by: Nikunj A Dadhania Reviewed-by: Tom Lendacky --- arch/x86/coco/sev/core.c | 8 ++------ arch/x86/coco/sev/noinstr.c | 4 +++- arch/x86/coco/sev/svsm.c | 10 ++-------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 7ed3da998489d..ecd77d3217f3c 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -367,17 +367,13 @@ static unsigned long __set_pages_state(struct snp_psc= _desc *data, unsigned long =20 local_irq_save(flags); =20 - if (sev_cfg.ghcbs_initialized) - ghcb =3D __sev_get_ghcb(&state); - else - ghcb =3D boot_ghcb; + ghcb =3D __sev_get_ghcb(&state); =20 /* Invoke the hypervisor to perform the page state changes */ if (!ghcb || vmgexit_psc(ghcb, data)) sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_PSC); =20 - if (sev_cfg.ghcbs_initialized) - __sev_put_ghcb(&state); + __sev_put_ghcb(&state); =20 local_irq_restore(flags); =20 diff --git a/arch/x86/coco/sev/noinstr.c b/arch/x86/coco/sev/noinstr.c index 5afd663a1c217..e1e03f12fc7bb 100644 --- a/arch/x86/coco/sev/noinstr.c +++ b/arch/x86/coco/sev/noinstr.c @@ -121,8 +121,10 @@ noinstr struct ghcb *__sev_get_ghcb(struct ghcb_state = *state) =20 WARN_ON(!irqs_disabled()); =20 - if (!sev_cfg.ghcbs_initialized) + if (!sev_cfg.ghcbs_initialized) { + state->ghcb =3D NULL; return boot_ghcb; + } =20 data =3D this_cpu_read(runtime_data); ghcb =3D &data->ghcb_page; diff --git a/arch/x86/coco/sev/svsm.c b/arch/x86/coco/sev/svsm.c index 2acf4a76afe7a..916d62cd17dc7 100644 --- a/arch/x86/coco/sev/svsm.c +++ b/arch/x86/coco/sev/svsm.c @@ -74,20 +74,14 @@ int svsm_perform_call_protocol(struct svsm_call *call) =20 flags =3D native_local_irq_save(); =20 - if (sev_cfg.ghcbs_initialized) - ghcb =3D __sev_get_ghcb(&state); - else if (boot_ghcb) - ghcb =3D boot_ghcb; - else - ghcb =3D NULL; + ghcb =3D __sev_get_ghcb(&state); =20 do { ret =3D ghcb ? svsm_perform_ghcb_protocol(ghcb, call) : __pi_svsm_perform_msr_protocol(call); } while (ret =3D=3D -EAGAIN); =20 - if (sev_cfg.ghcbs_initialized) - __sev_put_ghcb(&state); + __sev_put_ghcb(&state); =20 native_local_irq_restore(flags); =20 --=20 2.48.1