From patchwork Sun Nov 20 08:42:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Shuai X-Patchwork-Id: 23395 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1031754wrr; Sun, 20 Nov 2022 00:46:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6bXOKoG1+16D8IBOcfMcsS0+k7k4EMCq++O6PMdgXXvC3zm0isynnJS3HlIjuWR2ZPwFyo X-Received: by 2002:a17:907:8b19:b0:7b5:3288:2cb with SMTP id sz25-20020a1709078b1900b007b5328802cbmr2326984ejc.638.1668933979361; Sun, 20 Nov 2022 00:46:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668933979; cv=none; d=google.com; s=arc-20160816; b=omLyO4KWSfasWOyrgQDQAkUF9euCoXFI0KWXcf3tFlNgFW7uL7z1c37MrVN/Z9zvwX SDXAs/W3p4CBo6yk+7OqkmrZNLIV9SMliODG3vRZojbiHU9cmwfGcNbxN20EFHDEpG0A +g6HZJYGBTlgBmbAnqGG9N+rS7uoB7ATE0NDfdnxBHF9CGeL/uAvswPIjTPK4yIIHNCI QgosH439dtTUtFTgmfUBkkLIkkWFwJ2cB2ccqtPyLlpmY+0IEN7Tv/ZXSnrmv1lnF/uq OliGgX9QWGbKTub3IJTi96s8txPvxqTFGpZ1eeHnxUDZ5vwOQVfEvf/fg5PXLaKJsdCc 8M2g== 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=um7o47dkwC3+Xw39j9lUuqY5O+T3nm01Mm5u8aYpugQ=; b=i4vwMfS+y6YupXYsQ/vUvW56BWbYY8NRfbW80/Pdw5cwOtCh2X02YLPiTIs7L/I3CS oIZrJH8QMsq8g1hhX4BdpPSqtAsFbTriGO7JCyUGsa9bDFtdgqI0tmDQfBhDT+Ng9Qfb cBAp16r7VyZ4A6VWGlA6kDO8PaA30ABU5/AMhyyM8HMYUxgFdcUMCWn/jJRpxYd2WHzE iEQxIK/P+xKccF8Um1XurVMPIPAX1HODVJqwvtkOMJX9q5Fpw4ZoNgBcDSBuPDdrQMw3 zOsrp5B8pNh2b6tFoeLKd0epoQxOE5d2RXg0Kbqr5BFX7KvwLOqbENCs9iA/u4cagyK5 j/Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gZwm9U6m; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e2-20020a056402148200b00463d1e263a9si6562486edv.328.2022.11.20.00.45.54; Sun, 20 Nov 2022 00:46:19 -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=@gmail.com header.s=20210112 header.b=gZwm9U6m; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229657AbiKTImr (ORCPT + 99 others); Sun, 20 Nov 2022 03:42:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbiKTImo (ORCPT ); Sun, 20 Nov 2022 03:42:44 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B759515718 for ; Sun, 20 Nov 2022 00:42:42 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id k15so8777175pfg.2 for ; Sun, 20 Nov 2022 00:42:42 -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=um7o47dkwC3+Xw39j9lUuqY5O+T3nm01Mm5u8aYpugQ=; b=gZwm9U6mK3ALwu0oifabLOjV1RxAZrk0HSjZd6PCNBAM9P4WdR+dXylvSF6qvcEqgT D9kzlilet4yYsiLACIUkygpVjo9huz8Ow12yGFK/jcgPF6O/sDdtCWWNbJVd809fVL6x X+fDh2KVWZgLGP+qc9+Ybvk5H7BachFfwqsxpRz5bod4WIa3eK3EXUjylnwFNo/abn0s Zc+6WTgMbTeJ3+i9BW29KtYeIyUXTA9GKQgyDg1RYHte0dkPKWDimw74nJsbOfnPMTus 67pZXkp5xtq2Zze25eQZm1zoQ7jqdOHope2gWc4Yn69zLpH4HP4BzKBpKRdMwQ5mgeCN /47w== 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=um7o47dkwC3+Xw39j9lUuqY5O+T3nm01Mm5u8aYpugQ=; b=DTAHVwoOsjqQRNdUL4Tn6hGbRMJSkHbHBbMiRn94Pc/cr6dBaxAAti5QowA0ZNXJfP w/DJaoLrLyVl2JIMQOtWfuQ657wzSYIrbcoGMQqemx4/gmDonrbf+FpD2uQbrw3TS7WJ f64LjzX6rqH2KrsTWwlTdRdDsNqz7cwhcq5i5cw0K4LePZiWe4W/mrAUT+rCTPtpOzmC h4FafqCxfRVVDNwiBsXT/nTwaYU9nBBPOTpm/KMRDQp0/9hP9jEsgziuQxDoTDjwQxlS lVDTvl4VNHHdHf4YdAsD26gpCeMFMd/mKU+6cY5YtxGlCKN7JO4qTOleiIiGpbfWjLI7 n+Mw== X-Gm-Message-State: ANoB5pm/H8wegrIRuhddOJmZxXWO39P86WzDRzpNxAMMsq1lP+GI6XQZ tRpzBRo1rU/6f9SyelQIawU= X-Received: by 2002:a05:6a00:1825:b0:56c:f16d:2f29 with SMTP id y37-20020a056a00182500b0056cf16d2f29mr15603764pfa.53.1668933762210; Sun, 20 Nov 2022 00:42:42 -0800 (PST) Received: from localhost.localdomain ([122.192.14.194]) by smtp.gmail.com with ESMTPSA id q40-20020a17090a17ab00b00212735c8898sm8188273pja.30.2022.11.20.00.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 00:42:41 -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 v4 1/2] riscv/ftrace: add ftrace_graph_func Date: Sun, 20 Nov 2022 16:42:29 +0800 Message-Id: <20221120084230.910152-2-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221120084230.910152-1-suagrfillet@gmail.com> References: <20221120084230.910152-1-suagrfillet@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1750004116194614520?= X-GMAIL-MSGID: =?utf-8?q?1750004116194614520?= 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 --- 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 34b0b523865a..01bebb28eabe 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 8c77f236fc71..651ce5808b77 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 */ From patchwork Sun Nov 20 08:42:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Shuai X-Patchwork-Id: 23397 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1032185wrr; Sun, 20 Nov 2022 00:48:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf4AiU48x7PxFr6FvM6X+IjXNSFlgNVadwGLoVhjBXRk3qbTPWqya9N5G+M+K1Z1ADVf7eJZ X-Received: by 2002:a05:6402:28ac:b0:461:9512:ebfd with SMTP id eg44-20020a05640228ac00b004619512ebfdmr12173403edb.103.1668934101162; Sun, 20 Nov 2022 00:48:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668934101; cv=none; d=google.com; s=arc-20160816; b=xVAASuvPlAKCxcP5KE/cfJ3uLX5laVLgA4GFf3vKh9EnlrycxhP5hE15xiwdg9U/PP kUwLfnVLTAlRDvMtAzFYxS2LD2tA1zQ3uHLVIQfyihsMRAtRbL8oGOwTYc6rH/K6fdZW Sk1I1zU7+ObxGENMMksWFXTKVZirXKuZKoo1zFDydB2bqqTx7nqFk64Vao3ZAqJC8TXp YZPurNuILDzAGzXLrIY77WvTc3ECP7q6ONX9LoclHOvYYLcf4sawBSrO1y9Vinr8qcF4 pOIAbpCUBt8R5AFHY+FZxPaQt7LQTCsWC34zNVDrxTOTTD1t9EYyyKPb7NsrcWf0mfDb Vo7Q== 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=i+vTHLv2t8e2dZjqwxHsggGsRbhxbyfOV9rsfRHb70Y=; b=0RVfP+tT8nUSerXUmCz6JNru2+VlVo8AWvn96k5W8ynbz7nB/PFccNJnzQykx9770L 4sbJ6cltF8INV8QXPbbgB5pbsm18qqlhnU9xcPlufHDlKvrUElGEL61QXwPKwhgB3vF3 XbdnfN7oLDzS7xlTVjCMHgc+uJ8G0BXsxr6ElZsqSOw+AtMi9x9SrhUtq/uuKCjMRSbi TZVr32D8Cy1m7XsASjQzS9852bspWXkYmliG+nrpNb4CDjaPMN4HiNe9ojLF8WBP6zPB q2t0HQWtc1xLK6w5v5OZHF5U+l6k5rGhVnjvH03AkD3a/9Ik8Sny54Wbfx1Q9hYC4Qxj lI/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nTZjZgw9; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dn8-20020a17090794c800b0078db6f488c2si7401398ejc.56.2022.11.20.00.47.57; Sun, 20 Nov 2022 00:48:21 -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=@gmail.com header.s=20210112 header.b=nTZjZgw9; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229676AbiKTImw (ORCPT + 99 others); Sun, 20 Nov 2022 03:42:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbiKTImr (ORCPT ); Sun, 20 Nov 2022 03:42:47 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C89EE15FD3 for ; Sun, 20 Nov 2022 00:42:45 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id b185so8753679pfb.9 for ; Sun, 20 Nov 2022 00:42:45 -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=i+vTHLv2t8e2dZjqwxHsggGsRbhxbyfOV9rsfRHb70Y=; b=nTZjZgw9+nloB9RAXQaDlB0LG++6l2z1uj8Tod+65bSvolYhUqtqww0K+IDkwUG18O 3byDH3QFl952d8bDiLmHoNodwtdVOFO3o2kTspdYNyzYd+b8suFIuNN3sA0qQqndS4u0 JhkwUEMAgByCBeHrMrhKim2puHs60L9AeekSokrBp7EKcBZa4NycP0MThDSzkiDz0fEo H6Z4BwnEYXVYXwYsXv0+992NB2E8tggx6DmgBGgupeTUKu8WF1VEsUVEa1PH0qdqOqDk jXdffIrRDqvjmRC6thKIr+vIf2w1ciyQtX9CORI1TvX8WDLdyOb8o/W3nbWDBPQ/PZta u6vQ== 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=i+vTHLv2t8e2dZjqwxHsggGsRbhxbyfOV9rsfRHb70Y=; b=z59UtxBDnsYJx/EQzeXotqMItqYLYLjOjHz7/lgkCa6LDC+5ZtVK/Ukz8xiPzqapuF iJBI0TNsmL8NDhw9G8X8gmegcsdUgWHu+xCZvRPGd7LUGHA4JYVMTXvroHHQCb/HiRbL xIxbOxvzKRtVNwC6cECXsKCGf+O/ynVr+2tnTQOuOijgYb1FIL5E01V8O9jEMIpG3RiA AakB97DLYR8tstbp7UVqPAhtvNUVNdtPKtQpaqTenH3eBQs6DQCkWEKMNH/o1XqQ2fn8 W/xyaDhVtyX+wzq8jpYIM1Jxk5qD6iiK34h0qQbU8rCd5NS0eOE5wMKWP3Kxm2pzwkiC KSpA== X-Gm-Message-State: ANoB5pkRvydy8OInDNsJAWbSJOBBioPRU87lN5kKWy+7T8KK7kaHHT3t +5ReP4s7L/+qJfCJzwqLqR0= X-Received: by 2002:a05:6a00:99b:b0:56d:3de3:c401 with SMTP id u27-20020a056a00099b00b0056d3de3c401mr15510972pfg.6.1668933765241; Sun, 20 Nov 2022 00:42:45 -0800 (PST) Received: from localhost.localdomain ([122.192.14.194]) by smtp.gmail.com with ESMTPSA id q40-20020a17090a17ab00b00212735c8898sm8188273pja.30.2022.11.20.00.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 00:42:44 -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 v4 2/2] riscv/ftrace: make ftrace_caller call ftrace_graph_func Date: Sun, 20 Nov 2022 16:42:30 +0800 Message-Id: <20221120084230.910152-3-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221120084230.910152-1-suagrfillet@gmail.com> References: <20221120084230.910152-1-suagrfillet@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1750004244387575333?= X-GMAIL-MSGID: =?utf-8?q?1750004244387575333?= 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 supersedes SAVE_ALL by SAVE_ABI_REGS which has an extra option to allow saving only the necessary ABI-related regs for ftrace_caller. ftrace_caller and ftrace_regs_caller save their regs with the respective option of SAVE_ABI_REGS, 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. As the previous patch described, the ftrace_caller remains with its ftrace_graph_call if FTRACE_WITH_REGS isn't defined, For convenience, the original argument setup for the tracing function in ftrace_[regs]_caller is separated as PREPARE_ARGS. Signed-off-by: Song Shuai --- arch/riscv/kernel/mcount-dyn.S | 142 ++++++++++++++++++++++++--------- 1 file changed, 104 insertions(+), 38 deletions(-) diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S index 64bc79816f5e..466c6ef217b1 100644 --- a/arch/riscv/kernel/mcount-dyn.S +++ b/arch/riscv/kernel/mcount-dyn.S @@ -57,19 +57,52 @@ .endm #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS - .macro SAVE_ALL + +/** +* SAVE_ABI_REGS - 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. +* +* 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. +* +* 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 +* +++++++++ +**/ + .macro SAVE_ABI_REGS, all=0 addi sp, sp, -PT_SIZE_ON_STACK REG_S t0, PT_EPC(sp) REG_S x1, PT_RA(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) @@ -78,6 +111,18 @@ REG_S x15, PT_A5(sp) REG_S x16, PT_A6(sp) REG_S x17, PT_A7(sp) + + // save the leftover regs + + .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) @@ -92,19 +137,19 @@ REG_S x29, PT_T4(sp) REG_S x30, PT_T5(sp) REG_S x31, PT_T6(sp) + + // save s0 if FP_TEST defined + + .else +#ifdef HAVE_FUNCTION_GRAPH_FP_TEST + REG_S x8, PT_S0(sp) +#endif + .endif .endm - .macro RESTORE_ALL + .macro RESTORE_ABI_REGS, all=0 REG_L t0, PT_EPC(sp) REG_L x1, PT_RA(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) @@ -113,6 +158,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) @@ -128,10 +183,25 @@ 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 .endm + + .macro PREPARE_ARGS + addi a0, t0, -FENTRY_RA_OFFSET // ip + la a1, function_trace_op + REG_L a2, 0(a1) // op + REG_L a1, PT_RA(sp) // parent_ip + mv a3, sp // fregs + .endm + #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ +#ifndef CONFIG_DYNAMIC_FTRACE_WITH_REGS ENTRY(ftrace_caller) SAVE_ABI @@ -160,33 +230,29 @@ ftrace_graph_call: jr t0 ENDPROC(ftrace_caller) -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +#else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ ENTRY(ftrace_regs_caller) - SAVE_ALL - - addi a0, t0, -FENTRY_RA_OFFSET - la a1, function_trace_op - REG_L a2, 0(a1) - REG_L a1, PT_RA(sp) - mv a3, sp + SAVE_ABI_REGS 1 + PREPARE_ARGS ftrace_regs_call: .global ftrace_regs_call call ftrace_stub -#ifdef CONFIG_FUNCTION_GRAPH_TRACER - addi a0, sp, PT_RA - REG_L a1, PT_T0(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_ABI_REGS 1 jr t0 ENDPROC(ftrace_regs_caller) + +ENTRY(ftrace_caller) + SAVE_ABI_REGS 0 + PREPARE_ARGS + +ftrace_call: + .global ftrace_call + call ftrace_stub + + RESTORE_ABI_REGS 0 + jr t0 +ENDPROC(ftrace_caller) #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */