From nobody Mon May 11 00:45:42 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 21FD0C433EF for ; Tue, 19 Apr 2022 20:09:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357601AbiDSULv (ORCPT ); Tue, 19 Apr 2022 16:11:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357120AbiDSUL3 (ORCPT ); Tue, 19 Apr 2022 16:11:29 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2066D3BF81; Tue, 19 Apr 2022 13:08:41 -0700 (PDT) Date: Tue, 19 Apr 2022 20:08:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1650398919; 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=8l7reSWjkYXMhIWsUQJFyIZ1inBA/aa7459JhwsivbA=; b=xkafwJnCxELjwjqbRJmg9QC1kwhMVRnAlYwqyjoYX9OmjDUeVsXhgfns3AI+7MAMLAqDg5 TmdVWYM0EmdosP02KSNt3QNGzYil4vaZ4C0xbvGwfn6P/boiCgEqAIT6lMEd2SjyE3Udt6 6GmAYXuY5UWCotxxZ7ROunf7ozC/JYSnVyMxojV8EZhOdjKPDKiRo38CymMoWEeJ1sw3qS t5RQhFtgzret5DEhMbibmZ3RZyFJ03Xiqt1aqg8tRiD/OkfYiZCBAHngUOuKCstffAxYNv d5jBbz7jb0+cCE0Y6dn46urME2HFNo8zDBJyfXxkrEPu6tBPEXHTvtM3fTHC1g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1650398919; 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=8l7reSWjkYXMhIWsUQJFyIZ1inBA/aa7459JhwsivbA=; b=bPj4zu2ZE8UMBRycrWk2oeLvnxBX3BiFZ7OSFYAy/PwIQDaNU5a3wOTO2DxgAif5UBbr4i rrksebYDGMld1oBQ== 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/urgent] x86/retpoline: Add ANNOTATE_NOENDBR for retpolines Cc: Josh Poimboeuf , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <165039891874.4207.2931765503619062389.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/urgent branch of tip: Commit-ID: 1c0513dec41e4d40eb21402dff397ad84ca13a44 Gitweb: https://git.kernel.org/tip/1c0513dec41e4d40eb21402dff397ad84= ca13a44 Author: Josh Poimboeuf AuthorDate: Mon, 18 Apr 2022 09:50:23 -07:00 Committer: Peter Zijlstra CommitterDate: Tue, 19 Apr 2022 21:58:49 +02:00 x86/retpoline: Add ANNOTATE_NOENDBR for retpolines The retpolines are exported, so they're referenced by ksymtab sections. But they're never indirect-branched to, so add ANNOTATE_NOENDBR. Fixes: ed53a0d97192 ("x86/alternative: Use .ibt_endbr_seal to seal indirect= calls") Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/b6ec963dfd9301b6b1d74ef7758fcb0b540d6c6c.16= 50300597.git.jpoimboe@redhat.com --- arch/x86/lib/retpoline.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 5f87bab..b2b2366 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -31,6 +31,7 @@ .align RETPOLINE_THUNK_SIZE SYM_INNER_LABEL(__x86_indirect_thunk_\reg, SYM_L_GLOBAL) UNWIND_HINT_EMPTY + ANNOTATE_NOENDBR =20 ALTERNATIVE_2 __stringify(ANNOTATE_RETPOLINE_SAFE; jmp *%\reg), \ __stringify(RETPOLINE \reg), X86_FEATURE_RETPOLINE, \ @@ -55,7 +56,6 @@ SYM_INNER_LABEL(__x86_indirect_thunk_\reg, SYM_L_GLOBAL) =20 .align RETPOLINE_THUNK_SIZE SYM_CODE_START(__x86_indirect_thunk_array) - ANNOTATE_NOENDBR // apply_retpolines =20 #define GEN(reg) THUNK reg #include