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; From patchwork Wed Feb 23 09:01:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 12756583 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 BB153C433EF for ; Wed, 23 Feb 2022 09:03:46 +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:References:In-Reply-To: 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: List-Owner; bh=GwmurQUqEArY9EPhpJxD4BsRz3Px31YyJ9qvS+2KDcc=; b=i7yFlGBxSeKcCI Pi7K9eUerhjfxn15gbcjjPYkB4NoC9YBXjwc1/cbjuzzuITYhqnWvs6Nvy73PAvWEOWyFph1Ayu1b JHCIFbCyM94Q55bEy+OkC8UZRXbqjpUkAr/jbKvF60BeMC6pxjCyABrfcYtkHvjuNwAAfT6pgx63Z BK5qYvRpSYdk3GVspIPVkRFJ6pExFNiSP1pdMTsrgoJeJSiM22hLoF3rBr0NUqG14npBtRwvADrp7 CUNI8TkjrdolV6Jjn1A0k6tz0KubuhpfEpGxxWKqoZedCZd1IK1UcUAjbmUXOaZY8CfvpVbU6Degs MM+DQr5mvyZ5OCOF+Qug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMnXL-00DODk-RE; Wed, 23 Feb 2022 09:02:16 +0000 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMnX8-00DO8l-TM for linux-arm-kernel@lists.infradead.org; Wed, 23 Feb 2022 09:02:08 +0000 Received: by mail-pl1-x62c.google.com with SMTP id c9so6082558pll.0 for ; Wed, 23 Feb 2022 01:02:02 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jx0LTc0N+EqTRUoVpsY/zDn3O9ZublQZdNNSFkzii3k=; b=H0R3ytHwp9OBRo6b/aVZ8Azyll88PPU6VQJ234gY7Okl+/ur4wGelu1As95AG2pyeu 1Wfew9oG4HX0mKj/Ohx/zuu5R6AAB4yh0jBOOCMCJmGAgoJrhiW/kt1J08L3ushq3TlN 1qRl9Pnj0dSbrPS+9Hqa4sm/aHospu6tMFDcUoQVderPt11m+vcf8B1PW5/PiJP2+fE5 gRnqY/eVmeVQ4bwNkgfSvjPPaUxfoO7X92pROYltBsqDDpWMIzPVsaAoHNsc1HD+mC7T x8uI5vqi10GP3PBPsdiRckKz5Y+IaSAK+e4O/l341Au7SScVSd7dzwaGMu7N+qAgLJoy /rHw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jx0LTc0N+EqTRUoVpsY/zDn3O9ZublQZdNNSFkzii3k=; b=bl7wTWKl8LozV+6nRyzLvpC3r7OfeMEA+akscU9jjTXopDCBoTF7p/Ss3sWln3Fh9T uq9JsAWyjAYZjTj8ADv7FrfhATJpzdySSZmVEYucOTB4Cmdcgo/L7AA2BNQT1hGZqy85 gvjqTdr3NJcmW5/+jqeRtcBrdkKRjx3SL+puGeJpFLB44ptNodor4kR+fFs08HLL/63+ GEWkLlDPlz+0H9OLSJd04HDr5N4bKB+xDwAy9RK+ZK6caC58jv22jaoKOw9jClSoyaTq lB7zHSzN/Ni3CO3ZAwH8NtWCRsN0LWnC/h0WFkhv6l+fgdd14M5/neQLu5Rna9pfvnkh VEVQ== X-Gm-Message-State: AOAM532suCe9qbsbHHZV/lbIWWvTB7f70B1D/UYWTjMPX+vmlCGWE72C BIXlhaVAzv6xm2kUi1dxXMvInQ== X-Google-Smtp-Source: ABdhPJxLFEuiyqS5P+gCUFh/N4Vv2amAuHnweDzs5jGyekk/G6NXXpplZ5JdTbebgLPzMfuy0fWZlA== X-Received: by 2002:a17:90b:400c:b0:1bc:7190:5696 with SMTP id ie12-20020a17090b400c00b001bc71905696mr7454045pjb.109.1645606921754; Wed, 23 Feb 2022 01:02:01 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 01:02:01 -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 2/2] arm64/ftrace: Make function graph use ftrace directly Date: Wed, 23 Feb 2022 17:01:32 +0800 Message-Id: <20220223090132.10114-2-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220223090132.10114-1-zhouchengming@bytedance.com> References: <20220223090132.10114-1-zhouchengming@bytedance.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220223_010202_987948_289CC365 X-CRM114-Status: GOOD ( 13.76 ) 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 As we do in commit 0c0593b45c9b ("x86/ftrace: Make function graph use ftrace directly"), we don't need special hook for graph tracer, but instead we use graph_ops:func function to install return_hooker. Since commit 3b23e4991fb6 ("arm64: implement ftrace with regs") add implementation for FTRACE_WITH_REGS on arm64, we can easily adopt the same cleanup on arm64. And this cleanup only changes the FTRACE_WITH_REGS implementation, so the mcount-based implementation is unaffected. Signed-off-by: Chengming Zhou --- arch/arm64/include/asm/ftrace.h | 7 +++++++ arch/arm64/kernel/entry-ftrace.S | 17 ----------------- arch/arm64/kernel/ftrace.c | 12 ++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h index 1494cfa8639b..dbc45a4157fa 100644 --- a/arch/arm64/include/asm/ftrace.h +++ b/arch/arm64/include/asm/ftrace.h @@ -80,8 +80,15 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS struct dyn_ftrace; +struct ftrace_ops; +struct ftrace_regs; + int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec); #define ftrace_init_nop ftrace_init_nop + +void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, + struct ftrace_ops *op, struct ftrace_regs *fregs); +#define ftrace_graph_func ftrace_graph_func #endif #define ftrace_return_address(n) return_address(n) diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S index e535480a4069..d42a205ef625 100644 --- a/arch/arm64/kernel/entry-ftrace.S +++ b/arch/arm64/kernel/entry-ftrace.S @@ -97,12 +97,6 @@ SYM_CODE_START(ftrace_common) SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL) bl ftrace_stub -#ifdef CONFIG_FUNCTION_GRAPH_TRACER -SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL) // ftrace_graph_caller(); - nop // If enabled, this will be replaced - // "b ftrace_graph_caller" -#endif - /* * At the callsite x0-x8 and x19-x30 were live. Any C code will have preserved * x19-x29 per the AAPCS, and we created frame records upon entry, so we need @@ -127,17 +121,6 @@ ftrace_common_return: ret x9 SYM_CODE_END(ftrace_common) -#ifdef CONFIG_FUNCTION_GRAPH_TRACER -SYM_CODE_START(ftrace_graph_caller) - ldr x0, [sp, #S_PC] - sub x0, x0, #AARCH64_INSN_SIZE // ip (callsite's BL insn) - add x1, sp, #S_LR // parent_ip (callsite's LR) - ldr x2, [sp, #PT_REGS_SIZE] // parent fp (callsite's FP) - bl prepare_ftrace_return - b ftrace_common_return -SYM_CODE_END(ftrace_graph_caller) -#endif - #else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ /* diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 4506c4a90ac1..aeac174507a8 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -268,6 +268,17 @@ void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent, } #ifdef CONFIG_DYNAMIC_FTRACE + +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, + struct ftrace_ops *op, struct ftrace_regs *fregs) +{ + struct pt_regs *regs = arch_ftrace_get_regs(fregs); + unsigned long *parent = (unsigned long *)&procedure_link_pointer(regs); + + prepare_ftrace_return(ip, parent, frame_pointer(regs)); +} +#else /* * Turn on/off the call to ftrace_graph_caller() in ftrace_caller() * depending on @enable. @@ -297,5 +308,6 @@ int ftrace_disable_ftrace_graph_caller(void) { return ftrace_modify_graph_caller(false); } +#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */