From nobody Sun Sep 8 00:51:59 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 89C19CD54AB for ; Tue, 19 Sep 2023 09:54:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231882AbjISJyh (ORCPT ); Tue, 19 Sep 2023 05:54:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231764AbjISJxZ (ORCPT ); Tue, 19 Sep 2023 05:53:25 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 002EE137; Tue, 19 Sep 2023 02:53:17 -0700 (PDT) Date: Tue, 19 Sep 2023 09:53:15 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695117196; 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=U115kkJUr4RUArQuHB6xSU1A3yQCELtyFJilkhh/WHs=; b=C34BO7vzIRQl/wPdWuBzdx1LmcP68aHk1U01BG5L8MDxZvdHJWv1i52RcH8xGT1tDqcVGq Six9IoLB+o3R/RFRnE03hPvJ2UP7mQU5OBm1H5Awp/Vcej/jOQsJLcgy25rUm9Ru6um6+5 rCFVtQUNEd9YibW0XLbHvxCmq5vOKcVZTKUOe/tueOYrF+IJ4Q4d/8ksbdd9THkCNyXVEA jp7ABAudIEJvrmRS4WQu/McarCVEsvQalLt6Uihtjq7YFV7P8XKgIcvI2B3ssAnqW9xZuv t3sVK15OynsGvgRG96TwnUgZMeJ/ZA/0cr1IImCKdro3WTJqujD+wqgVLquGtw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695117196; 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=U115kkJUr4RUArQuHB6xSU1A3yQCELtyFJilkhh/WHs=; b=nEW0Dtdfhdcl6rQTkGSUwMIdjkxTkHrwMgsuoTNl7dOtPmRQ+yAChZb7gGE+96N8nCO75q JYNjXyLDaueefSDA== 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: Fix SBPB enablement for (possible) future fixed HW 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: <169511719558.27769.873036992380663838.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: 01bba38f23ed7ae627442015332333191af37a5a Gitweb: https://git.kernel.org/tip/01bba38f23ed7ae627442015332333191= af37a5a Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:49 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 19 Sep 2023 11:42:46 +02:00 x86/srso: Fix SBPB enablement for (possible) future fixed HW Make the SBPB check more robust against the (possible) case where future HW has SRSO fixed but doesn't have the SRSO_NO bit set. Fixes: 1b5277c0ea0b ("x86/srso: Add SRSO_NO support") Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/cee5050db750b391c9f35f5334f8ff40e66c01b9.16= 93889988.git.jpoimboe@kernel.org --- arch/x86/kernel/cpu/bugs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 10499bc..2859a54 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2496,7 +2496,7 @@ static void __init srso_select_mitigation(void) pr_info("%s%s\n", srso_strings[srso_mitigation], (has_microcode ? "" : ",= no microcode")); =20 pred_cmd: - if ((boot_cpu_has(X86_FEATURE_SRSO_NO) || srso_cmd =3D=3D SRSO_CMD_OFF) && + if ((!boot_cpu_has_bug(X86_BUG_SRSO) || srso_cmd =3D=3D SRSO_CMD_OFF) && boot_cpu_has(X86_FEATURE_SBPB)) x86_pred_cmd =3D PRED_CMD_SBPB; }