From patchwork Sat Aug 12 05:36:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13549 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1547350vqi; Fri, 11 Aug 2023 23:17:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5/AGdgpbrdpJINCF/ZfTSr07PzGDZJ/4oJHKqpf7ALI+4u9vTt3FGbXEXuuXRkkB7ZdcE X-Received: by 2002:a17:90a:fe17:b0:268:2f2:cc89 with SMTP id ck23-20020a17090afe1700b0026802f2cc89mr3514795pjb.4.1691821073381; Fri, 11 Aug 2023 23:17:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691821073; cv=none; d=google.com; s=arc-20160816; b=RAKC0i402Mv6MuWTITs8SBiz3ysm5lSB9RcWxgys7r6Yjm4unqai+Ty35SGAbQdkLi Y0OYkc3/732406+I6678y0NGKh1wGT+Ih93dTif9mBeRsjq+nf1q34aMkoqECsfHRyR3 2TDFWvOiNUy+kLkFZR4+J8LJPyHIVFawVL3a4DSg0o0Wncn6PWpyQSoIFO17hmy5bqgf rkRBw/ILQDFXbREXgq0dJaF3RevyXzrtjuZ9uxbClqgvymNKzjT/WOOAp0MiLEI3AMGL L49fLafCMAn5M77Ral14CrDgcaWRUZTMzuDVh7eKAEjnHBTGhBLOEF1Scx1SKs8lxawM DlMA== 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 :user-agent:message-id:date:subject:cc:to:from:dkim-signature; bh=6dwNkEhW91QzvcE1g9dZ0fUHv9IAwlw7V5sBTXI/gVQ=; fh=nNLeqPmm07c4DrdDej5z+HdJpmx5SqFFnpeka2nrMVM=; b=SXoWnHe+GoP0qlddDyoH1l2lZSmUZRuDhvU4it/jKSEjixoi/dOs42FBA3jSe5K+IV h71MR2VlaHKjYx/OYp50E4zw9Hvnj0mEqrDYYS7ttIHmUx7UN+qtWl/OEimcuw+kht5i F/D5iiV8p/zI3WSdNimB90Z1JmcdLja4FfwOJqY8wKFopFtUfvCfUvIfLR3MrehOmjHa 5TXTPo+44yJtH5UuIxDcBtFmerZgUnAa/A6zrfb4ozSBhd3COIKKlerOuEuirl6bwry2 9xivz702jNzwNdy4fOwOAiq87NIeNLBpoHPvN4VjM/lNlxOGUXyNImuzT1hayaNvKwW6 xqLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Zkd6pBoW; 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 fu4-20020a17090ad18400b0026404467b7dsi6591238pjb.110.2023.08.11.23.17.39; Fri, 11 Aug 2023 23:17:53 -0700 (PDT) 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=Zkd6pBoW; 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 S234509AbjHLFgo (ORCPT + 99 others); Sat, 12 Aug 2023 01:36:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229784AbjHLFgn (ORCPT ); Sat, 12 Aug 2023 01:36:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28DD9F5; Fri, 11 Aug 2023 22:36:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B2D006108A; Sat, 12 Aug 2023 05:36:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C4AEC433C8; Sat, 12 Aug 2023 05:36:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691818602; bh=Hjg+oD7Py8e2iRbW+X9hkt0S7jTShCbs6h0nFpkBIkY=; h=From:To:Cc:Subject:Date:From; b=Zkd6pBoWDJS51IzDbWWsVc2PAqFRu8XHd8GLfN0mcM4dz9KPovP8KY/bIKFxux5SB VuhX6Pc9kNx2n+v4UzCCA3KD5aQPej5CTIRWwtu9M7rj4Z5Tajxi1+ri3jUhKdrCnp xEr+GxVJC+xyuWZxlv8DtkQitgMRZ03/c/AFpzhtCBTnR9+On2UkQn1phHMuNObsCv +lVRYCwW5hv0nCWtkA5VEV4w0nJQ318CV2CgZ8Efqg+vFudZbA3jxk7KwA1c0xELys 6mt3y+WcfvwerxeG16B6vKpumS52gb1zxWpCuY33xNgdd+PWnjRrz7cARGy11ZleHJ ZSNZ8OT3Wq4Wg== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner Subject: [PATCH v3 0/8] bpf: fprobe: rethook: Use ftrace_regs instead of pt_regs Date: Sat, 12 Aug 2023 14:36:35 +0900 Message-Id: <169181859570.505132.10136520092011157898.stgit@devnote2> X-Mailer: git-send-email 2.34.1 User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1774002973457103187 X-GMAIL-MSGID: 1774002973457103187 Hi, Here is the 3rd version of RFC series to use ftrace_regs instead of pt_regs. The previous version is here; https://lore.kernel.org/all/169139090386.324433.6412259486776991296.stgit@devnote2/ This also includes the generic part and minimum modifications of arch dependent code. (e.g. not including rethook for arm64.) This series is based on the discussion at https://lore.kernel.org/all/20230801112036.0d4ee60d@gandalf.local.home/ This version added some documentation updates, fix typos, fix some build errors on arm64 and s390, rename config name to HAVE_PT_REGS_TO_FTRACE_REGS_CAST, Use FTRACE_OPS_FL_SAVE_ARGS in fprobe, add ftrace_regs_get_kernel_stack_nth() and add check HAVE_REGS_AND_STACK_ACCESS_API=y for ftrace_regs APIs. - Document fix for the current fprobe callback prototype - Simply replace pt_regs in fprobe_entry_handler with ftrace_regs. - Expose ftrace_regs even if CONFIG_FUNCTION_TRACER=n. - Replace pt_regs in rethook and fprobe_exit_handler with ftrace_regs. This introduce a new HAVE_PT_REGS_TO_FTRACE_REGS_CAST which means ftrace_regs is just a wrapper of pt_regs (except for arm64, other architectures do this) - Update fprobe-events to use ftrace_regs natively. - Introduce ftrace_partial_regs(). (This changes ARM64 which needs a custom implementation) - Update bpf multi-kprobe handler use ftrace_partial_regs(). - Update document to new fprobe callbacks. This series can also be found below branch. https://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux.git/log/?h=topic/fprobe-ftrace-regs Thank you, --- Masami Hiramatsu (Google) (8): Documentation: probes: Add a new ret_ip callback parameter fprobe: Use fprobe_regs in fprobe entry handler tracing: Expose ftrace_regs regardless of CONFIG_FUNCTION_TRACER fprobe: rethook: Use ftrace_regs in fprobe exit handler and rethook tracing/fprobe: Enable fprobe events with CONFIG_DYNAMIC_FTRACE_WITH_ARGS ftrace: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Documentations: probes: Update fprobe document to use ftrace_regs Documentation/trace/fprobe.rst | 18 +++++--- arch/Kconfig | 1 arch/arm64/include/asm/ftrace.h | 11 +++++ arch/loongarch/Kconfig | 1 arch/s390/Kconfig | 1 arch/s390/include/asm/ftrace.h | 4 ++ arch/x86/Kconfig | 1 arch/x86/kernel/rethook.c | 13 +++--- include/linux/fprobe.h | 4 +- include/linux/ftrace.h | 83 +++++++++++++++++++++++++++++---------- include/linux/rethook.h | 11 +++-- kernel/kprobes.c | 10 ++++- kernel/trace/Kconfig | 9 ++++ kernel/trace/bpf_trace.c | 14 ++++--- kernel/trace/fprobe.c | 10 ++--- kernel/trace/rethook.c | 16 ++++---- kernel/trace/trace_fprobe.c | 69 +++++++++++++++++++------------- kernel/trace/trace_probe_tmpl.h | 2 - lib/test_fprobe.c | 10 ++--- samples/fprobe/fprobe_example.c | 4 +- 20 files changed, 191 insertions(+), 101 deletions(-) -- Masami Hiramatsu (Google)