From nobody Fri Oct 25 19:34:39 2024 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 82E84CDB47E for ; Fri, 20 Oct 2023 11:38:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377354AbjJTLiS (ORCPT ); Fri, 20 Oct 2023 07:38:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377207AbjJTLh1 (ORCPT ); Fri, 20 Oct 2023 07:37:27 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6BF9D6B; Fri, 20 Oct 2023 04:37:24 -0700 (PDT) Date: Fri, 20 Oct 2023 11:37:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697801843; 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=GKRFnRVzgEzMPWvDP4LSHe3bjQoMjL8CrAeIorpqOn4=; b=f0Y+724mPL51jpbXry56wLrtCfocMhUsCVexH46x8XUE2cFdvIg1W2UJ8/LOipyP2vmen6 2SOyIYMUH/PAPn414PbKWV+w+vPDU4bJJjdzC+csTOe186yAkSaAG3xstgq8ckTG7nxCU9 1FGzYYyC9ID05+gReUuktsQI8XUlKDMTn7QS1086ebJ1aR+2bqqL7HItUMJOtRtOXfooTR KFkU9FfABTUQuGQFpUbBMKrKMOa0DTopmJglMIRlyWsvMHYrJ9AJfc/ODzOS7bW+tct4aR GTe+KCCUaQIyFunFWQhIv3iWXWeXI5+VzMIeHRdRLABWt86jh3XuEOsn4Ld+Tw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697801843; 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=GKRFnRVzgEzMPWvDP4LSHe3bjQoMjL8CrAeIorpqOn4=; b=07jNoivWysCvwm4g/Aqf+dKJGVGmWPCN4v4EwBKwCagrH2wZU9LEpccuv0b47Mu9FY68qz uYnOTPDPvfCuhaBg== 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: Print actual mitigation if requested mitigation isn't possible Cc: Josh Poimboeuf , Ingo Molnar , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.1693889988.git.jpoimboe@kernel.org> References: <7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.1693889988.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <169780184291.3135.9499525750020085275.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: 3fc7b28e831f15274a5526197b54a73a88620584 Gitweb: https://git.kernel.org/tip/3fc7b28e831f15274a5526197b54a73a8= 8620584 Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:50 -07:00 Committer: Borislav Petkov (AMD) CommitterDate: Fri, 20 Oct 2023 11:44:26 +02:00 x86/srso: Print actual mitigation if requested mitigation isn't possible If the kernel wasn't compiled to support the requested option, print the actual option that ends up getting used. Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Borislav Petkov (AMD) Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.16= 93889988.git.jpoimboe@kernel.org --- 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 2859a54..235c0e0 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 =3D SRSO_MITIGATION_SAFE_RET; } else { pr_err("WARNING: kernel not compiled with CPU_SRSO.\n"); - goto pred_cmd; } break; =20 @@ -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; =20 @@ -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;