Received: by 2002:a05:7412:1703:b0:e2:908c:2ebd with SMTP id dm3csp814056rdb; Fri, 25 Aug 2023 01:40:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHeDlEwFDGckmSfNZ4+gwCcWrScJPn9zdTipSoxUsBMgOU1bwvt9ETNIpM6TUdn9wKZhhXS X-Received: by 2002:aa7:d5d2:0:b0:523:c36e:ec8b with SMTP id d18-20020aa7d5d2000000b00523c36eec8bmr18891618eds.9.1692952829480; Fri, 25 Aug 2023 01:40:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692952829; cv=none; d=google.com; s=arc-20160816; b=ATff2vkDWY1lnoWodu+qS08TTbgpaJN68ZAJ31e3tpwaGjG7ZWdNeMpnM1ORdr/0dt 9vGPTKpQZyeKEG4WaCjxNlqSdyQoKwtrMSVeepAqAGt3rfOIJ4uBeqs07VbuUMODAWzJ NLnHFNTpGsTK9xWVaG5RAiGQYy9qPt23ykUDK7AqPalTSFsB8eU4PP0TxlHOuSQkSL1b Ofdz6dI/EF4n80zksc705/WSmHHtgma90T+mrER1rfgX0lHluyeBUDxZPILn53GXjk8V G6snx0YqqwcwDwfm7yNUU7XhHx+N4CHQmQTAC9aXVxaAXGBpdz0lm7RNdoJBFqoHq88M W74w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LJrUzc7kPXsypsFG8rFky6xsHqjxQTcbq31ykslFFUE=; fh=ZwaEcDYNCnlh+U7YxZ1LCEcet9pcdhSkEX0cCEOksvY=; b=S6ibzYwtPPgkAsi2qb0wqkTXpsFbtD4bMVKP30BxtIEr1KwvGLE2h7SCrdy89X2h+Y iyM/+saFqxOQQevI9SlOFDc8RLLdNcQi5/8O+RtTieynj9+MOlM/C69H8cKlC88k6tTr QF0pgpEQ0mQXoL7NnKQvduFB7Wa62kJpDoZHmPTkX7Mral+73vUgxHr3nHgv2o4HzRQc 6f8YhGE+oym9E7coHO/6MFN4CI5s/3tB0pBdCmqlBz39Wfv37Lktjwhk/fGBR0mwfbPn U5bCflQ2rNVCPG3hvHOLX5nDJspKe43pVTygps/URaf2nE1DORXxcKyCM3rOVJn1Er9F lSrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SJa0rSxw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g7-20020aa7d1c7000000b0052a1ce53c9asi851784edp.517.2023.08.25.01.40.00; Fri, 25 Aug 2023 01:40:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SJa0rSxw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242886AbjHYHC1 (ORCPT + 99 others); Fri, 25 Aug 2023 03:02:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242129AbjHYHCK (ORCPT ); Fri, 25 Aug 2023 03:02:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07A28E6B for ; Fri, 25 Aug 2023 00:02:08 -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 9149B647DE for ; Fri, 25 Aug 2023 07:02:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9711CC433C8; Fri, 25 Aug 2023 07:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692946927; bh=IuB7d7u3ZasrJgf6zWs7ZIAwIpl7dQyQe9v+nAwbKYs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SJa0rSxwCHlFszzZ//cEfqScdVa7WJVX4DfbH0JcXQrAp+P6cU8gtFTW+7FcYCvFU P4jsB8GQObOAthxHXPjNSR9zxfPe6nSa6VlVOoktAtyugclVABcOnat0dE6zkD+Kzy Gj5L/fiBv887Q5UQpoNpdiI435drSGVnqetOhN8GXkliCaZ7gtv2mBeYw+2NIm7ulN OYaESSddvwu+rTPFUh0UE1uO0e2tE9nXaSqlfnjvTu5+0+FnUPTBCE35zIA27fqtzh rUnVprAKCz9x98EOgTT0QdnNGHDuy9lu0NyIss9CPKZsfAU+kgZVH9D7dp+Uvcad7e 1sYJ7zH78ta8g== 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 08/23] x86/srso: Print actual mitigation if requested mitigation isn't possible Date: Fri, 25 Aug 2023 00:01:39 -0700 Message-ID: <0f8b03be6b785efdc4a3d37feca0b25ef850e011.1692919072.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the kernel wasn't compiled to support the requested option, print the actual option that ends up getting used. Reviewed-by: Borislav Petkov (AMD) Signed-off-by: Josh Poimboeuf --- arch/x86/kernel/cpu/bugs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 2859a54660a2..235c0e00ae51 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2461,7 +2461,6 @@ static void __init srso_select_mitigation(void) srso_mitigation = SRSO_MITIGATION_SAFE_RET; } else { pr_err("WARNING: kernel not compiled with CPU_SRSO.\n"); - goto pred_cmd; } break; @@ -2473,7 +2472,6 @@ static void __init srso_select_mitigation(void) } } else { pr_err("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n"); - goto pred_cmd; } break; @@ -2485,7 +2483,6 @@ static void __init srso_select_mitigation(void) } } else { pr_err("WARNING: kernel not compiled with CPU_SRSO.\n"); - goto pred_cmd; } break; -- 2.41.0