Message ID | 169139090386.324433.6412259486776991296.stgit@devnote2 |
---|---|
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1270928vqr; Mon, 7 Aug 2023 00:04:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6hQH4VK/VglyWULs2JEBPtBUeOewfZfhh8emwLYjvV2RN/UbGY+eckpgvZ6dZSv14AXbN X-Received: by 2002:a17:90a:a66:b0:267:eda5:f7b5 with SMTP id o93-20020a17090a0a6600b00267eda5f7b5mr8591380pjo.47.1691391897795; Mon, 07 Aug 2023 00:04:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691391897; cv=none; d=google.com; s=arc-20160816; b=YPWMk5t9WTpdv8Iv3ufOlMrJ3NJUsW/+YbOsEHweItaicO/68QBOsasr/bxQZ3B3EX BQt/EkSG2m6SeypulaoFyWz3uqR7oqu87Ld7YZzj70EbPcgxH3v3TRYHFxbt1yecdhbn +lTD5QTaF+S1ek6fG4MYNVUzdRh1mPnGlAvAm8hxxZPRsRMSjhEhyAX2+ZPf6DaWgQ24 n5YXCE3wfvciFBNe5L9b4DwLc3bOzwK5cBsDbeJ7/D9BqTJ4uALlCbRl+qy2HFyIYRwf B6Szk7XS0SDnjGugLxqs6MmGwRm2aDZM2JQTIEf7FurA8/Yr/e19JgLQ9j+injLCkEv4 dwew== 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=mcb68GKsktRm2o30SyyT27sqc3J7ICH161dZljYdwCo=; fh=nNLeqPmm07c4DrdDej5z+HdJpmx5SqFFnpeka2nrMVM=; b=tlZhKDPqRk2If2yGl1/FDD0VoO+s5sKALXSpaFGpKqSHs2qTJY5H57gTiDnJpYB6u6 44ItexOjrTnVWJa8/lirteXatvc4dkP3oBZ1uTYrftSy8Eys9rb9dedP7gEb5rP98xXN OdX37rfxW31g0K9nAp5NErwYN15FJM59pAZ+KpcdZgAIByBRFD6qVli0UuYKBrPWjkoB 3HCcdDCzsXxS50KUCK82SCzERAgErLuVM6aHIgEkGFk3zqcRikvSMXcDQiE4B6uXgdL8 WuZHycrUsgUHR7EGw21UoEHe9+21u4zoLR8a/4YlCxyOI951sSRm5ex8+h42JgjTA+4x k5Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ESMIgjjL; 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 kk17-20020a17090b4a1100b002692eb69014si3856399pjb.20.2023.08.07.00.04.45; Mon, 07 Aug 2023 00:04:57 -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=ESMIgjjL; 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 S230041AbjHGGsf (ORCPT <rfc822;aaronkmseo@gmail.com> + 99 others); Mon, 7 Aug 2023 02:48:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjHGGsc (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 7 Aug 2023 02:48:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 571571B5; Sun, 6 Aug 2023 23:48:31 -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 E7893614DD; Mon, 7 Aug 2023 06:48:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0513C433C7; Mon, 7 Aug 2023 06:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691390910; bh=dbLyRNDw66rtMco9Z3macc8TBfHCjdg7YPc5a5Rum2s=; h=From:To:Cc:Subject:Date:From; b=ESMIgjjLZ6TVNFPZDm+7nkFhf40Hl1mivSWSwCUSdT5ajD52CJDQYYbPKvKYVONZb p2tJb3bHYV0AEgIaG5AKhm2gIfRUM4o0GPZYLyC11VjWhjCzgZghvZbQxZPRXnUJxl A8IqYz6BHjoQdO7U0R8ICJVFUEvJiSJiCim5fjGqXVR9boCHx2GjOdXxqmgthNpPel NU40+dugZoH9tZs6Ll74Qow1RFULjnX1LhOGO4r2RnFqMnoHUyURwkrRkmDWmTjlFX KS12lgGVH39v4Vfn5kvTVJswUByK3Jt3jK8cqkP/pIA5eDqxb4ATN39/nr3WHQeMZO dGS2CqPUGz/ag== From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org> To: Alexei Starovoitov <alexei.starovoitov@gmail.com>, Steven Rostedt <rostedt@goodmis.org>, Florent Revest <revest@chromium.org> Cc: linux-trace-kernel@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>, Martin KaFai Lau <martin.lau@linux.dev>, bpf <bpf@vger.kernel.org>, Sven Schnelle <svens@linux.ibm.com>, Alexei Starovoitov <ast@kernel.org>, Jiri Olsa <jolsa@kernel.org>, Arnaldo Carvalho de Melo <acme@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Alan Maguire <alan.maguire@oracle.com>, Mark Rutland <mark.rutland@arm.com>, Peter Zijlstra <peterz@infradead.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [RFC PATCH v2 0/6] bpf: fprobe: rethook: Use ftrace_regs instead of pt_regs Date: Mon, 7 Aug 2023 15:48:24 +0900 Message-Id: <169139090386.324433.6412259486776991296.stgit@devnote2> X-Mailer: git-send-email 2.34.1 User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773552950716759099 X-GMAIL-MSGID: 1773552950716759099 |
Series |
bpf: fprobe: rethook: Use ftrace_regs instead of pt_regs
|
|
Message
Masami Hiramatsu (Google)
Aug. 7, 2023, 6:48 a.m. UTC
Hi, Here is the 2nd version of RFC series to use ftrace_regs instead of pt_regs. But this 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 includes 1 patch to expose ftrace_regs. so - 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_COMPAT_FTRACE_REGS 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(). Florent, feel free to add your rethook for arm64, but please do not remove kretprobe trampoline yet. It is another discussion point. We may be possible to use ftrace_regs for kretprobe by ftrace_partial_regs() but kretprobe allows nest probe. (maybe we can skip that case?) 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) (6): fprobe: Use fprobe_regs in fprobe entry handler tracing: Expose ftrace_regs regardless of CONFIG_FUNCTION_TRACER fprobe: rethook: Use fprobe_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 arch/Kconfig | 1 + arch/arm64/include/asm/ftrace.h | 11 ++++++ arch/loongarch/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/kernel/rethook.c | 9 +++-- include/linux/fprobe.h | 4 +- include/linux/ftrace.h | 56 ++++++++++++++++++----------- include/linux/rethook.h | 11 +++--- kernel/kprobes.c | 9 ++++- kernel/trace/Kconfig | 9 ++++- kernel/trace/bpf_trace.c | 14 +++++-- kernel/trace/fprobe.c | 8 ++-- kernel/trace/rethook.c | 16 ++++---- kernel/trace/trace_fprobe.c | 76 ++++++++++++++++++++++++--------------- kernel/trace/trace_probe_tmpl.h | 2 + lib/test_fprobe.c | 10 +++-- samples/fprobe/fprobe_example.c | 4 +- 18 files changed, 154 insertions(+), 89 deletions(-) -- Masami Hiramatsu (Google) <mhiramat@kernel.org>
Comments
On Mon, Aug 7, 2023 at 8:48 AM Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote: > > Florent, feel free to add your rethook for arm64, but please do not remove > kretprobe trampoline yet. It is another discussion point. We may be possible > to use ftrace_regs for kretprobe by ftrace_partial_regs() but kretprobe > allows nest probe. (maybe we can skip that case?) Ack :) > arch/Kconfig | 1 + > arch/arm64/include/asm/ftrace.h | 11 ++++++ > arch/loongarch/Kconfig | 1 + > arch/s390/Kconfig | 1 + > arch/x86/Kconfig | 1 + > arch/x86/kernel/rethook.c | 9 +++-- > include/linux/fprobe.h | 4 +- > include/linux/ftrace.h | 56 ++++++++++++++++++----------- > include/linux/rethook.h | 11 +++--- > kernel/kprobes.c | 9 ++++- > kernel/trace/Kconfig | 9 ++++- > kernel/trace/bpf_trace.c | 14 +++++-- > kernel/trace/fprobe.c | 8 ++-- > kernel/trace/rethook.c | 16 ++++---- > kernel/trace/trace_fprobe.c | 76 ++++++++++++++++++++++++--------------- > kernel/trace/trace_probe_tmpl.h | 2 + > lib/test_fprobe.c | 10 +++-- > samples/fprobe/fprobe_example.c | 4 +- I believe that Documentation/trace/fprobe.rst should also be modified following the API change
On Tue, 8 Aug 2023 16:29:27 +0200 Florent Revest <revest@chromium.org> wrote: > On Mon, Aug 7, 2023 at 8:48 AM Masami Hiramatsu (Google) > <mhiramat@kernel.org> wrote: > > > > Florent, feel free to add your rethook for arm64, but please do not remove > > kretprobe trampoline yet. It is another discussion point. We may be possible > > to use ftrace_regs for kretprobe by ftrace_partial_regs() but kretprobe > > allows nest probe. (maybe we can skip that case?) > > Ack :) > > > arch/Kconfig | 1 + > > arch/arm64/include/asm/ftrace.h | 11 ++++++ > > arch/loongarch/Kconfig | 1 + > > arch/s390/Kconfig | 1 + > > arch/x86/Kconfig | 1 + > > arch/x86/kernel/rethook.c | 9 +++-- > > include/linux/fprobe.h | 4 +- > > include/linux/ftrace.h | 56 ++++++++++++++++++----------- > > include/linux/rethook.h | 11 +++--- > > kernel/kprobes.c | 9 ++++- > > kernel/trace/Kconfig | 9 ++++- > > kernel/trace/bpf_trace.c | 14 +++++-- > > kernel/trace/fprobe.c | 8 ++-- > > kernel/trace/rethook.c | 16 ++++---- > > kernel/trace/trace_fprobe.c | 76 ++++++++++++++++++++++++--------------- > > kernel/trace/trace_probe_tmpl.h | 2 + > > lib/test_fprobe.c | 10 +++-- > > samples/fprobe/fprobe_example.c | 4 +- > > I believe that Documentation/trace/fprobe.rst should also be modified > following the API change Indeed. Let me update it. Thanks!