Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1476417rwb; Wed, 16 Nov 2022 19:02:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf6TPTQcM13A/mG/K1J8iIovLmh2Jxp5iVcgL+pmtR5+6CinUiuvSgQHsb2E+lyZnCa95wx1 X-Received: by 2002:a63:3f86:0:b0:476:b165:d7a1 with SMTP id m128-20020a633f86000000b00476b165d7a1mr321510pga.144.1668654149864; Wed, 16 Nov 2022 19:02:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668654149; cv=none; d=google.com; s=arc-20160816; b=XpuNfCCnrc2iGJgDB+8d3KMreBdOcleZk/NVqxFwD4rfP+Mp0rrzVU2cRNUjW+RueV dt6mHG2tT2LnvOcJvqY6efh6eRa6NeoIqwtqMjCfr4hQpRp7ZQ15V5KIZki23oRVwl5/ qS8IpcOmBtP5haK8JkT2TmFa5ZwTZmpmffXriyRlwmXJMtRGUJQUgvfxpCd1CcL6TrIE kLBLscr7JAqHHcI3QpUe1GVbqQQ2vOnm6gn5wdP4Kog/7sT6sP2KPauU3MW9H0JGOwbR fkBcVpfroq/fimZNeP3eyw1qvxgk5fvee+i9M5FlDMFUTL+6oSwKaxcb9Z7JISREn+IC 5iyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=4pWF9A9sV3QyFYd6eOMJJfX2HBs6bYSsErMPDKNT/wA=; b=mjXMWxY2B/UV4flsmp+cbM1I3vAFmZdBdkAFM3q2O/zZta+Kt4iMXyGlW8Uu8Ov8UQ ITHTvhdQV3NEQpKBsQUAhzpaPgGA7OUfgq99jW0Kek9qWwY8o6sKHW1bfQ8/ZXU1NxL/ 44ydDVcf0gjDYGHwyfQq7w1qyjzx5+599HkGLB2XUYejybbFLn18ToVhWXrSKK1fx6DQ pxy3vKY0Cm4wp9OXqPScKpl5W8RqvNCT4XO1FnzQxwzFhkeRQxWn8v06HBVVE/igIv+K y2EYedoxDVeDqPctT/7zyVd1A7USFltdjj6gY2SB5lkXTlOVEKnp2dFHPW88x90sD+IU cGCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FILurbRx; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a170902f70600b00188d892999esi5713472plo.521.2022.11.16.19.02.17; Wed, 16 Nov 2022 19:02:29 -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=FILurbRx; 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 S237359AbiKQBz7 (ORCPT + 90 others); Wed, 16 Nov 2022 20:55:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233772AbiKQBz5 (ORCPT ); Wed, 16 Nov 2022 20:55:57 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90267654EE for ; Wed, 16 Nov 2022 17:55:56 -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 164A862060 for ; Thu, 17 Nov 2022 01:55:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7407EC43145 for ; Thu, 17 Nov 2022 01:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668650155; bh=S0DqzMJHKbSmIvt1FFR0xECdHab+RFIBJvJI8T2w/Tc=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=FILurbRxsifye76/ouoCgqE7Q7XsXu0jtZEqYQ/blOGZe4iwAE3DAcdHkSvQ9iTkL J+Dbz0uXB0i5AyaWIhZFlcwW8vf5pllQzyN7ilIkK/rGmQC2j0gnaQ/NrtygqtjfBD wgiV7Cvax0Wuy3SyfU/BvMX6gUxwIm9xylwzkBY6ofi6M8S+E1oV9mAIf0gYm8PlkG tQw0zq+XN6fV/PuOg0cgbYn6CECMxB0ocfC5Hu1r1cyvQNsAlDH8yk4RvdLtLM7TZo rw1eZktny/4nGr+mdpI/Br3vTqPc+ngDalg4s2/DLlG3ACQ54ijwjuvM2R3wg0yBrx pA/JXm8Ng8RNg== Received: by mail-ej1-f54.google.com with SMTP id ft34so1500347ejc.12 for ; Wed, 16 Nov 2022 17:55:55 -0800 (PST) X-Gm-Message-State: ANoB5pkE+N+a5lIZlnZvGwKsZMCgRwxJXztqH04h8KNQiwKofeg4lYFW AHHlDa2YNzAee49XG1qYgNf2/mnYhj1Z1oMSUhk= X-Received: by 2002:a17:907:cf84:b0:78d:4795:ff1f with SMTP id ux4-20020a170907cf8400b0078d4795ff1fmr424058ejc.331.1668650153644; Wed, 16 Nov 2022 17:55:53 -0800 (PST) MIME-Version: 1.0 References: <20221116031305.286634-1-suagrfillet@gmail.com> <20221116031305.286634-3-suagrfillet@gmail.com> <20221116084540.aslzynq4bmar6f46@kamzik> In-Reply-To: <20221116084540.aslzynq4bmar6f46@kamzik> From: Guo Ren Date: Thu, 17 Nov 2022 09:55:41 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 2/3] riscv/ftrace: SAVE_ALL supports lightweight save To: Andrew Jones Cc: Song Shuai , rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" 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 On Wed, Nov 16, 2022 at 4:45 PM Andrew Jones wrote: > > On Wed, Nov 16, 2022 at 11:13:04AM +0800, Song Shuai wrote: > > In order to make the function graph use ftrace directly, ftrace_caller > > should be adjusted to save the necessary regs against the pt_regs layout > > so it can call ftrace_graph_func reasonably. > > > > SAVE_ALL now saves all the regs according to the pt_regs struct. Here > > introduces a lightweight option for SAVE_ALL to save only the necessary > > regs for ftrace_caller. > > > > For convenience, the original argument setup for the tracing function in > > ftrace_[regs]_caller is killed and appended to the tail of SAVE_ALL. > > > > Signed-off-by: Song Shuai > > --- > > arch/riscv/kernel/mcount-dyn.S | 110 +++++++++++++++++++++++++++------ > > 1 file changed, 92 insertions(+), 18 deletions(-) > > > > diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S > > index d171eca623b6..2f0a280bd7a0 100644 > > --- a/arch/riscv/kernel/mcount-dyn.S > > +++ b/arch/riscv/kernel/mcount-dyn.S > > @@ -56,7 +56,51 @@ > > .endm > > > > #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS > > - .macro SAVE_ALL > > + > > +/** > > +* SAVE_ALL - save regs against the pt_regs struct > > +* > > +* @all: tell if saving all the regs > > I find it odd to have a macro name that includes 'ALL' in it > to require a parameter 'all' to be set in order to actually save > all. I suggest renaming the macro to something like SAVE_REGS. SAVE_ABI_REGS arg = 0 -> SAVE_ABI in pt_regs arg = 1 -> SAVE_REGS SAVE_ABI_REGS keeps the pt_regs layout and needs more stack space than SAVE_ABI. > > > +* > > +* If all is set, all the regs will be saved, otherwise only ABI > > +* related regs (a0-a7,epc,ra and optional s0) will be saved. > > +* > > +* For convenience the argument setup for tracing function is appended here. > > +* Especially $sp is passed as the 4th argument of the tracing function. > > +* > > +* After the stack is established, > > +* > > +* 0(sp) stores the PC of the traced function which can be accessed > > +* by &(fregs)->regs->epc in tracing function. Note that the real > > +* function entry address should be computed with -FENTRY_RA_OFFSET. > > +* > > +* 8(sp) stores the function return address (i.e. parent IP) that > > +* can be accessed by &(fregs)->regs->ra in tracing function. > > +* > > +* The other regs are saved at the respective localtion and accessed > > +* by the respective pt_regs member. > > +* > > +* Here is the layout of stack for your reference. > > +* > > +* > > +* ========= > > +* | pip | > > +* PT_SIZE_ON_STACK -> ========= > > +* + ..... + > > +* + t3-t6 + > > +* + s2-s11+ > > +* + a0-a7 + --++++-> ftrace_caller saved > > +* + s1 + + > > +* + s0 + --+ > > +* + t0-t2 + + > > +* + tp + + > > +* + gp + + > > +* + sp + + > > +* + ra + --+ // parent IP > > +* sp -> + epc + --+ // PC of the traced function > > +* +++++++++ > > +**/ > > + .macro SAVE_ALL, all=0 > > addi sp, sp, -SZREG > > addi sp, sp, -PT_SIZE_ON_STACK > > > > @@ -67,14 +111,8 @@ > > REG_S x1, PT_RA(sp) > > REG_L x1, PT_EPC(sp) > > > > - REG_S x2, PT_SP(sp) > > - REG_S x3, PT_GP(sp) > > - REG_S x4, PT_TP(sp) > > - REG_S x5, PT_T0(sp) > > - REG_S x6, PT_T1(sp) > > - REG_S x7, PT_T2(sp) > > - REG_S x8, PT_S0(sp) > > - REG_S x9, PT_S1(sp) > > + /* always save the ABI regs */ > > + > > REG_S x10, PT_A0(sp) > > REG_S x11, PT_A1(sp) > > REG_S x12, PT_A2(sp) > > @@ -83,6 +121,18 @@ > > REG_S x15, PT_A5(sp) > > REG_S x16, PT_A6(sp) > > REG_S x17, PT_A7(sp) > > + > > + /* save leftover regs for ftrace_regs_caller*/ > > + > > + .if \all == 1 > > + REG_S x2, PT_SP(sp) > > + REG_S x3, PT_GP(sp) > > + REG_S x4, PT_TP(sp) > > + REG_S x5, PT_T0(sp) > > + REG_S x6, PT_T1(sp) > > + REG_S x7, PT_T2(sp) > > + REG_S x8, PT_S0(sp) > > + REG_S x9, PT_S1(sp) > > REG_S x18, PT_S2(sp) > > REG_S x19, PT_S3(sp) > > REG_S x20, PT_S4(sp) > > @@ -97,22 +147,31 @@ > > REG_S x29, PT_T4(sp) > > REG_S x30, PT_T5(sp) > > REG_S x31, PT_T6(sp) > > + .else > > + > > + /* save s0 for ftrace_caller if FP_TEST defined */ > > + > > +#ifdef HAVE_FUNCTION_GRAPH_FP_TEST > > + REG_S x8, PT_S0(sp) > > +#endif > > + .endif > > + > > + /* setup 4 args for tracing functions */ > > + > > + addi a0, ra, -FENTRY_RA_OFFSET // ip > > + la a1, function_trace_op > > + REG_L a2, 0(a1) // op > > + REG_L a1, PT_SIZE_ON_STACK(sp) // parent_ip > > + mv a3, sp // fregs > > Please line up the comments. > > > .endm > > > > - .macro RESTORE_ALL > > + .macro RESTORE_ALL, all=0 > > REG_L x1, PT_RA(sp) > > addi sp, sp, PT_SIZE_ON_STACK > > REG_S x1, (sp) > > addi sp, sp, -PT_SIZE_ON_STACK > > REG_L x1, PT_EPC(sp) > > - REG_L x2, PT_SP(sp) > > - REG_L x3, PT_GP(sp) > > - REG_L x4, PT_TP(sp) > > - REG_L x5, PT_T0(sp) > > - REG_L x6, PT_T1(sp) > > - REG_L x7, PT_T2(sp) > > - REG_L x8, PT_S0(sp) > > - REG_L x9, PT_S1(sp) > > + > > REG_L x10, PT_A0(sp) > > REG_L x11, PT_A1(sp) > > REG_L x12, PT_A2(sp) > > @@ -121,6 +180,16 @@ > > REG_L x15, PT_A5(sp) > > REG_L x16, PT_A6(sp) > > REG_L x17, PT_A7(sp) > > + > > + .if \all == 1 > > + REG_L x2, PT_SP(sp) > > + REG_L x3, PT_GP(sp) > > + REG_L x4, PT_TP(sp) > > + REG_L x5, PT_T0(sp) > > + REG_L x6, PT_T1(sp) > > + REG_L x7, PT_T2(sp) > > + REG_L x8, PT_S0(sp) > > + REG_L x9, PT_S1(sp) > > REG_L x18, PT_S2(sp) > > REG_L x19, PT_S3(sp) > > REG_L x20, PT_S4(sp) > > @@ -136,6 +205,11 @@ > > REG_L x30, PT_T5(sp) > > REG_L x31, PT_T6(sp) > > > > + .else > > +#ifdef HAVE_FUNCTION_GRAPH_FP_TEST > > + REG_L x8, PT_S0(sp) > > +#endif > > + .endif > > addi sp, sp, PT_SIZE_ON_STACK > > addi sp, sp, SZREG > > .endm > > -- > > 2.20.1 > > > > > > Thanks, > drew -- Best Regards Guo Ren