From patchwork Fri Oct 20 11:37:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 156043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp991305vqb; Fri, 20 Oct 2023 04:39:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmdmfiw8niYyQ6nBrPNZ2F/OU9nveSSe0YW88sACmP6ztOeS9DSx1L3VFot77Jbcg1agf9 X-Received: by 2002:a05:6a20:6a0f:b0:138:836c:5370 with SMTP id p15-20020a056a206a0f00b00138836c5370mr1526307pzk.42.1697801991445; Fri, 20 Oct 2023 04:39:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697801991; cv=none; d=google.com; s=arc-20160816; b=EXSycm+AfY5WQV5Eka1E10qNdDeNdATxE3xiQvgIyHahpB6hTRVQFCNgvJOmBpRssy /YcSJPb80cGBSnmbaSCVwacmF+uwXqN3jV6dnuqUfvmmbJEU6uYYMmB3khbsiIlqNkOV z7Nnoc5hHzYYpka4MHl2QRgW1UqvkqgvHLhS+ChPD5ZC2xHHdWf9Nwa9DiwJum91bTRf lJqBVBYjj1Rp1Vwt1UcI6H7pKWTJPDBuefMLwKnfC11k+zuR9Je8ehwu1tnkABwfqt2F bvzU9uBhw99eveXSS31P2X6yG982nYaheAxuXS7H4++SFwQdA84orbaqx07yQdMzVtLa F/9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=b8D4ifbQMwjKAoh4l22IcJp3Al++IiSB3u7+qpEkMZo=; fh=TJa98jjcJcAUyvo2yQiOqi+wukdLlQU80th5XskGe8U=; b=JoW1+nE4zU/Ol+hQqlhGCPE2UQMwOzhe+WViRab4Xah4vGMZKgQNzIrjRv0GYqjdtf zvf2NI2aNMpuTOBqn5A2vZuzBAiwlSC6xSAEwz85ds5If8QhAW0uaYfflATVwO3eFNpk 0uVe9Jz4cQFinuftZmdE9mjqn4AhgMkSBcPDZo6HzzaZCN9YuirhH98BhA2ufoI6m/BT QDp/J4CV7F958sxQ8Ug8XMCukRcJUtBHmB7aRzJiKDd1fVK6f9qvdrt7OpnWaoFlWPjB jAjMT932HG4qMRlIrTBkjYvuhGw+8TexHbkiakKqBgQcg2uumaciBzqZcXnQJ1+rrZOy dS8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="uH+/HGiP"; dkim=neutral (no key) header.i=@linutronix.de header.b=63YbpwJV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id om8-20020a17090b3a8800b002792c288cc3si1806447pjb.169.2023.10.20.04.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 04:39:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="uH+/HGiP"; dkim=neutral (no key) header.i=@linutronix.de header.b=63YbpwJV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 422D5835939B; Fri, 20 Oct 2023 04:39:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377356AbjJTLiU (ORCPT + 25 others); Fri, 20 Oct 2023 07:38:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377212AbjJTLh1 (ORCPT ); Fri, 20 Oct 2023 07:37:27 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FA47D6D; Fri, 20 Oct 2023 04:37:25 -0700 (PDT) Date: Fri, 20 Oct 2023 11:37:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697801844; 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=b8D4ifbQMwjKAoh4l22IcJp3Al++IiSB3u7+qpEkMZo=; b=uH+/HGiPxvXTN3Ko6frE0aMpse6FQOfhkxm3eADyIVFO2A0VY2+y4EB7+GylPeBOhuYGZF VPQhxrLGunLvQz4b/MyU7uc2bApgZ3yV3TAN6Bbm4AtLhCWlDSmKFcYWc0cXE+bOXDi1oj +z+MQO+j/+wouWkRTOZySZPtg2OFV8uNXV06VdQvvK2sru6/b8OUJdGp3KVOSp1FDMi5Uj FfOOokUK1S29QvTQMqD+gRTYZqXELJ+MoAoxdkt/AQTjBRJbDLNeFLbmFnKubVCGNSQk8r sDv7zCexdptNWXOEIREd9Bb/dA9mkTljQvWOVfahZrn33pkWwSqAqZvV9GHI+Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697801844; 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=b8D4ifbQMwjKAoh4l22IcJp3Al++IiSB3u7+qpEkMZo=; b=63YbpwJVeFfVy6uHu1A/YJieAOBFAuMJJtELt/BlhSS3m2tR/tUTRO0mTdUILijqpHVv7K p5c/zhXUsBkTeaDw== 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: <169780184350.3135.4649158539122354295.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 20 Oct 2023 04:39:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777461705954335564 X-GMAIL-MSGID: 1780274421011033588 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: 1d1142ac51307145dbb256ac3535a1d43a1c9800 Gitweb: https://git.kernel.org/tip/1d1142ac51307145dbb256ac3535a1d43a1c9800 Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:49 -07:00 Committer: Borislav Petkov (AMD) CommitterDate: Fri, 20 Oct 2023 11:34:51 +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 Signed-off-by: Borislav Petkov (AMD) Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/cee5050db750b391c9f35f5334f8ff40e66c01b9.1693889988.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")); pred_cmd: - if ((boot_cpu_has(X86_FEATURE_SRSO_NO) || srso_cmd == SRSO_CMD_OFF) && + if ((!boot_cpu_has_bug(X86_BUG_SRSO) || srso_cmd == SRSO_CMD_OFF) && boot_cpu_has(X86_FEATURE_SBPB)) x86_pred_cmd = PRED_CMD_SBPB; }