From patchwork Wed Nov 16 03:13:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Shuai X-Patchwork-Id: 13044370 X-Patchwork-Delegate: palmer@dabbelt.com 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 66D88C43217 for ; Wed, 16 Nov 2022 03:13:43 +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=ftZ3RPyaEWGPTC5/KnB9tF+a8wUmyR0wC3HYE9oTvSY=; b=UOn5b2Dqrwa9gf v2SzFIgxExUFOT8aTaJog5CDCX99mjKegLZDxWpVCrT8NHInEQqvL84pr15F9ArymLoSXwP8OACyg 4Z1hS2Pdf5/+2NqkqMFfSEQTq+J97rIT8cH+pvkJwA4AchPF7RQScHCS5hmN7hYnr7Eb5rwTd96Yo YzZfSNq/AupAd1tWvfXFkjmvXMfikYT6MiF7AGId2nNsNrSa2iVOFcjvjksCE46VhDSWDhNQpQRr6 gFCLkFW5hBSas4YYPn0cB9I4mcKdDlrwy/Ge9QMycNmhMAR1aOP54Bn/xzBYL5UboxJTnGb5/PFWX 8i4R2DsxVr4HHcnJL01w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ov8ro-00GhQo-6d; Wed, 16 Nov 2022 03:13:36 +0000 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ov8rl-00GhPa-Ny for linux-riscv@lists.infradead.org; Wed, 16 Nov 2022 03:13:35 +0000 Received: by mail-pj1-x1032.google.com with SMTP id l22-20020a17090a3f1600b00212fbbcfb78so1017279pjc.3 for ; Tue, 15 Nov 2022 19:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kfjBpdjhy3FRsarxq0mtTibVzLi0v1ap0dEoQSB+eCk=; b=HCmzSGbRAwS0Xz3K0YWpt5t1BGt5W3HFACyaOHbIgILZxabfSXhfkANFw6bM2qGYbD KT0gAgUO/ptx1Ede2o+OegsXqmyFeG6hMuBNz+iz5bir+2JjrfxSN+2o+JBGM2a0bLvH BYxMmfVtXGLOwByy0FY0WYjep6f2KcONrF0Y6SP0LJb11yt5u+CWezM7S4UkCQS9T1wu w9eytCB0ND+aNbyDEgLxjbTL8k7kUrGyS9cM8jW2OQcV6/PhXTcUTFFXPUwWiPAcyUSX L+leE4UYdnSSKzRlg1ofV+ass5fcCgE4kwe8JKRfhBSViurqpafvfi9En+qpZ4TJtsOa o5Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kfjBpdjhy3FRsarxq0mtTibVzLi0v1ap0dEoQSB+eCk=; b=fkW1wGapF9o39eA7T2aR/LswDOYNX8wFhIMWyo9s8TVXm8ImCecjqVdlK9PRPGambI asScjb/EL5MMprwnkEkKxDT1STx3UsLVzpGzjCL4HCZEqK2ovDVAFSVC/+dA+Z6CLOlZ 1HY5LV8vIzAv7tzc3jHobmwYHR0oRoYBHCYbV8XIq6NwFQe91R12/zrWdzZvGgDeJVOf QExG6KXrXmPt/f3S0XBzHGXuzk9nd07gT1mf1jwsiw42I9qcv67QsA8S0m24Nnrn9f9T UYbk1LNZr2+TPLHJicbTWwlFgywTSuvVS5zSD/vtps5C+9aPUFl9ksvpJ/foQRwI6GNx QgWQ== X-Gm-Message-State: ANoB5plByX8k1c5CVPbe3CegED5oA3sPlhOO5Of/oUl92sQWjJGRV+Ap 9ATfQJ2kF60j9MeE136iUhc= X-Google-Smtp-Source: AA0mqf6906E8vnIqvm3Ht/G0BwBICFFZTgDzXIhHEd3G6itTsjMGFeNoVLqdl6f5iKF7o8OuPFNjLA== X-Received: by 2002:a17:902:b186:b0:185:4ec3:c708 with SMTP id s6-20020a170902b18600b001854ec3c708mr7046411plr.60.1668568410924; Tue, 15 Nov 2022 19:13:30 -0800 (PST) Received: from localhost.localdomain ([221.226.144.218]) by smtp.gmail.com with ESMTPSA id ml22-20020a17090b361600b0020b2082e0acsm348295pjb.0.2022.11.15.19.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 19:13:30 -0800 (PST) From: Song Shuai To: guoren@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Song Shuai Subject: [PATCH v2 1/3] riscv/ftrace: add ftrace_graph_func Date: Wed, 16 Nov 2022 11:13:03 +0800 Message-Id: <20221116031305.286634-2-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221116031305.286634-1-suagrfillet@gmail.com> References: <20221116031305.286634-1-suagrfillet@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221115_191333_816416_F35F84DE X-CRM114-Status: GOOD ( 12.16 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 remain for serving the !FTRACE_WITH_REGS version ftrace_caller. Signed-off-by: Song Shuai --- arch/riscv/include/asm/ftrace.h | 13 +++++++++++-- arch/riscv/kernel/ftrace.c | 16 ++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h index 04dad3380041..61a8f4be67eb 100644 --- a/arch/riscv/include/asm/ftrace.h +++ b/arch/riscv/include/asm/ftrace.h @@ -81,8 +81,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 2086f6585773..148a5480076b 100644 --- a/arch/riscv/kernel/ftrace.c +++ b/arch/riscv/kernel/ftrace.c @@ -196,6 +196,20 @@ 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) @@ -223,5 +237,7 @@ int ftrace_disable_ftrace_graph_caller(void) return __ftrace_modify_call((unsigned long)&ftrace_graph_regs_call, (unsigned long)&prepare_ftrace_return, false); } +#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ + #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ From patchwork Wed Nov 16 03:13:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Shuai X-Patchwork-Id: 13044371 X-Patchwork-Delegate: palmer@dabbelt.com 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 9F6A5C4332F for ; Wed, 16 Nov 2022 03:13: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=VxmMr9yb+IAIkIVwMxqss31xkq2xvECUfg+vFmxBQVs=; b=ZXZIETC8A1aJpQ vR8qwiMH1I7R55qef/VpqcVWeOyCLZQD7L+RzzPoqoCabJktIOgOC20Xz6G9y/cj3TkR3nGSIk27/ KWJIF5I4jdqgVRfbztsNfjTJz7QmFEXSaoeHPi5F0a8nPXtPqPS+7eHqoWRscKNGwFNzTG6kUkKyy pdQFpVjzETOzteqVGrRK6Ko6sB44nLsRoepARMW1exYj0HeTPCYp5vjA+R8539ZwH8Eafr17KKYtW FHwfkYTLX3u4Gz7ifkpyEhOJko7BYFzn7/Kf6cEoBgLd32xYpJyKcZSugzHRDcDDRUq0HfW0T7jof TAKdjk+RxVPLCepzzq/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ov8rr-00GhSY-EN; Wed, 16 Nov 2022 03:13:39 +0000 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ov8ro-00GhQG-VA for linux-riscv@lists.infradead.org; Wed, 16 Nov 2022 03:13:38 +0000 Received: by mail-pl1-x633.google.com with SMTP id k7so15214343pll.6 for ; Tue, 15 Nov 2022 19:13:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A3Sgd0SU9M6CpUSRStE6vDvg0DHGGT+ouTzN5zX360k=; b=VTO9vgT1yrzsJADrFjmgJ4aWs7BsToOlX6QncvEKYLRiPbZhj8sofO7hmRAk0oUrRf 2vqV5Mswfo4RuSSDJF0/BkDa8XQRSkJMC8FD8MDHCEYJ3ARtS80HGXCV/muWsOdhun4e MGsssEUchdtMGlBuXuqs2tehTCSTe1cUMAUlx8tc9/GogzDFnpg6Hb4FhV7hYgTWKhHo hPYxsmIEEkkAy9U5JpgIPqdvW99PACkslIpQRIGpLbiWYuIPbdSyXgCSP+y0/62tkLoM ZNAN8fqgb7+K66faIPouDFhakBmauX+nIErtYD1rInl5AYIt0oIITw3Ch98e1ddWM4Zn E97Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A3Sgd0SU9M6CpUSRStE6vDvg0DHGGT+ouTzN5zX360k=; b=A1P3drh7ey50pHTo28+UkDcToD+HeZWWLttS8umg9fTcVM5GtupQZ9iy6DDkviZkLW gPzWrzduH3mlYvmBYGYPM+E6RyQ3sJeGGFr6P04KXmFct9laEvsmzUecoVLnLh+55JK9 oFJwLPNexzQnofXwp+vPXWUHIv9obqZEJGhnkB+qI3pePPeYV3Ma6UN57dvd5QR682l/ dYxlDooJ6ZEDga5L7pJ4QPlxona+TKa2Mu0GL34HYd2fRpfw8SiB7lTULyfStPy0rpu/ yTsNpx5gyMozkOMmTN+G3un7wciCJecjwt+35VWWIX98nIRKsHWHkCYd+V9udV34evDt nYew== X-Gm-Message-State: ANoB5pmMlIYNpgzcW0sXPqR0G374XLVZPgi3ON6WJxIq0iCeCsbltYHA pMdgy1FaZGG5l/wUTNbY//k= X-Google-Smtp-Source: AA0mqf7DAddMbl6lNwlouxjPbc9Yzv+yAJB85SvbuH0IfnUEMgYD0xRah8ylORRHkUq1BiJTmo06dg== X-Received: by 2002:a17:90a:5990:b0:20a:68f5:a986 with SMTP id l16-20020a17090a599000b0020a68f5a986mr1525717pji.166.1668568414049; Tue, 15 Nov 2022 19:13:34 -0800 (PST) Received: from localhost.localdomain ([221.226.144.218]) by smtp.gmail.com with ESMTPSA id ml22-20020a17090b361600b0020b2082e0acsm348295pjb.0.2022.11.15.19.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 19:13:33 -0800 (PST) From: Song Shuai To: guoren@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Song Shuai Subject: [PATCH v2 2/3] riscv/ftrace: SAVE_ALL supports lightweight save Date: Wed, 16 Nov 2022 11:13:04 +0800 Message-Id: <20221116031305.286634-3-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221116031305.286634-1-suagrfillet@gmail.com> References: <20221116031305.286634-1-suagrfillet@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221115_191337_074218_CE2D1423 X-CRM114-Status: GOOD ( 13.81 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 +* +* 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 .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 From patchwork Wed Nov 16 03:13:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Shuai X-Patchwork-Id: 13044372 X-Patchwork-Delegate: palmer@dabbelt.com 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 3DA2DC43219 for ; Wed, 16 Nov 2022 03:13:48 +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=xHakW86brmNQ9I8Y9tQjY2i58M80ZOC5q7MDl5loQmM=; b=FsMCSy57sEUN3s knlBRGCJqaDTreFDjXBlPBCmVpvz9X5R+ze3KQUCDpgtLN2E1AcwwOdX5IUAMUJFQL/7bVlRa47Yc Pm+fTCUnONvWZx0ZYmlxWPsjtM96HUHrVmRow0VGfV1g0EGc6lzRM6D3Yo/pkOfbBTM6v5kdYy68F qhHT6Z3tNtOxmv9W46nwu3FdOKEeKJtxkc/esORfFO7wYtNZwse7dTpXIB4/zzBgSBbCUB4PZL93D 4xJGDzFeuySpqy+Agw8QCCXC7VVNsNe9HW3i4Y9In4LWEnpOBUpMxzgMAKXkDSsNBr+/QfkI6wnxH HP1rg2m2QxL7zc3/VF+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ov8rt-00GhTV-BU; Wed, 16 Nov 2022 03:13:41 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ov8rr-00GhRT-7P for linux-riscv@lists.infradead.org; Wed, 16 Nov 2022 03:13:40 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d192so3095366pfd.0 for ; Tue, 15 Nov 2022 19:13:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QpY9sowzoB4bTfPMOQKq0rrOfNHmYsG5EEqVDAlGCR8=; b=Fkp7RqRXzLca9GRGFqbpy0Ixb78LnV5vSgMDr9Nx1mkvb3FkxSH54azGidRQ9j39Ci m1vgt9Y4jUAf5h5HKEYTpNcNgnE+RJ/KOYkY3a+Qe8UKzyjB4ACCDOAHULHz4KD26uFJ x4jqjovF5KgqyLe2gE8G7PeB2QByNgMtevktMBqHz7G63ktcpXABfLYc+fbKdTYw4xi+ XVGRdnAFXBeU39ClDL2wu5dkPvN/DqcbfAs6k9Z1cjJhKVsVczgY+nTCwbJ6GqNr/ctp w/Q6Yiyjta2nCU8gYeYP9GAW7IS5ScwGPYgRIQCFkDwPaaGm6ZaaE2W5f/cEgJlp5DhO c3Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QpY9sowzoB4bTfPMOQKq0rrOfNHmYsG5EEqVDAlGCR8=; b=HraQNX6BmU3CngvE3R9nJabDMmrhwfvRmW/mjRvm6TuszqkvN5okqZROA831DKKEdn rSJcC85TaC2rHk3u3Y72IltpB6SHGOe+UXNqpsBehoZUasyoTqDwG2NRLBxKhOR7SGnP GtC+tt8705YdIQSeal1wdbaj4pFUV3piGHp61NWGRyvToG73RApciVQrDFHo339tJUsn u9nXteReBSWqxnLztWv6c0G43Nz7usy+vtw4H6qfoWTeAd1G5oNoTqjDYTJwgnsU6uVj jEeXL0yeOETggBibEVk0L6hNybKrXFaOe3pQZjqpGTXO7Jy7m1ttrhYxVw8VC+tcNulp w+zw== X-Gm-Message-State: ANoB5pkaWjmOS1QKsY4ICriCaMHgAlZwUxiTJ74gjqZNEZ9tJchClKuf 1Ft7/o+IqPv1e93z76y2aYw= X-Google-Smtp-Source: AA0mqf6u+hR/uvV6gQ5bgFGDZl4J+cU6RpPb2zAzKAt/7REEHZZRR9j6Eqpp6zyI3vI+flRPpxwN5A== X-Received: by 2002:a63:5465:0:b0:470:8e8d:44ae with SMTP id e37-20020a635465000000b004708e8d44aemr18164459pgm.382.1668568417139; Tue, 15 Nov 2022 19:13:37 -0800 (PST) Received: from localhost.localdomain ([221.226.144.218]) by smtp.gmail.com with ESMTPSA id ml22-20020a17090b361600b0020b2082e0acsm348295pjb.0.2022.11.15.19.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 19:13:36 -0800 (PST) From: Song Shuai To: guoren@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Song Shuai Subject: [PATCH v2 3/3] riscv/ftrace: cleanup ftrace_caller and ftrace_regs_caller Date: Wed, 16 Nov 2022 11:13:05 +0800 Message-Id: <20221116031305.286634-4-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221116031305.286634-1-suagrfillet@gmail.com> References: <20221116031305.286634-1-suagrfillet@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221115_191339_296822_E739D7DD X-CRM114-Status: GOOD ( 11.00 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org ftrace_caller and ftrace_regs_caller save their regs with the respective option of SAVE_ALL, then call the tracing function, especially graph_ops's ftrace_graph_func. So the ftrace_graph_[regs]_call labels aren't needed anymore if FTRACE_WITH_REGS is defined. If FTRACE_WITH_REGS isn't defined, the !FTRACE_WITH_REGS version ftrace_caller remains with the ftrace_graph_call. So the enable/disable helpers are revised for serving only this ftrace_graph_call. Signed-off-by: Song Shuai --- arch/riscv/kernel/ftrace.c | 19 ++---------------- arch/riscv/kernel/mcount-dyn.S | 35 +++++++++++++++------------------- 2 files changed, 17 insertions(+), 37 deletions(-) diff --git a/arch/riscv/kernel/ftrace.c b/arch/riscv/kernel/ftrace.c index 148a5480076b..2f0bcedc6a2d 100644 --- a/arch/riscv/kernel/ftrace.c +++ b/arch/riscv/kernel/ftrace.c @@ -211,30 +211,15 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, #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); - 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); } int ftrace_disable_ftrace_graph_caller(void) { - int ret; - - ret = __ftrace_modify_call((unsigned long)&ftrace_graph_call, - (unsigned long)&prepare_ftrace_return, false); - 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); } #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S index 2f0a280bd7a0..9e4097c6793d 100644 --- a/arch/riscv/kernel/mcount-dyn.S +++ b/arch/riscv/kernel/mcount-dyn.S @@ -215,6 +215,7 @@ .endm #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ +#ifndef CONFIG_DYNAMIC_FTRACE_WITH_REGS ENTRY(ftrace_caller) SAVE_ABI @@ -243,33 +244,27 @@ ftrace_graph_call: ret ENDPROC(ftrace_caller) -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +#else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ ENTRY(ftrace_regs_caller) - SAVE_ALL - - addi a0, ra, -FENTRY_RA_OFFSET - la a1, function_trace_op - REG_L a2, 0(a1) - REG_L a1, PT_SIZE_ON_STACK(sp) - mv a3, sp + SAVE_ALL 1 ftrace_regs_call: .global ftrace_regs_call call ftrace_stub -#ifdef CONFIG_FUNCTION_GRAPH_TRACER - addi a0, sp, PT_RA - REG_L a1, PT_EPC(sp) - addi a1, a1, -FENTRY_RA_OFFSET -#ifdef HAVE_FUNCTION_GRAPH_FP_TEST - mv a2, s0 -#endif -ftrace_graph_regs_call: - .global ftrace_graph_regs_call - call ftrace_stub -#endif - RESTORE_ALL + RESTORE_ALL 1 ret ENDPROC(ftrace_regs_caller) + +ENTRY(ftrace_caller) + SAVE_ALL 0 + +ftrace_call: + .global ftrace_call + call ftrace_stub + + RESTORE_ALL 0 + ret +ENDPROC(ftrace_caller) #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */