From nobody Sat Feb 14 03:17:28 2026 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 87DBDCD54A9 for ; Tue, 19 Sep 2023 09:54:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231968AbjISJyU (ORCPT ); Tue, 19 Sep 2023 05:54:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231777AbjISJxX (ORCPT ); Tue, 19 Sep 2023 05:53:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83BDA12B; Tue, 19 Sep 2023 02:53:16 -0700 (PDT) Date: Tue, 19 Sep 2023 09:53:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695117195; 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=kRid2LK3qEac8qjy85RFIAwdbfs+iLAW0ERxN/f+5h4=; b=KCxwmL4yzRC2pGx2lis6EpUr70kXA4rZSPMVXJ1rLV1TMHxDiASCr9QnZ54Mn/m29HEiYV bUIiUFlVcLpAI99GoyVTOzOCApAHY5mXZWFMYNisAydFquFCg9/KGVLhJDLKC4omX0wC8S xh6CwLU56V9pOAtsn22XC6eebNHXhUmWIFZyoQ9ds4XQ+p6D1o3eiC/1cj56tRJnud1xoW k8D23xHh/SsWM5HD0CVELpfapk1Dv5fewuOJ62gJgGadbl5j6ZYIBC2cBo+PEp8Xrht1Ut YMYuJ5weGsJrjcKLvB9Pqu80i8hTA2txMKYjE2Fs3F1+ggl2s9xYu+jLeydQ3Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695117195; 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=kRid2LK3qEac8qjy85RFIAwdbfs+iLAW0ERxN/f+5h4=; b=NgGObuAie86HIq7mf9pIwH66N+/V/ibGc88+CwfMQcky6FVNCnjqQhgqv/zIEUwwLMNP/C lSNzCbZKuiQOASDA== 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 , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169511719449.27769.9404090787517473617.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: 6988c6ceccb03bb29723bbf5645f7f5ab0658816 Gitweb: https://git.kernel.org/tip/6988c6ceccb03bb29723bbf5645f7f5ab= 0658816 Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:51 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 19 Sep 2023 11:42:47 +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 Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/ec3af919e267773d896c240faf30bfc6a1fd6304.16= 93889988.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) &&