From nobody Fri Oct 3 06:34:57 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 52C692FABE2; Thu, 4 Sep 2025 11:20:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756984848; cv=none; b=hDjGkF6RWjQY3Q76BiRIGhKezU7giCjFBQyc8uo9RfXPIEWcB0c8QSHwYM2KNAWjS72Y5XQCTNYWs6U22K5GySQbot5/iH/H5jHLfsWGlUjfMo3CgHPcXD5NrWSTzApZvwv6GVbO2nzbylOYYd+mdDlwyYuLED5vKRYCoTTf6F0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756984848; c=relaxed/simple; bh=3BJ1iS550fspzjxDgBbG05We6vr3ElOhkNbJ/wTvRW4=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=ucmSw19I9+7QkEodoLyf7y9joXpCcz4PrBQTV/X68esxkE+L2taWD0GN3UyDOYfYHbunedYfXMGUvg0j8rMo5FzgML9tKXf0dJvLDodI26lZIixQrvk4978++js7ngjx4hpw8T76EiLgYzQAZmqH4x4RK3NT4DjUcWXB3vZb+Ww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=o9kqkH41; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=lxUgnsdV; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="o9kqkH41"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="lxUgnsdV" Date: Thu, 04 Sep 2025 11:20:44 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1756984845; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdJ/dgFSanydI8i3QzyUU4DaeCLK5diXTNkljag2+L4=; b=o9kqkH41g2wSdxaBYZCQQKvRnYxaOyRRmjD87jwcBOCSJ5RpEGtP0yLdoNHaJcokQNEV7i JPdrqc39d2cg/POTqsLhbXG1y2kVFiyvQaR5ul+JZNUd8QLcs/aehRosVfiJeItVQx5kd5 neXa8xAmKMCXpYvtnm/OSFSYQql83JMGYIujuAyXe8yAiwFMEa5sDaA+xLU0eagHU4yRjl loh1xuGFmKehaUGkGtRHbc/zsKHrpu0Kj1Dfh6F4MxQtr4u8AWtvLuTJhBbE9fXKEZRIsz n6dGpFlmABUzRj2T6ED23jyrve5WzgeQGrHufBvtdN3c+wdyP4hWNbp5VSMeKQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1756984845; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdJ/dgFSanydI8i3QzyUU4DaeCLK5diXTNkljag2+L4=; b=lxUgnsdV9bl6eBi5Tf4ZgPNzAOeYh6wXHTiTm1RCoffkyO2u7WCjd9KiZ9v9zNGyp0qqZ4 juNM0iBSyIU0/vBg== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/sev] x86/sev: Zap snp_abort() Cc: "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <175698484439.1920.8373998293291474848.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/sev branch of tip: Commit-ID: 9f8d92a1fbb5a08e17f9d405a1ab27be64096d8c Gitweb: https://git.kernel.org/tip/9f8d92a1fbb5a08e17f9d405a1ab27be6= 4096d8c Author: Borislav Petkov (AMD) AuthorDate: Wed, 03 Sep 2025 18:14:54 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 04 Sep 2025 13:15:59 +02:00 x86/sev: Zap snp_abort() It is a silly oneliner anyway. Replace it with its equivalent. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/boot/startup/sev-startup.c | 7 +------ arch/x86/boot/startup/sme.c | 2 +- arch/x86/include/asm/sev.h | 2 -- tools/objtool/noreturns.h | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/x86/boot/startup/sev-startup.c b/arch/x86/boot/startup/se= v-startup.c index 39465a0..a9b0a9c 100644 --- a/arch/x86/boot/startup/sev-startup.c +++ b/arch/x86/boot/startup/sev-startup.c @@ -144,7 +144,7 @@ static struct cc_blob_sev_info *__init find_cc_blob(str= uct boot_params *bp) =20 found_cc_info: if (cc_info->magic !=3D CC_BLOB_SEV_HDR_MAGIC) - snp_abort(); + sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED); =20 return cc_info; } @@ -218,8 +218,3 @@ bool __init snp_init(struct boot_params *bp) =20 return true; } - -void __init __noreturn snp_abort(void) -{ - sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED); -} diff --git a/arch/x86/boot/startup/sme.c b/arch/x86/boot/startup/sme.c index 2ddde90..e7ea65f 100644 --- a/arch/x86/boot/startup/sme.c +++ b/arch/x86/boot/startup/sme.c @@ -532,7 +532,7 @@ void __init sme_enable(struct boot_params *bp) * enablement abort the guest. */ if (snp_en ^ !!(msr & MSR_AMD64_SEV_SNP_ENABLED)) - snp_abort(); + sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED); =20 /* Check if memory encryption is enabled */ if (feature_mask =3D=3D AMD_SME_BIT) { diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index f222bef..32c7dd9 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -512,7 +512,6 @@ void snp_set_memory_shared(unsigned long vaddr, unsigne= d long npages); void snp_set_memory_private(unsigned long vaddr, unsigned long npages); void snp_set_wakeup_secondary_cpu(void); bool snp_init(struct boot_params *bp); -void __noreturn snp_abort(void); void snp_dmi_setup(void); int snp_issue_svsm_attest_req(u64 call_id, struct svsm_call *call, struct = svsm_attest_call *input); void snp_accept_memory(phys_addr_t start, phys_addr_t end); @@ -597,7 +596,6 @@ static inline void snp_set_memory_shared(unsigned long = vaddr, unsigned long npag static inline void snp_set_memory_private(unsigned long vaddr, unsigned lo= ng npages) { } static inline void snp_set_wakeup_secondary_cpu(void) { } static inline bool snp_init(struct boot_params *bp) { return false; } -static inline void snp_abort(void) { } static inline void snp_dmi_setup(void) { } static inline int snp_issue_svsm_attest_req(u64 call_id, struct svsm_call = *call, struct svsm_attest_call *input) { diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index 6a922d0..802895f 100644 --- a/tools/objtool/noreturns.h +++ b/tools/objtool/noreturns.h @@ -45,7 +45,6 @@ NORETURN(rewind_stack_and_make_dead) NORETURN(rust_begin_unwind) NORETURN(rust_helper_BUG) NORETURN(sev_es_terminate) -NORETURN(snp_abort) NORETURN(start_kernel) NORETURN(stop_this_cpu) NORETURN(usercopy_abort)