From nobody Wed Dec 17 00:00:16 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 0B03BEE49B4 for ; Fri, 25 Aug 2023 10:21:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244513AbjHYKUw (ORCPT ); Fri, 25 Aug 2023 06:20:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244409AbjHYKUK (ORCPT ); Fri, 25 Aug 2023 06:20:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6F072110; Fri, 25 Aug 2023 03:19:52 -0700 (PDT) Date: Fri, 25 Aug 2023 10:19:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692958773; 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=E796Sw489r2umEqwXmnd9RXlCHrQFxUNQB8oVZQcAXo=; b=CmXXN96hIk76JQhgUHrL46dyqBoiDLZdgLYYWNqs8r/7tijp3XxOvbNbwn0XrfJtZ5ktLj J6QBueo7IxQ78ugV0v2wjVJvEfvYxqcRfhxyG99KubK3V9gmCqsZjynoiOvEVvHzphsuun R6dMUd6es731DSQ8UCOJ1KSb8h5QDZmQty9WzYY9E3Pl+LnA7A9tWgx8YaVthGD9l65NYz XCV2uvU/+VOBlQjSKjYXs4AnoA6TyR615nEw5rBMkMRzOWbCTFl9LbXeEVxZ2clIJzPu9f BQvA56x/MolHdwt7rE2juA6K0D9wczGXoioDB50AaFHI5tB/mfZbYYab1FGaVg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692958773; 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=E796Sw489r2umEqwXmnd9RXlCHrQFxUNQB8oVZQcAXo=; b=nn010WpaGglEOiGCNSKcTabKDa3+iw4kXRHqTqzHicp7LT99SE2S23bM59mxpxjLFprRbR mcSA0ijVPh0bs5Dw== 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 mitigation for retbleed IBPB case Cc: Josh Poimboeuf , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1f2f2257abc4047c707d0b8dbbd8e796730597f6.1692919072.git.jpoimboe@kernel.org> References: <1f2f2257abc4047c707d0b8dbbd8e796730597f6.1692919072.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <169295877297.27769.39540868241003808.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: ff32aa3d112156877c2ebc931099cda1c973fa6a Gitweb: https://git.kernel.org/tip/ff32aa3d112156877c2ebc931099cda1c= 973fa6a Author: Josh Poimboeuf AuthorDate: Fri, 25 Aug 2023 00:01:40 -07:00 Committer: Ingo Molnar CommitterDate: Fri, 25 Aug 2023 11:21:59 +02:00 x86/srso: Print mitigation for retbleed IBPB case When overriding the requested mitigation with IBPB due to retbleed=3Dibpb, print the mitigation in the usual format instead of a custom error message. Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/1f2f2257abc4047c707d0b8dbbd8e796730597f6.16= 92919072.git.jpoimboe@kernel.org --- arch/x86/kernel/cpu/bugs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 235c0e0..6c47f37 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2425,9 +2425,8 @@ static void __init srso_select_mitigation(void) =20 if (retbleed_mitigation =3D=3D RETBLEED_MITIGATION_IBPB) { if (has_microcode) { - pr_err("Retbleed IBPB mitigation enabled, using same for SRSO\n"); srso_mitigation =3D SRSO_MITIGATION_IBPB; - goto pred_cmd; + goto out; } } =20 @@ -2490,7 +2489,8 @@ static void __init srso_select_mitigation(void) break; } =20 - pr_info("%s%s\n", srso_strings[srso_mitigation], (has_microcode ? "" : ",= no microcode")); +out: + pr_info("%s%s\n", srso_strings[srso_mitigation], has_microcode ? "" : ", = no microcode"); =20 pred_cmd: if ((!boot_cpu_has_bug(X86_BUG_SRSO) || srso_cmd =3D=3D SRSO_CMD_OFF) &&