From patchwork Thu Jan 12 09:06:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 42321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3780109wrt; Thu, 12 Jan 2023 01:16:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXs9Fz5K0W2lF/Kq1g1vaNs3fzlTFXqlZFTtPhSKwiJAYp0ay+NbnRjkP5BzLFRCrOZxjXMp X-Received: by 2002:a17:906:7f99:b0:84d:2f2a:b158 with SMTP id f25-20020a1709067f9900b0084d2f2ab158mr17321908ejr.11.1673514992784; Thu, 12 Jan 2023 01:16:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673514992; cv=none; d=google.com; s=arc-20160816; b=SzSDcwkZzFrhj3y5rS9oKtL9vB6rGRWH3fKD5Ntb2PedxXIR/MMsxk4pc8g/lyCfwG YBt1Qqda8xQ9iuYXDSUWdOOstWDbZv8MNJ03cjCHSrBRItSU9GArsNZYXT7zeTX1kIT9 Ql+ussWLCbqAMIZ7TVj9TfqJzz8pF2UjBFrb4mOEHPOXdo6EeWqrOoSLw99Rkodcro3C mvoFcbWLoXfcqNxW4hIuzs4v8OrVe9xf26cxQEcgPh/ARltVElM6/qC/WgKV75Or9LGX UbDWDOEnjS9i7qeEP/D6SIMEwxq2+r4K8/bYSvD3hgS9YiYl3yc3D5XYD2gKPBENffs8 UlRw== 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=wYo3dUkBRV760UAnY5rZePQ6y+Dt43Va21Pp7ZaNT3M=; b=nSamo1fQltGpfU5DeDLTN9cxOePDbS3CWDEgJD+MO0aNVgVETKu/LVzsOPQ7VKWVBb wDdt9MD32m9AMfhEFnpGdsDBu12bo0E0XhQhtKUbuvxLffndpGO1pqlHLXRLd6Tdh1iV 4ws9wOgG2knwVzlF2JgDrASjg8X/Zb4t8NnGr7qlQGM19vuXhRwMrEnzeLLrZzwwwPR5 mho/BrKEau+74EK4T4BAoo6Nj6rpRy9a2ML7UnykQppN/acPI8MSzabbT0shfQWXr1l8 eRjDezxphlCDhGtuGGWYBLO1Bef2eF9BoIYojOXt21lswCnvs/pp6pke1S6kY19hztdE WXfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sN4SbBQ5; 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 q13-20020a170906770d00b0084b9ac8f893si12868642ejm.976.2023.01.12.01.16.07; Thu, 12 Jan 2023 01:16:32 -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=sN4SbBQ5; 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 S239952AbjALJNM (ORCPT + 99 others); Thu, 12 Jan 2023 04:13:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239941AbjALJKj (ORCPT ); Thu, 12 Jan 2023 04:10:39 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2919646E for ; Thu, 12 Jan 2023 01:06:44 -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 ams.source.kernel.org (Postfix) with ESMTPS id 71E5EB81DD7 for ; Thu, 12 Jan 2023 09:06:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41AD8C433D2; Thu, 12 Jan 2023 09:06:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673514402; bh=F3SoPmVMpycW3imwV8BgrYH8S8tFphk+pY/h8iic1Zw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sN4SbBQ5DgURYMUcRuLP/z+dMehCTmueuiS57hMRK6KkiEX07d7Khax+XM/e+ukAD g0CqsEh/MVPVIodYo12Jh7r0d3mnZXAlLMwWWwbsBN8pVvsuI3pxzzElg7696t0bY4 wtyUgfh5jCBRdkJpPCp9kecRfB0us4KigukjXOvckoimLdW018dCVrOKISk32dgOMt bjJ9PHcP/alGehshlWxvcCNFVKirIyxXLuCaJgSRtKaU95l/cMrRBjw7DAB0L4+Eq8 I2nmI03xGWBMKLtGuF0m6JW+ZqhTnq1Nd5XOhaTdbDuDxoSrdZjG585CNbPhkIGnLw 4qxL/orqM0h0g== 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 V7 5/7] riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support Date: Thu, 12 Jan 2023 04:06:01 -0500 Message-Id: <20230112090603.1295340-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230112090603.1295340-1-guoren@kernel.org> References: <20230112090603.1295340-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?1754807657053151392?= X-GMAIL-MSGID: =?utf-8?q?1754807657053151392?= From: Song Shuai This patch adds DYNAMIC_FTRACE_WITH_DIRECT_CALLS support for RISC-V. select the DYNAMIC_FTRACE_WITH_DIRECT_CALLS to provide the register_ftrace_direct[_multi] interfaces allowing users to register the customed trampoline (direct_caller) as the mcount for one or more target functions. And modify_ftrace_direct[_multi] are also provided for modifying direct_caller. To make the direct_caller and the other ftrace hooks (eg. function/fgraph tracer, k[ret]probes) co-exist, a temporary register is nominated to store the address of direct_caller in ftrace_regs_caller. After the setting of the address direct_caller by direct_ops->func and the RESTORE_REGS in ftrace_regs_caller, direct_caller will be jumped to by the `jr` inst. Signed-off-by: Song Shuai Tested-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ftrace.h | 8 ++++++++ arch/riscv/kernel/mcount-dyn.S | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index ee0d39b26794..307a9f413edd 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -135,6 +135,7 @@ config RISCV select UACCESS_MEMCPY if !MMU select ZONE_DMA32 if 64BIT select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8) + select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL select HAVE_FUNCTION_GRAPH_TRACER diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h index 84f856a3286e..84904c1e4369 100644 --- a/arch/riscv/include/asm/ftrace.h +++ b/arch/riscv/include/asm/ftrace.h @@ -114,6 +114,14 @@ 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 + +static inline void +__arch_ftrace_set_direct_caller(struct pt_regs *regs, unsigned long addr) +{ + regs->t1 = addr; +} +#define arch_ftrace_set_direct_caller(fregs, addr) \ + __arch_ftrace_set_direct_caller(&(fregs)->regs, addr) #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S index f26e9f6e2fed..7801c1c8bb5a 100644 --- a/arch/riscv/kernel/mcount-dyn.S +++ b/arch/riscv/kernel/mcount-dyn.S @@ -231,6 +231,7 @@ ENDPROC(ftrace_caller) #else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ ENTRY(ftrace_regs_caller) + move t1, zero SAVE_ABI_REGS 1 PREPARE_ARGS @@ -239,7 +240,10 @@ ftrace_regs_call: call ftrace_stub RESTORE_ABI_REGS 1 + bnez t1,.Ldirect jr t0 +.Ldirect: + jr t1 ENDPROC(ftrace_regs_caller) ENTRY(ftrace_caller)