From patchwork Tue Sep 19 09:53:15 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: 141838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3320191vqi; Tue, 19 Sep 2023 04:47:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNxR4gqm02p3EC9Z7ZlOktgE5OrnkZHybLUoVnbqbH2Zs72zDrDPsPaJV1K4c0StgV6jN2 X-Received: by 2002:a17:903:234f:b0:1c3:2c4d:889e with SMTP id c15-20020a170903234f00b001c32c4d889emr2919880plh.16.1695124048806; Tue, 19 Sep 2023 04:47:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695124048; cv=none; d=google.com; s=arc-20160816; b=FZ7tL/IGTCP/ZMRzCVHbj6Q9Ke4ArpMwAPin/J4PghBJ0N4iuDUBbxNXLXfzQqzHYr 5XnFiJhLXD6I8lAl+6SwiYVKZ11cxZ9NFahAb+OzR4wyjZppN8oSPU6Hw6zZ1OCRDpY+ oDmsSn1KfI43ao7tSJjNHojeRgzGLtjeA0fDjKhmViRq04TGgRyc5oKcHBgAphAx10D2 yG5meE7wx7jKJgfrQhKAkgwcstb5l7dCrP7VQgrYqm4pEKXFdzRN0BwgIjGXigj0qQS9 qhd0+GUCZqYtz/MA5YjZbl3qzCyECmG4V1dBfhP4FxShoAEUsq9xOiy3efFaHY2QLg+a GlKA== 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=5Is+qu8RbO+Wd+22FzAaMcS21tow6QiAd21FvhIZTVU=; fh=TJa98jjcJcAUyvo2yQiOqi+wukdLlQU80th5XskGe8U=; b=IZK6a+5CyFvuu5VHC1jDu8a0TV8bIgy1SqycRC4RLoFHEJasJjwgZS8wsfD235Ga0C DxIfAqV0MFInpRazd/nQM9CTOxY/qBNSvKNUPYZobzJn6IQ344xJ4WYqSkFhBpe/1+pv OWBL4iwAlyt0680bR9Pn4L59GYS0GaqPdlja0TIC5tIWqETuYKwkw2BrnYGNSo86ZpBj sCVythX/2N7J11pwdTU5Tw2xMfIT4ui+BAm8b1IPELHm5Ggnz39sJBdCSbTv0mIcFeJa iNFy7+23088qTPYO+SUfn4up3VA2GZA+1lNiQOTrT7VHRjbC2hEu+3qDDK5FtRtu/l8s /3Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="QDN4WGQ/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="ePwrhX/C"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id ik18-20020a170902ab1200b001c32d285db8si4793751plb.308.2023.09.19.04.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 04:47:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="QDN4WGQ/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="ePwrhX/C"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 2DD87829F656; Tue, 19 Sep 2023 02:54:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231208AbjISJyW (ORCPT + 26 others); Tue, 19 Sep 2023 05:54:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231608AbjISJxY (ORCPT ); Tue, 19 Sep 2023 05:53:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09EB9183; Tue, 19 Sep 2023 02:53:18 -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=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=5Is+qu8RbO+Wd+22FzAaMcS21tow6QiAd21FvhIZTVU=; b=QDN4WGQ/csLTxVOXcnrirR+1wBkZZzy42wfCunhWSVIKVJFZo5IXMsotB/BOTXa6w5RVu/ 8TReb3brbrZfXAZtiqw0MOMtPJ9VGfhJ7sAfG+FCZvqDjfFUyQcELPypKkzmBKxZd8+URu t5D2hMqF4GGLChzrhqhl/uhPmLfqcQfN8iVFEFp3sLWuzg5CuTbRkySRegdz0Irke/ypBg VTfsvyZ2a0ilywF7mLRmvNwv8MXu9zLRo9pDOP0xb+vwVQ5bFNvAe/sbv+D6wpKhmcQJSd DKSYnp9P8HfQ+eQTMqhHwe3aEVHQwE+o6vZEEnddfSCjYfa5WJ8R/zFiVqyjoA== 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=5Is+qu8RbO+Wd+22FzAaMcS21tow6QiAd21FvhIZTVU=; b=ePwrhX/C48WtwzI3N02ljbx9ULLz4GEe6LgxVRB/LjZJJAtAoFCeSO7erf9pnI+BnCrxm1 5bfneYYb3tYwR/Cg== 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 actual mitigation if requested mitigation isn't possible Cc: Josh Poimboeuf , Ingo Molnar , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.1693889988.git.jpoimboe@kernel.org> References: <7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.1693889988.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <169511719507.27769.11066410614523740718.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (howler.vger.email [0.0.0.0]); Tue, 19 Sep 2023 02:54:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777466394389056941 X-GMAIL-MSGID: 1777466394389056941 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: 8d1af58569b6b8541c3d6574ba6ef36016a07edb Gitweb: https://git.kernel.org/tip/8d1af58569b6b8541c3d6574ba6ef36016a07edb Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:50 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 19 Sep 2023 11:42:47 +02:00 x86/srso: Print actual mitigation if requested mitigation isn't possible If the kernel wasn't compiled to support the requested option, print the actual option that ends up getting used. Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Reviewed-by: Borislav Petkov (AMD) Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.1693889988.git.jpoimboe@kernel.org --- arch/x86/kernel/cpu/bugs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 2859a54..235c0e0 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2461,7 +2461,6 @@ static void __init srso_select_mitigation(void) srso_mitigation = SRSO_MITIGATION_SAFE_RET; } else { pr_err("WARNING: kernel not compiled with CPU_SRSO.\n"); - goto pred_cmd; } break; @@ -2473,7 +2472,6 @@ static void __init srso_select_mitigation(void) } } else { pr_err("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n"); - goto pred_cmd; } break; @@ -2485,7 +2483,6 @@ static void __init srso_select_mitigation(void) } } else { pr_err("WARNING: kernel not compiled with CPU_SRSO.\n"); - goto pred_cmd; } break;