From patchwork Mon Oct 17 14:53:46 2022 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: 3531 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1494016wrs; Mon, 17 Oct 2022 07:57:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM66bPkTKjbXIc29TJxTcS9h1RSVM6O4JolwTtZ0nu3G5SN8KqSCt4L71S5pDXrZuEdIuh0N X-Received: by 2002:a17:90b:1197:b0:20a:97e9:b20d with SMTP id gk23-20020a17090b119700b0020a97e9b20dmr33361605pjb.65.1666018672363; Mon, 17 Oct 2022 07:57:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666018672; cv=none; d=google.com; s=arc-20160816; b=umOfUiPV0QtwapcIV82JdtXRC6lYITK4hIiMIReu88iFsWMh5gJGAFI4peZwxqYUt9 vvcUEGPjTkE2APmnxVc30xUScl0dX5dTho2XMNDZ7Unt3bdWc+5M1uk3JK2WAFIlzxkJ mVd9TIi2VvHoXoj8bTkM6t9Jfp5uv6kHJMw4Iu3JJE5/ddhUlwFz4nDrWY8e/IyAktFV 5VNRTUv/Ea2waa3UmwAChYUvQ73lGBPkXc3EL0BcjTD0TuZt52wY+fPd1/tH1ksTnUXh Xy0Qrlei3fD2XjUYS0G6r+qekNP9wOAnZzZrD66JyvwffDwpFr8CM+RbFv5kc4Azw3Br RxLw== 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=aDfYSiVQDjxsoQYaFKeEMiHBqsdJctTtIyt8Fcc40j8=; b=qk0gUNBaxVrAyzua8KjEHhIqENMqOsc4KN+P5h8cnTIRSuunjX6ZOeLUzmtnl/QXP9 FWRvSa3st4BhOzFTfWepaTJ/wCkFS81qp9tNUGtYGEeygErfVfYWoSBTZ5yYcStMqeOW thUckKXgXupwNHZCwDB9+G8dslEgG3jcWJFdkbPcT87qbcCHeyAra5INLc0075g+XiLu wpYkD2SJgpfFv8hdK+13+aNsqt3jei3xkOjM3IuxD34FuvNKKsSwJiYLzf/nCCN1041y uHM4ffyKJ0mEi0/1abHWElkoM44udjJYktt5PCugW4eur/ZplmEtJr4zm7uA4R19NrRk DPbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FF++7pgK; dkim=neutral (no key) header.i=@linutronix.de header.b="/FohbC3u"; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a056a00134a00b00562fc008395si12163527pfu.341.2022.10.17.07.57.39; Mon, 17 Oct 2022 07:57:52 -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=FF++7pgK; dkim=neutral (no key) header.i=@linutronix.de header.b="/FohbC3u"; 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 S231308AbiJQO47 (ORCPT + 99 others); Mon, 17 Oct 2022 10:56:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbiJQOzK (ORCPT ); Mon, 17 Oct 2022 10:55:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F340F6888A; Mon, 17 Oct 2022 07:53:57 -0700 (PDT) Date: Mon, 17 Oct 2022 14:53:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666018428; 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=aDfYSiVQDjxsoQYaFKeEMiHBqsdJctTtIyt8Fcc40j8=; b=FF++7pgKcBL+5RLGXunOcE/WEeAUn8oZoGz5jAp7FfE5YlAJSmjOODu5DcPuJQHh8hg2Yy uqjCihnd2vaRUvwCaoe77IJNfIQHQ8/Kzz5SUjmVr5naE8syZ7RCvc8qkqMzD2BdYvzirM kaOPRB36tXCOsQk8pdYon7e7Yu5oT9oja8wLhEjq+S31NlzKjFqEJcgEmghkmvZ6PIlC+O VPnNSz1DHmGdIqwlt7br+z3cdKOXevIYJIOmWHhNCD4JhssOE98ZhQyJAjBCIKqVPB6RY0 aYI5mMwWCqyiclW3t7lXjrbncArsN6e6ZXj5iA4C+FTmJclpB59IF4DdSLBWZg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666018428; 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=aDfYSiVQDjxsoQYaFKeEMiHBqsdJctTtIyt8Fcc40j8=; b=/FohbC3uLP/8JeUEjyCCPjmoZ2vOZoA5gYWAXdcuYr5Xh5LjQtA8EGG8vgWoPk1/u1pIPl Wx++POereQCTrHAA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/entry: Make some entry symbols global Cc: Thomas Gleixner , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220915111147.265598113@infradead.org> References: <20220915111147.265598113@infradead.org> MIME-Version: 1.0 Message-ID: <166601842695.401.12296281013490963610.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746947195271171202?= X-GMAIL-MSGID: =?utf-8?q?1746947195271171202?= The following commit has been merged into the x86/core branch of tip: Commit-ID: c22cf380c79c4bb0e502b0343f57271b17626424 Gitweb: https://git.kernel.org/tip/c22cf380c79c4bb0e502b0343f57271b17626424 Author: Thomas Gleixner AuthorDate: Thu, 15 Sep 2022 13:11:21 +02:00 Committer: Peter Zijlstra CommitterDate: Mon, 17 Oct 2022 16:41:12 +02:00 x86/entry: Make some entry symbols global paranoid_entry(), error_entry() and xen_error_entry() have to be exempted from call accounting by thunk patching because they are before UNTRAIN_RET. Expose them so they are available in the alternative code. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20220915111147.265598113@infradead.org --- arch/x86/entry/entry_64.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index b24b84b..4cc0125 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -327,7 +327,8 @@ SYM_CODE_END(ret_from_fork) #endif .endm -SYM_CODE_START_LOCAL(xen_error_entry) +SYM_CODE_START(xen_error_entry) + ANNOTATE_NOENDBR UNWIND_HINT_FUNC PUSH_AND_CLEAR_REGS save_ret=1 ENCODE_FRAME_POINTER 8 @@ -906,7 +907,8 @@ SYM_CODE_END(xen_failsafe_callback) * R14 - old CR3 * R15 - old SPEC_CTRL */ -SYM_CODE_START_LOCAL(paranoid_entry) +SYM_CODE_START(paranoid_entry) + ANNOTATE_NOENDBR UNWIND_HINT_FUNC PUSH_AND_CLEAR_REGS save_ret=1 ENCODE_FRAME_POINTER 8 @@ -1041,7 +1043,8 @@ SYM_CODE_END(paranoid_exit) /* * Switch GS and CR3 if needed. */ -SYM_CODE_START_LOCAL(error_entry) +SYM_CODE_START(error_entry) + ANNOTATE_NOENDBR UNWIND_HINT_FUNC PUSH_AND_CLEAR_REGS save_ret=1