From patchwork Tue Sep 19 09:53:13 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: 141886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3375284vqi; Tue, 19 Sep 2023 06:14:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFcrEI27LMwi7CtOHVpgABR+5FVg+Qohg5Q2sEeR+Q8uKbYjunfKSALNG2OUoHU7yFPOeq8 X-Received: by 2002:a17:902:ea0f:b0:1c4:72c9:64fc with SMTP id s15-20020a170902ea0f00b001c472c964fcmr6456608plg.22.1695129242130; Tue, 19 Sep 2023 06:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695129242; cv=none; d=google.com; s=arc-20160816; b=XPt03A7lax5G8uGwkCUTRU/A7sq6LsBwD7LT1XHSXSeMJBE5fDOAtaDx/57l7JjW9o 6Yz9qQ8qtcBjGUwuTYJ10Bmsr4RLU19Zoq+2IhFA4ut5NRA3b4GUkKsvBO4aMWOAZ6tE KMczDsqg/xTxTXI/7/IElIGMU5auBbMV1sUwZy6/JZ3mi01GE1FJWaaTWs4CIx5oxGPh FOeAVwEItxFic53pE5SZLlCuV5jQwSVtMoPmSiTYUZsjrscMruS9CVUPB0WxqDrLjdT8 xvQuhRAJ7ePsnxMR4ZUCfWM/aa7PY8FlSVNhDHeD1bAEAds6S820Dllq6uUvE1OYwtfz 1Flg== 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=62U85OzB1CB4mEWbrSqf/8rEaKu3U/OfzCLtNWgOg+I=; fh=TJa98jjcJcAUyvo2yQiOqi+wukdLlQU80th5XskGe8U=; b=SMF8lNvxtT1Zrzgx8qIqt9X/E/gwhBWM9ziHHRYkuaRhkML6LNs81za2Tr0Eorn3bt qNBWQjhyxz7N5ttCtxxp2tHae0XzNIAsS4LL6fJx2vZPnXiPloyb7NIr/XpDPQPuhAW3 VqQx1Tt+jQ0RBn2O0hpVADtWyjQVr+3m/fIOvxA7QDVqu7KC+pY2p+b9O/24a9yqySCc ob7Zy7CHRPLwQgDFOidWg7hiPdLEbk5q9eefjiph6rNE2w2nVzypPM5vyEtMgE9ZW7Om JBybICz+nQzhHdoz2kyY3kyNaqZwNf7lNTKMeaiQUVbm215BTKAOhoFwXTCyfI9Es+wx bEWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=WI4yM4kf; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id i9-20020a17090332c900b001bdc664cd65si10092773plr.165.2023.09.19.06.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 06:14:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=WI4yM4kf; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 8DBEC801D288; Tue, 19 Sep 2023 02:54:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231749AbjISJyP (ORCPT + 26 others); Tue, 19 Sep 2023 05:54:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231493AbjISJxW (ORCPT ); Tue, 19 Sep 2023 05:53:22 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4578ED; Tue, 19 Sep 2023 02:53:15 -0700 (PDT) Date: Tue, 19 Sep 2023 09:53:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695117194; 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=62U85OzB1CB4mEWbrSqf/8rEaKu3U/OfzCLtNWgOg+I=; b=WI4yM4kfsGVXsBnbFxgCVtOQrIKQpv4QJ2LQusLZ8z0UC7uT0WFX/PPgP12xgBYC0XusSy YsaeKNRTNOBfOQbMsXxOV9nMgPujXNqjtt7CC+zpPKtHTUBcexuYAZ+nzRS5dfj2k7VOIX HD2d+Re0hY2sg9uQGrFwkSpFm84UpO0VkYDdK97cv9bQrAFHrsZR++T/466IgxSoNkf4rT FGbi8v0GNguNJCaE+ULVCcflKtFhD761Rl4wjj5Bs+1qHgg81X72iwQ4nlrEo9bgfT3ORU RvJagy94tCTx/qbO+xlFmoaq3GWyV66Jrd1Ko64DSUAnes4xnAaxfw9j3A4avg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695117194; 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=62U85OzB1CB4mEWbrSqf/8rEaKu3U/OfzCLtNWgOg+I=; b=txPLIy4nZ+AQFvQGRQNYd5dHNdJ/VIFlwYk8xoSEEgPLmqCzgdN2PLGlvTj8u5Z8EAhAc9 mfN2PCD2ggfX4OAA== 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 unret validation dependencies Cc: Josh Poimboeuf , Ingo Molnar , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <299fb7740174d0f2335e91c58af0e9c242b4bac1.1693889988.git.jpoimboe@kernel.org> References: <299fb7740174d0f2335e91c58af0e9c242b4bac1.1693889988.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <169511719353.27769.15297917900172168528.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 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 groat.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 (groat.vger.email [0.0.0.0]); Tue, 19 Sep 2023 02:54:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777471840117211040 X-GMAIL-MSGID: 1777471840117211040 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: adc5517ec8157084ba978b25241fc398207d05dd Gitweb: https://git.kernel.org/tip/adc5517ec8157084ba978b25241fc398207d05dd Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:53 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 19 Sep 2023 11:42:47 +02:00 x86/srso: Fix unret validation dependencies CONFIG_CPU_SRSO isn't dependent on CONFIG_CPU_UNRET_ENTRY (AMD Retbleed), so the two features are independently configurable. Fix several issues for the (presumably rare) case where CONFIG_CPU_SRSO is enabled but CONFIG_CPU_UNRET_ENTRY isn't. Fixes: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation") Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/299fb7740174d0f2335e91c58af0e9c242b4bac1.1693889988.git.jpoimboe@kernel.org --- arch/x86/include/asm/nospec-branch.h | 4 ++-- include/linux/objtool.h | 3 ++- scripts/Makefile.vmlinux_o | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index c55cc24..197ff4f 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -271,7 +271,7 @@ .Lskip_rsb_\@: .endm -#ifdef CONFIG_CPU_UNRET_ENTRY +#if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_SRSO) #define CALL_UNTRAIN_RET "call entry_untrain_ret" #else #define CALL_UNTRAIN_RET "" @@ -312,7 +312,7 @@ .macro UNTRAIN_RET_FROM_CALL #if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_IBPB_ENTRY) || \ - defined(CONFIG_CALL_DEPTH_TRACKING) + defined(CONFIG_CALL_DEPTH_TRACKING) || defined(CONFIG_CPU_SRSO) VALIDATE_UNRET_END ALTERNATIVE_3 "", \ CALL_UNTRAIN_RET, X86_FEATURE_UNRET, \ diff --git a/include/linux/objtool.h b/include/linux/objtool.h index 03f82c2..b5440e7 100644 --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -130,7 +130,8 @@ * it will be ignored. */ .macro VALIDATE_UNRET_BEGIN -#if defined(CONFIG_NOINSTR_VALIDATION) && defined(CONFIG_CPU_UNRET_ENTRY) +#if defined(CONFIG_NOINSTR_VALIDATION) && \ + (defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_SRSO)) .Lhere_\@: .pushsection .discard.validate_unret .long .Lhere_\@ - . diff --git a/scripts/Makefile.vmlinux_o b/scripts/Makefile.vmlinux_o index 0edfdb4..25b3b58 100644 --- a/scripts/Makefile.vmlinux_o +++ b/scripts/Makefile.vmlinux_o @@ -37,7 +37,8 @@ objtool-enabled := $(or $(delay-objtool),$(CONFIG_NOINSTR_VALIDATION)) vmlinux-objtool-args-$(delay-objtool) += $(objtool-args-y) vmlinux-objtool-args-$(CONFIG_GCOV_KERNEL) += --no-unreachable -vmlinux-objtool-args-$(CONFIG_NOINSTR_VALIDATION) += --noinstr $(if $(CONFIG_CPU_UNRET_ENTRY), --unret) +vmlinux-objtool-args-$(CONFIG_NOINSTR_VALIDATION) += --noinstr \ + $(if $(or $(CONFIG_CPU_UNRET_ENTRY),$(CONFIG_CPU_SRSO)), --unret) objtool-args = $(vmlinux-objtool-args-y) --link