Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp4912987pxb; Wed, 20 Apr 2022 12:53:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWVBbK6kFrvVBMHdb7zDiEPzc6zWtwSmdczmRNY/4HlSoPgfPqEEGFkgTv16Z3nkOzoLSE X-Received: by 2002:a17:906:7307:b0:6da:92db:c78f with SMTP id di7-20020a170906730700b006da92dbc78fmr19988531ejc.35.1650484435709; Wed, 20 Apr 2022 12:53:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650484435; cv=none; d=google.com; s=arc-20160816; b=CsEC48MyfPNhyX968ZOZwE1cUKq9AoXCy8ODMsSAA6zDDTeRCFhAUv2XrQ6wU5Rw5T dxtn4cFukgtL92BTksx+dh4KF8gvXvLBJ/WPDX/AxPlx49pKO+QNse0f10VBkT6MrVxs 1u2AeynOs6HWLOnU21aRlqbiGWv2CT6HOsW/DAYozmjkhpEdZxAUSkdUlBAnAitt2C+b t4WvPXqS5xc43VLXByq+V05GnsC+BRAFcVoo8zKjRCNxdw9QBmWaSy8rKOUUkX7btwYh e4tqJM8ntWXUBSOF77v7THfgDTo/grr8e7vg4zPn/m41KAO9y9FvAapKypT8fAgAzMD9 Ap7A== 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=8l7reSWjkYXMhIWsUQJFyIZ1inBA/aa7459JhwsivbA=; b=B/NZsSqzxpEqAkYpC6sBsyKC8OwD/NhdlKeEImyUfSmKSEKpEDFLGnatnLm5PtZPvL IHzSISQO+0zqxATYyh7prGf6HlKIe/XGmbSlCVqTEPIxycXZFNKbRc/xoIpKrMydnmLH rS/bx0BnMSzz3D6kRu+S6H9RGK9GRmfoDtE4Ma0fgoZFLU4qzZ6DSmvJ4t/iv8Zaw+J7 3G9qXw7+p2r7kBrE6oSqRctA5rfbHKRavg/Q1WdmiZKD6vQtTrd8eK975Zrs0tbhuE05 ANDVj2N8/pmz1J8jRf+O/YVFj3WYpEN9uJ6CiWO+DhrnJOW5Aaf+o08VePElI3VJ7gbd ca4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xkafwJnC; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w17-20020a50fa91000000b00418fc1f103csi2162201edr.388.2022.04.20.12.53.31; Wed, 20 Apr 2022 12:53:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xkafwJnC; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357599AbiDSULv (ORCPT + 99 others); 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: 7bit 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,T_SCC_BODY_TEXT_LINE 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 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 1c0513dec41e4d40eb21402dff397ad84ca13a44 Gitweb: https://git.kernel.org/tip/1c0513dec41e4d40eb21402dff397ad84ca13a44 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.1650300597.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 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) .align RETPOLINE_THUNK_SIZE SYM_CODE_START(__x86_indirect_thunk_array) - ANNOTATE_NOENDBR // apply_retpolines #define GEN(reg) THUNK reg #include