From nobody Fri Feb 13 14:10:37 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 A0700CE7A88 for ; Sat, 23 Sep 2023 12:20:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231616AbjIWMUj (ORCPT ); Sat, 23 Sep 2023 08:20:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231631AbjIWMUS (ORCPT ); Sat, 23 Sep 2023 08:20:18 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C55231A6; Sat, 23 Sep 2023 05:20:11 -0700 (PDT) Date: Sat, 23 Sep 2023 12:20:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695471608; 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=yV846f86WwDQ6kBwtM1IpEG+32B/WRisw02scmbEy4Y=; b=H3yi/h5aQyBngla1raxAGUEhKoGjRrAdiii9F3OYy/1WlG31TV46iTRXl6xYbMY348Q5cQ vQ35vP52BCWX3xEHH3jCTVZXU/TnkIzLfNa18QAAZmZ4iWEcjYqr+iDPZhtN3FoLAxlfMI PxioJEb7sPtcyqe+JLlWXVlZE1dYopOMX5Pjb9rH4/EocbAzcCmBmtiqc0mIz7+JhjbTTS weY7XU92eVBTO/fVizy1b3+gi7smTCbmRqJqM80wn5yRnCkaOWfLG72LEXJxKux8IF8JVt DhbjqKL+EDhTUq6wnQJPad+mDEnatwyRBidlwpTjG8emVvFuGvhRQKwrhJFsIA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695471608; 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=yV846f86WwDQ6kBwtM1IpEG+32B/WRisw02scmbEy4Y=; b=H3gnx9gBW3djpisAPsmEpKL4p1AcCdtMcedtd1adibgX+KkFOn7N9AUcuKlim8tjooxnyy OKSYkci5ut5M6NCA== 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: Move retbleed IBPB check into existing 'has_microcode' code block Cc: Josh Poimboeuf , Ingo Molnar , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <0a22b86b1f6b07f9046a9ab763fc0e0d1b7a91d4.1693889988.git.jpoimboe@kernel.org> References: <0a22b86b1f6b07f9046a9ab763fc0e0d1b7a91d4.1693889988.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <169547160829.27769.14260324093851417943.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: 074c9666d42211d0f70d5c156d377a4881b2a98c Gitweb: https://git.kernel.org/tip/074c9666d42211d0f70d5c156d377a488= 1b2a98c Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:59 -07:00 Committer: Ingo Molnar CommitterDate: Sat, 23 Sep 2023 14:13:03 +02:00 x86/srso: Move retbleed IBPB check into existing 'has_microcode' code block Simplify the code flow a bit by moving the retbleed IBPB check into the existing 'has_microcode' block. Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/0a22b86b1f6b07f9046a9ab763fc0e0d1b7a91d4.16= 93889988.git.jpoimboe@kernel.org --- arch/x86/kernel/cpu/bugs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 941ac94..6b443f0 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2430,10 +2430,8 @@ static void __init srso_select_mitigation(void) setup_force_cpu_cap(X86_FEATURE_SRSO_NO); return; } - } =20 - if (retbleed_mitigation =3D=3D RETBLEED_MITIGATION_IBPB) { - if (has_microcode) { + if (retbleed_mitigation =3D=3D RETBLEED_MITIGATION_IBPB) { srso_mitigation =3D SRSO_MITIGATION_IBPB; goto out; }