From mboxrd@z Thu Jan 1 00:00:00 1970 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 70C86CA0FF3 for ; Tue, 5 Sep 2023 16:01:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235102AbjIEQBs (ORCPT ); Tue, 5 Sep 2023 12:01:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350935AbjIEFFN (ORCPT ); Tue, 5 Sep 2023 01:05:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BB3BCCF for ; Mon, 4 Sep 2023 22:05:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F13A56135B for ; Tue, 5 Sep 2023 05:05:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF117C433C9; Tue, 5 Sep 2023 05:05:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693890309; bh=wseebdWJGAG73aEf4oxCFFQ8XYhFMGqIJFkJEq0d3CE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pwwmtiYoC1irDfZTJ9mINZvsHSB7Ro72ninK4N1SlBi++3vBV6BEJJEe267PHQR46 DG2+DwJUNBq9aB56sVDKxbGTjeZMC2JPdlbmc49SuV3jMy4cir0UrodE9jg0up6jlj 2smFHgOk1J4NBCXLYDky8HiPrX7mbelGkOPrUjAOgYF+lzFa+NgKhDR80OYm0ecQq8 +I+NAU15nMATFj+9aWTjx799g9txmgJB09RsD/tYF6QbCFhOMb1lN8ecGVrKcKGcON t8fKR2z+Tme5xHXl35f1EKq5aVVFQbMaiHncbNhwF5lrC+56LPtrYDUgqHJBYk2/Fo kGyG1Occ/5ggA== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Borislav Petkov , Peter Zijlstra , Babu Moger , Paolo Bonzini , Sean Christopherson , David.Kaplan@amd.com, Andrew Cooper , Nikolay Borisov , gregkh@linuxfoundation.org, Thomas Gleixner Subject: [PATCH v3 04/20] x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Date: Mon, 4 Sep 2023 22:04:48 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 b0ae985aa6a4..10499bcd4e39 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) switch (srso_cmd) { case SRSO_CMD_OFF: - return; + goto pred_cmd; case SRSO_CMD_MICROCODE: if (has_microcode) { -- 2.41.0