From patchwork Sat Jan 7 13:35:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 40401 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1302975wrt; Sat, 7 Jan 2023 05:37:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXssYWSQOrt/90Qytr1KMCklIsaG38goGVm/F/M3zarWSn86rosuibB9prbgSjk1n1pv8soH X-Received: by 2002:a17:906:2859:b0:7c1:32:3574 with SMTP id s25-20020a170906285900b007c100323574mr41356093ejc.12.1673098662483; Sat, 07 Jan 2023 05:37:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673098662; cv=none; d=google.com; s=arc-20160816; b=L9S8/clHASiWp33N79hE57j4vnfqDLjq+h82PX6cJ5lJ+/nkYT9eQPCbfpq/pxmko6 LXpPtJzLgOt9h/cNSX+eo/LkHnafhUOlG4hlWhyrAe+Xf+i+HKJ4hvYNMnJ2DYMGhGxh TghZAiekbLrUGeMnr7llx3SuH7Lv4j+MROIXm92uHv7TpiiaLUB5zLjaG9amxmSbRMV3 Lqpm1RaR4CMs5wnA9xCvR7uxCIZQpUDbeGifUd05nJcrWApNha57qw6mZJuAs3gyibnN LIsSSnKB/oxCuY4XnoX1aMnXpAt6Gios0DjTstCYAvOC/v/XVvpyd10mCynH0c8yw2sa DWYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=c3aI2Pb2sWJhRt23mUhetKwk0spj6H2AgWpnKfRsiks=; b=uys5FppPkYGV7PECkLnYiBEwT2XYjp0huXIpFofezAZFAJ6VYwE2lnIGXEEMbj6h8H P1tWyR3M/Fml6TyjMAIgrs8mpNMG2kO2XbnC88q11fwtbUqiYtSL7TT2zA9FAdY/5hrg agXYJFudhJI3rIeJvQOq+H8j4Zpf7WakaNvdL0o2GW9Q8vNqLLmeKgFextq5Ppc+82LM sEdnyjZPTahzfzFQAeakJDQLx6XRdMhGMP1at0Hzqc7ZBEl8gkTgmg10WtzTeC7lyiCK SHBYlWYYZL1BDCdZvOxXQLlldS7Rx0n1r8/HKNxIEXpoSMbcpxPEhUTTQUj6E9D2X2OS Lb1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cM5mKBBO; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg6-20020a170907a40600b007c0b03b23b5si4610107ejc.542.2023.01.07.05.37.18; Sat, 07 Jan 2023 05:37:42 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=cM5mKBBO; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232641AbjAGNgv (ORCPT + 99 others); Sat, 7 Jan 2023 08:36:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232727AbjAGNgb (ORCPT ); Sat, 7 Jan 2023 08:36:31 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7C8D61317 for ; Sat, 7 Jan 2023 05:36:26 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 617F560C00 for ; Sat, 7 Jan 2023 13:36:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7F51C43392; Sat, 7 Jan 2023 13:36:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673098585; bh=+WY0ZZ7kn9btqTkXdVxs7WtslgQoWZYMoTJ+XWNBI98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cM5mKBBOi26YRA7KCHvGnzs5C98PBpofhWtvIwwcWydDd4GsRrVgYoxMO3ZOFjSX2 x1Q0JLxb59/aXr28UGetayp3ZQseEgkfEObIC9XBHlrrq32+rn2KiPwsb6AXXcInfp DSTog4ldyECdMryodaL/nkV5qrMGjdV236s6cqCaizB2F1XaplWz9Z3nZCLmwhkBWV bk8ENbH1atNgeV5c5FoIqYPkrN8uixB01rzadQTESTGITJHzGjhSvkTU8PYHqr01t3 STE/SUREohV0jETOP+Qa5DfdBznN29dmAPiDtP4iEzlc6xZCxutOMhAHb/hNWZaRR8 HR8rlBuZMixFA== From: guoren@kernel.org To: anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, conor.dooley@microchip.com, heiko@sntech.de, rostedt@goodmis.org, mhiramat@kernel.org, jolsa@redhat.com, bp@suse.de, jpoimboe@kernel.org, suagrfillet@gmail.com, andy.chiu@sifive.com, e.shatokhin@yadro.com, guoren@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH -next V6 4/7] riscv: ftrace: Add ftrace_graph_func Date: Sat, 7 Jan 2023 08:35:46 -0500 Message-Id: <20230107133549.4192639-5-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230107133549.4192639-1-guoren@kernel.org> References: <20230107133549.4192639-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1754371103192441231?= X-GMAIL-MSGID: =?utf-8?q?1754371103192441231?= From: Song Shuai Here implements ftrace_graph_func as the function graph tracing function with FTRACE_WITH_REGS defined. function_graph_func gets the point of the parent IP and the frame pointer from fregs and call prepare_ftrace_return for function graph tracing. If FTRACE_WITH_REGS isn't defined, the enable/disable helpers of ftrace_graph_[regs]_call are revised for serving only ftrace_graph_call in the !FTRACE_WITH_REGS version ftrace_caller. Signed-off-by: Song Shuai Tested-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/include/asm/ftrace.h | 13 +++++++++++-- arch/riscv/kernel/ftrace.c | 30 +++++++++++++----------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h index 9e73922e1e2e..84f856a3286e 100644 --- a/arch/riscv/include/asm/ftrace.h +++ b/arch/riscv/include/asm/ftrace.h @@ -107,8 +107,17 @@ do { \ struct dyn_ftrace; int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec); #define ftrace_init_nop ftrace_init_nop -#endif -#endif +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +struct ftrace_ops; +struct ftrace_regs; +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 /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ + +#endif /* __ASSEMBLY__ */ + +#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* _ASM_RISCV_FTRACE_H */ diff --git a/arch/riscv/kernel/ftrace.c b/arch/riscv/kernel/ftrace.c index 5bff37af4770..95e14d8161a4 100644 --- a/arch/riscv/kernel/ftrace.c +++ b/arch/riscv/kernel/ftrace.c @@ -169,32 +169,28 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, } #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 *)®s->ra; + + prepare_ftrace_return(parent, ip, frame_pointer(regs)); +} +#else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ extern void ftrace_graph_call(void); -extern void ftrace_graph_regs_call(void); int ftrace_enable_ftrace_graph_caller(void) { - int ret; - - ret = __ftrace_modify_call((unsigned long)&ftrace_graph_call, - (unsigned long)&prepare_ftrace_return, true, true); - if (ret) - return ret; - - return __ftrace_modify_call((unsigned long)&ftrace_graph_regs_call, + return __ftrace_modify_call((unsigned long)&ftrace_graph_call, (unsigned long)&prepare_ftrace_return, true, true); } int ftrace_disable_ftrace_graph_caller(void) { - int ret; - - ret = __ftrace_modify_call((unsigned long)&ftrace_graph_call, - (unsigned long)&prepare_ftrace_return, false, true); - if (ret) - return ret; - - return __ftrace_modify_call((unsigned long)&ftrace_graph_regs_call, + return __ftrace_modify_call((unsigned long)&ftrace_graph_call, (unsigned long)&prepare_ftrace_return, false, true); } +#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */