From patchwork Sat Apr 9 15:35:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 12807970 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 (unknown [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 0B6B3C433EF for ; Sat, 9 Apr 2022 15:38:21 +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=ya6WU00FpzYIeeFHFtH/jCcuAqIaNhrLZRUkv078eJA=; b=ibPLGqdXds2Plr DAmHI33DV5m4bvCbDRP9xNkwwd588zBxtuAdCpGSOnOBCbtFmFeQDqPClBk27GdmeiE39pqcuaFiD 8+bcvQoboKEeCQCCEYPYcHIgZ09ns3YXRaZrDlh+MAUd6TdilgIsMKsnE3MT8r08wxhnpzKsSFcvw hZfyYcs9A3DGLmF1GLcVvPn/fbHSn41X6aYtiPKR6YJD7fz74ezTr32PouE+reuSD4VPMa6Pj1NGM dlbKq7H8HDlRTxM0xTGecAEguyS+JAIy60UkTBtGDCm3UZVjcDZQircewQY7XkuUipcPD4bUKyA5w 3j2A7lHMs7HMGLgWOz/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndD8S-003QAO-Ba; Sat, 09 Apr 2022 15:36:24 +0000 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndD8O-003Q8z-E1 for linux-arm-kernel@lists.infradead.org; Sat, 09 Apr 2022 15:36:22 +0000 Received: by mail-pj1-x102b.google.com with SMTP id nt14-20020a17090b248e00b001ca601046a4so14473891pjb.0 for ; Sat, 09 Apr 2022 08:36:19 -0700 (PDT) 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=8MqG/9eNugQ5tJ/Rtq+PYRLEoeHJFnYsCD3SnMQn4kg=; b=eDw0XX8vEuIxsKGozNNZkOhGWPGtwsuAkFfLzUQ+yypbCh/xcMJygJI7OS56r3htJO qQLLMDEH6AMQzz3W8+BQ5uQrRXlBQiXB+Je8D2lOlWyWmcGYiG3wKApKfwg1/Bvuqs7t WswxkWDQhddfR2XZuRzKm249vKm0mRxrImRJJhK87V2IfrCYKhqZkNYH1JwhDawj4Ydl imBXDNCEglXTrDLtnosUSHCjnPB9xEe+O3gR/0We8a0bA5gzYn6/18W6Fx2a+RzskD6k ZSCjTTJ8mEN5okEbgx8Cno+N466acr7GAAsyBQu7iSmDs9tcZE94ijqsdriVqkx6gjmq Nc2A== 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=8MqG/9eNugQ5tJ/Rtq+PYRLEoeHJFnYsCD3SnMQn4kg=; b=N8GmeiwsRylS1dhQFS8jYlocVy+O6fe1zcrvVEChBbvOpt4S35epW4I4K45p0TWxDA sbsFQhoot1Mj0W2awcUcXkckfm3BwhadNfzC0xthdZN0VCYOOzg3+MO/7SUXErYdqp6H FIuCUHaxwrCh7IH5OoekW4pncA+Q0wQBc6YWmpRhejD/LA1wVHFZ4Ew2LqRBzHevvfnB VtOX00wBTlHgc05MISdA0tPPIewZtOkOtmRcelVtcUnEdt+KtMYAV+vB0pnXFD3YfKhZ /TMzAMN4ghfQmfkozz1Te6rlWpPe9ftOw/eZERw+aDFgLQz9y33W7bN42H/qB1lv8k6A eOpA== X-Gm-Message-State: AOAM531IDz3NULwzKL0t6EZixgdbA1jlikT++mRl9/xpjtvoEVapwtdn xkRSs6omGp3hO5KXqxnxYvan9w== X-Google-Smtp-Source: ABdhPJxJ6Bo6jodPi4S/LMUoloiu+LpPOAAl/jt9H56UlC5++ydCyKVu/ohLCA79/QKaaxG4oyUNBA== X-Received: by 2002:a17:90a:8a85:b0:1ca:9d13:9f61 with SMTP id x5-20020a17090a8a8500b001ca9d139f61mr27887356pjn.35.1649518578706; Sat, 09 Apr 2022 08:36:18 -0700 (PDT) Received: from localhost.localdomain ([2409:8a28:e6c:f010:e956:3be0:d6a3:f6ba]) by smtp.gmail.com with ESMTPSA id m1-20020a17090ade0100b001cb3feaddfcsm4810546pjv.2.2022.04.09.08.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 08:36:18 -0700 (PDT) From: Chengming Zhou To: rostedt@goodmis.org, mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, broonie@kernel.org, mark.rutland@arm.com, ardb@kernel.org, zhouchengming@bytedance.com, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com, songmuchun@bytedance.com Subject: [PATCH v4 1/2] ftrace: cleanup ftrace_graph_caller enable and disable Date: Sat, 9 Apr 2022 23:35:53 +0800 Message-Id: <20220409153554.14470-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-20220409_083620_514657_10A45030 X-CRM114-Status: GOOD ( 12.65 ) 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,disable]_ftrace_graph_caller() are used to do special hooks for graph tracer, which are not needed on some ARCHs that use graph_ops:func function to install return_hooker. So introduce the weak version in ftrace core code to cleanup in x86. Signed-off-by: Chengming Zhou --- v4: - put weak ftrace_enable,disable_ftrace_graph_caller() in fgraph.c instead of ftrace.c as suggested by Steve. v3: - consolidate two #if into a single #if, suggested by Steve. Thanks. --- arch/x86/kernel/ftrace.c | 17 ++--------------- kernel/trace/fgraph.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 1e31c7d21597..b09d73c2ba89 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -579,9 +579,7 @@ void arch_ftrace_trampoline_free(struct ftrace_ops *ops) #ifdef CONFIG_FUNCTION_GRAPH_TRACER -#ifdef CONFIG_DYNAMIC_FTRACE - -#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS +#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) extern void ftrace_graph_call(void); static const char *ftrace_jmp_replace(unsigned long ip, unsigned long addr) { @@ -610,18 +608,7 @@ 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_DYNAMIC_FTRACE && !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ /* * Hook the return address and push it in the stack of return addrs diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 8f4fb328133a..289311680c29 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -30,6 +30,24 @@ int ftrace_graph_active; /* Both enabled by default (can be cleared by function_graph tracer flags */ static bool fgraph_sleep_time = true; +/* + * 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; +} + /** * ftrace_graph_stop - set to permanently disable function graph tracing * From patchwork Sat Apr 9 15:35:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 12807969 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 4D46DC433F5 for ; Sat, 9 Apr 2022 15:38:11 +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=K/qMGD3oWMKCRDwNJWeFPEihaMkYSA6VrIqsSgBzCvM=; b=FdUKOQAXoyF2BJ vNuJEvoWk+44MlCnuj/Xp7eBJqSTwsPDXB8qxpnTo4AHWVs5xGo+3gJ05RF7+IVX/56Nr9tt0ldKU zbfjgHD7acOmkoAhTwAqxoW30uRErI2W4DShrucynpU9XGwZNYIr2OICNjlxej9XhYzCDSslgIjoG WGr6nktbn8G3Aj6Sdz4g/M2YlwuHB3jFDDoUEUlIlEfMGQzY83zB1ZybPppZLJAX5KZWCmtX4Qrg+ mhT94uG98MHe0TXv32BA8wicy1eldjrQta2CoXjxB0bIw6RW1j2+xTZqTHjjIJfUuSkBIr/bghCfV oFWOH7npXBiR+n8EF5xg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndD8c-003QEB-UI; Sat, 09 Apr 2022 15:36:35 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndD8Z-003QCa-70 for linux-arm-kernel@lists.infradead.org; Sat, 09 Apr 2022 15:36:32 +0000 Received: by mail-pg1-x533.google.com with SMTP id r66so10363680pgr.3 for ; Sat, 09 Apr 2022 08:36:30 -0700 (PDT) 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=yfbk8YJkO//wfC3mJ2T20Db/FP4L/j3qSerCnlz9i+M=; b=YveU6rx6be8uqAtvTK5nxIhRQlNG8tkPZgVx4KX9/LBzeGuVHQrwdYGNqxHFZutA/T ZVdODDmD+P473i3UjFfZFQYMMjVdabEZ0Dr3ycUBQxG3l51Nt1Q3mw60ATe/5zp3ljIG jQhkd217LFuyW2Nw+gNeBwasm2xfEdQsJ+zBJyEa69gUPnHuK4v+nPykzUKCbAQFhYMA AfPevwBjje+B5I/M4HqbnJA3bcE0mEsuWg0tSv7SYqHgK1YU1c86mDQErTdtTld0oVfm vtLZSQVZW4Ew678Lh/6sE41Bhb5/wpZh9VdWVkgk9CuFEzcD/cgL5TsWmD9HfEnGxAij ZlRw== 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=yfbk8YJkO//wfC3mJ2T20Db/FP4L/j3qSerCnlz9i+M=; b=Cm2DgQAkG+ekDKEg6yXVivQWUvsQuvMe4xcQ/X2n0Yxm92j+ahW09XbmbAUfKbyRvd bvoTUE8KTmWmrB1Nf0xSszz3TvgbiBNAfkwfKvgKD18/D/A2HkAyh02UX6n23E3/3IBM Eq+hxF4ez7BVX3FIPBg4ZjBnQSDIeMs+rd3MHdHOR8RlOIqAm8W//wxuj4HrjynipeiS p47UFtFgmOjnLfjVLw6q/l5vw0M1jbExk6Uc5LqQrUSLOEQqZc3Db+5uRJWYWlPpogC9 KBthJ1pKQZ2CtcrsxQyLsUb7ERBF03ZNSL0yKREi+KswMLr5XKHAe9fDjco0BwsbpAAu MZ2A== X-Gm-Message-State: AOAM530+ZM0PZpmrmyQdBn2D1/8fbp5sc3+LRelgk4VpqFdUH9oL9a70 B9IiqVImi+46qlYpOQ9pTjnTIA== X-Google-Smtp-Source: ABdhPJycD0dD91CG7kEkTLbxTXmVdVAHHzba7SjMipmiVy3X3ZoW3XBhGBd24G+A47ZmTPScjV0TUg== X-Received: by 2002:a05:6a00:1388:b0:505:9b0b:ba61 with SMTP id t8-20020a056a00138800b005059b0bba61mr3508875pfg.4.1649518589987; Sat, 09 Apr 2022 08:36:29 -0700 (PDT) Received: from localhost.localdomain ([2409:8a28:e6c:f010:e956:3be0:d6a3:f6ba]) by smtp.gmail.com with ESMTPSA id m1-20020a17090ade0100b001cb3feaddfcsm4810546pjv.2.2022.04.09.08.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 08:36:28 -0700 (PDT) From: Chengming Zhou To: rostedt@goodmis.org, mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, broonie@kernel.org, mark.rutland@arm.com, ardb@kernel.org, zhouchengming@bytedance.com, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com, songmuchun@bytedance.com Subject: [PATCH v4 2/2] arm64/ftrace: Make function graph use ftrace directly Date: Sat, 9 Apr 2022 23:35:54 +0800 Message-Id: <20220409153554.14470-2-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220409153554.14470-1-zhouchengming@bytedance.com> References: <20220409153554.14470-1-zhouchengming@bytedance.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220409_083631_291948_F797F539 X-CRM114-Status: GOOD ( 15.66 ) 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 Tested-by: Mark Rutland Reviewed-by: Mark Rutland --- v3: - Add comments in ftrace_graph_func() as suggested by Steve. Thanks. v2: - Remove FTRACE_WITH_REGS ftrace_graph_caller asm, thanks Mark. --- arch/arm64/include/asm/ftrace.h | 7 +++++++ arch/arm64/kernel/entry-ftrace.S | 17 ----------------- arch/arm64/kernel/ftrace.c | 17 +++++++++++++++++ 3 files changed, 24 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..35eb7c9b5e53 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -268,6 +268,22 @@ 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) +{ + /* + * Athough graph_ops doesn't have FTRACE_OPS_FL_SAVE_REGS set in flags, + * regs can't be NULL in DYNAMIC_FTRACE_WITH_REGS. By design, it should + * be fixed when DYNAMIC_FTRACE_WITH_ARGS is implemented. + */ + 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 +313,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 */