From patchwork Wed Feb 23 09:01:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 12756582 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD603C433F5 for ; Wed, 23 Feb 2022 09:03:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=73u5VORBSm6bwsn0M44zqRCVDtcQZdkQgOyXiTw6d3g=; b=przgwDw4TYK8pV ryZk1L0Nf5W3cp70WweqOYfl5VWFJRG3fhd50ygrhPFTPKItJ7eBbimegLfNWWbkmHzNcj51LX0xg rMPldxPACNqDEnHE6qMg5tJQIm+BKzL+nbO5hIkj+ztZ1Q2MSe+zCXcALgrSkF9Zpw3gT8wL4Z9zJ F1u7IsU8PXwDpg3cnusYjnuh78/byyybSo7rmZBrsppjoj6Ijrt1LU4LWAaiS4MiWFf+4co1cepFB C7Tb3UtQEkY3leIYGer9EU0nc/+CRnduq21ZtHwEm//uzVJItlR3Vkl8M5n4bsDTYZzV35/EKFf3E mZ0SuN1mMFZWyLV/+hsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMnX8-00DO8Z-WE; Wed, 23 Feb 2022 09:02:03 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMnX4-00DO6S-D7 for linux-arm-kernel@lists.infradead.org; Wed, 23 Feb 2022 09:02:00 +0000 Received: by mail-pg1-x534.google.com with SMTP id 139so19337625pge.1 for ; Wed, 23 Feb 2022 01:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fwKCeIH2LJDOEHrJ3F/N+2CH9rq2X4JR/XFEekxpx90=; b=eaknSG0N68J1eDmEtghFazXyiST6ZOm4jjMgO0YXLNTInrEDV3zMU1iFF90mCjnlmE egnsRa8nkiZ/JCp7JFSYYuVhVSNDTFoTAzrelUQuFimgl0j660yFxKhHVyUDQeHRnDxc BvpXz3LSQGEUoY8X/c41ec4rAd083XHdeVs6E5T0iNlNTjwoE8p9HDZRXuX0MDdNl/Ud VTbvXylbym7BlFcjE8Dr5c3jwq1/YZCMvUfoGftobfUk5hpnBwlkst29J2OuLZVk+r0H I3LBCQOgnx8IKeo/msR1nc9jVdVgIxty6lemdt0cPkngScag7X58KKT6hRGGyAfVMTF4 bxiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fwKCeIH2LJDOEHrJ3F/N+2CH9rq2X4JR/XFEekxpx90=; b=WUOME/p6ojjh1sBko65lyHwyM5nE5aZ9ji9DSLpw8d9l9P2e+ozP6PRzbSDkD3i7Ud QRp7OyGN1HSwRAKVNweztt//2KkGP69kJM7UucdMLUqAoq/98CZ2tBN1/Ose24CPvO01 Hzhb5mADyzNL94Dk52pBlXZ8g3kEbJqYXTWwE8Q40m0UtyystIH5lZ/nhLvnzDn+Tg3Z aPEVADLe/DfpmDRrxqkyTfBnkvQ0jAMiTbfvfS181+RbxKZItz0y80idVIclSHv+Oxtt DSSy0Xqt12/K6a5SIF/HewUQT/+DFyzxX7mBOPqsXC3sWX3d+Z08G/kf/IXuR8eK2Bji cm/A== X-Gm-Message-State: AOAM531LDpWMZI5wV3LLUvRpBulLnrXTxsukhFRVUMEHQcg9Vqn1JRTV Ngt3EMbL2ltbJvqfEyTgtALJRg== X-Google-Smtp-Source: ABdhPJx5PxhwkYgSb1eT4c8XTA1Hu+wi7LzDy2KYbxZ0m4uId7pdG7tzSTR7VtMhqHS5ZCOKZeU2gg== X-Received: by 2002:a63:8543:0:b0:35e:3bd9:3798 with SMTP id u64-20020a638543000000b0035e3bd93798mr23237871pgd.73.1645606916303; Wed, 23 Feb 2022 01:01:56 -0800 (PST) Received: from C02CV1DAMD6P.bytedance.net ([139.177.225.242]) by smtp.gmail.com with ESMTPSA id k9sm21458694pfc.157.2022.02.23.01.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 01:01:55 -0800 (PST) From: Chengming Zhou To: rostedt@goodmis.org, mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org, broonie@kernel.org, mark.rutland@arm.com, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com Cc: linux-arm-kernel@lists.infradead.org, x86@kernel.org, linux-kernel@vger.kernel.org, songmuchun@bytedance.com, qirui.001@bytedance.com, Chengming Zhou Subject: [PATCH v2 1/2] ftrace: cleanup ftrace_graph_caller enable and disable Date: Wed, 23 Feb 2022 17:01:31 +0800 Message-Id: <20220223090132.10114-1-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220223_010158_512162_921173B1 X-CRM114-Status: GOOD ( 13.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ftrace_enable_ftrace_graph_caller() and ftrace_disable_ftrace_graph_caller() are used to do special hooks for graph tracer, which are not needed on some ARCHs when DYNAMIC_FTRACE_WITH_[ARGS,REGS] enabled. So introduce weak version in Ftrace core code to cleanup them. And fix the incorrect comment in that two #endif, which should match the previous #ifdef and #ifndef. Signed-off-by: Chengming Zhou --- arch/x86/kernel/ftrace.c | 14 ++------------ kernel/trace/ftrace.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 7cc540e6de0c..c119ef7a9295 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -615,18 +615,8 @@ int ftrace_disable_ftrace_graph_caller(void) return ftrace_mod_jmp(ip, &ftrace_stub); } -#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ -int ftrace_enable_ftrace_graph_caller(void) -{ - return 0; -} - -int ftrace_disable_ftrace_graph_caller(void) -{ - return 0; -} -#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ -#endif /* !CONFIG_DYNAMIC_FTRACE */ +#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ +#endif /* CONFIG_DYNAMIC_FTRACE */ /* * Hook the return address and push it in the stack of return addrs diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index f9feb197b2da..60ae009e6684 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2704,6 +2704,26 @@ int __weak ftrace_arch_code_modify_post_process(void) return 0; } +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +/* + * archs can override this function if they must do something + * to enable hook for graph tracer. + */ +int __weak ftrace_enable_ftrace_graph_caller(void) +{ + return 0; +} + +/* + * archs can override this function if they must do something + * to disable hook for graph tracer. + */ +int __weak ftrace_disable_ftrace_graph_caller(void) +{ + return 0; +} +#endif + void ftrace_modify_all_code(int command) { int update = command & FTRACE_UPDATE_TRACE_FUNC;