From nobody Mon Feb 9 13:58:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF7ECA0FE2 for ; Tue, 5 Sep 2023 16:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244203AbjIEQyq (ORCPT ); Tue, 5 Sep 2023 12:54:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354205AbjIEKJo (ORCPT ); Tue, 5 Sep 2023 06:09:44 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 720061BE; Tue, 5 Sep 2023 03:09:41 -0700 (PDT) Date: Tue, 05 Sep 2023 10:09:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1693908580; 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: in-reply-to:in-reply-to:references:references; bh=4auprerRfw3THRPBl4yqOA+37MFNTEjxQFDihKFFHUA=; b=dTvUaGxJvq1IoZ0+YlJEGpaiEsCF696JeI0NzYrh3x5tOUY7yN5hMwCvY/M3Y18BX8adUi P8BScdi6YXj5SKcV4YRkwH8LzcC/XLQUB3ppjCLztDm898TC9QG9NZqaAZzStUVM1fpIWs iZhYVdP+z3yONbwr/kZihpXFAysfwSYWJGVm2rVthL1JqSYr9WKTRhyAGYsMXHcOD8trRL pGI33m8zk3nOZqoh5th7Vzd/YVPLmxslQrjyaahjHTcmnC2dDym1T9mu9945bcNVh51mUb C3QY06WY4Urhs349QkhZc9KnCraA7UYSiwSsGA7tg/ggvQv4xorfnxlHIvBdAA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1693908580; 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: in-reply-to:in-reply-to:references:references; bh=4auprerRfw3THRPBl4yqOA+37MFNTEjxQFDihKFFHUA=; b=RRYuQ5GfQX8W6a1Nj90S+n7OoTfqT1/V6BdgQUO0jb78ZcYOmhqUH7Qa3a+OPww1pFY4AW lTctmJ8BPEuBwFDA== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Cc: Josh Poimboeuf , Ingo Molnar , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169390857964.27769.7124908025755467189.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/bugs branch of tip: Commit-ID: a9c7b944ff32243c248fb4a801ffac21635d7042 Gitweb: https://git.kernel.org/tip/a9c7b944ff32243c248fb4a801ffac216= 35d7042 Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:48 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 05 Sep 2023 12:05:06 +02:00 x86/srso: Fix SBPB enablement for spec_rstack_overflow=3Doff If the user has requested no SRSO mitigation, other mitigations can use the lighter-weight SBPB instead of IBPB. Fixes: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation") Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/b20820c3cfd1003171135ec8d762a0b957348497.16= 93889988.git.jpoimboe@kernel.org --- arch/x86/kernel/cpu/bugs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index b0ae985..10499bc 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2433,7 +2433,7 @@ static void __init srso_select_mitigation(void) =20 switch (srso_cmd) { case SRSO_CMD_OFF: - return; + goto pred_cmd; =20 case SRSO_CMD_MICROCODE: if (has_microcode) {