From nobody Tue Dec 16 23:59:10 2025 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 79688C7EE2C for ; Fri, 25 Aug 2023 10:21:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244381AbjHYKVK (ORCPT ); Fri, 25 Aug 2023 06:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244438AbjHYKUP (ORCPT ); Fri, 25 Aug 2023 06:20:15 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C32E212C; Fri, 25 Aug 2023 03:20:09 -0700 (PDT) Date: Fri, 25 Aug 2023 10:19:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692958774; 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=MRdQ7JbEVBYrNlUo+uX+ro78pQXjSolB/VNAOcBMxJw=; b=hsMhncCPDeLAqxafhg0JV6SWexfEOhk2paAy3rcTYsLfwMHYTnLHeXMVWM3iCDcveWu3VE ofZoJJjEJTvFW77nfc1PlE/W+hZHj8R1etH228qN1oiDAOYzeSTzS9G+aXIrrjhaVH2nXL qPeXNy5maMHEX7jIh3iZpTEOJ6zkwQlbgrhMyffNbWol60VZvZP1J0DMwCXT6P+sLaWH4Y t84JYVZIcvU/O46RLziku9Ul24ZpMbjrdEm+8Xbx5pNt1p0Db6Zrf8Saryj2n7HlSHHF4m tX5ZdEXMjREELlYscRaD1AHtYQYRwRt+7BQtiEWMx3GAH9Ycr8EJBUqOXyaD1w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692958774; 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=MRdQ7JbEVBYrNlUo+uX+ro78pQXjSolB/VNAOcBMxJw=; b=SMNeSaulcToCCuFkYaDyCl6qk+3/l167bTBsSDVVas6Fg78VJz5k6DJp9OZPc1uERKUusB REbYDbIHrNbaVSBg== 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 , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169295877427.27769.6051096646833992817.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: 85e22808baacb80d17c5d3179be9aa4121638c1e Gitweb: https://git.kernel.org/tip/85e22808baacb80d17c5d3179be9aa412= 1638c1e Author: Josh Poimboeuf AuthorDate: Fri, 25 Aug 2023 00:01:37 -07:00 Committer: Ingo Molnar CommitterDate: Fri, 25 Aug 2023 11:21:58 +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 Link: https://lore.kernel.org/r/d025b558e451325db3a2c76f3daafe26a0928789.16= 92919072.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) {