From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Florent Revest <revest@chromium.org>,
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: Re: [PATCH v4 6/9] tracing/fprobe: Enable fprobe events with CONFIG_DYNAMIC_FTRACE_WITH_ARGS
Date: Wed, 30 Aug 2023 16:20:39 +0900 [thread overview]
Message-ID: <20230830162039.95c575460609cebdc34ab0c1@kernel.org> (raw)
In-Reply-To: <169280379741.282662.12221517584561036597.stgit@devnote2>
On Thu, 24 Aug 2023 00:16:37 +0900
"Masami Hiramatsu (Google)" <mhiramat@kernel.org> wrote:
> +#if !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) || \
> + defined(CONFIG_HAVE_PT_REGS_TO_FTRACE_REGS_CAST)
> +
> +static __always_inline
> +struct pt_regs *perf_fprobe_partial_regs(struct ftrace_regs *fregs)
> +{
> + /* See include/linux/ftrace.h, this returns &fregs->regs */
> + return ftrace_partial_regs(fregs, NULL);
> +}
> +
> +#define perf_fprobe_return_regs(regs) do {} while (0)
> +
> +#else /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS && !CONFIG_HAVE_PT_REGS_TO_FTRACE_REGS_CAST */
> +
> +/* Since fprobe handlers can be nested, pt_regs buffer need to be a stack */
> +#define PERF_FPROBE_REGS_MAX 4
> +
> +struct pt_regs_stack {
> + struct pt_regs regs[PERF_FPROBE_REGS_MAX];
> + int idx;
> +};
> +
> +static DEFINE_PER_CPU(struct pt_regs_stack, perf_fprobe_regs);
> +
> +static __always_inline
> +struct pt_regs *perf_fprobe_partial_regs(struct ftrace_regs *fregs)
> +{
> + struct pt_regs_stack *stack = this_cpu_ptr(&perf_fprobe_regs);
> + struct pt_regs *regs;
> +
> + if (stack->idx < PERF_FPROBE_REGS_MAX) {
> + regs = stack->regs[stack->idx++];
> + return ftrace_partial_regs(fregs, regs);
> + }
> + return NULL;
> +}
> +
> +static __always_inline void perf_fprobe_return_regs(struct pt_regs *regs)
> +{
> + struct pt_regs_stack *stack = this_cpu_ptr(&perf_fprobe_regs);
> +
> + if (WARN_ON_ONCE(regs != stack->regs[stack->idx]))
> + return;
> +
> + --stack->idx;
> +}
Ah, I found that the perf_trace_buf_alloc() does the same thing. So
perf_trace_buf_alloc(size, &pt_regs, &rctx);
will give us the pt_regs at that point. Trace event does that so I think
it is OK to do that here.
Thank you,
> +
> +#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS || CONFIG_HAVE_PT_REGS_TO_FTRACE_REGS_CAST */
> +
> static int fentry_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
> - struct pt_regs *regs)
> + struct ftrace_regs *fregs)
> {
> struct trace_event_call *call = trace_probe_event_call(&tf->tp);
> struct fentry_trace_entry_head *entry;
> struct hlist_head *head;
> int size, __size, dsize;
> + struct pt_regs *regs;
> int rctx;
>
> + regs = perf_fprobe_partial_regs(fregs);
> + if (!regs)
> + return -EINVAL;
> +
> head = this_cpu_ptr(call->perf_events);
> if (hlist_empty(head))
> - return 0;
> + goto out;
>
> - dsize = __get_data_size(&tf->tp, regs);
> + dsize = __get_data_size(&tf->tp, fregs);
> __size = sizeof(*entry) + tf->tp.size + dsize;
> size = ALIGN(__size + sizeof(u32), sizeof(u64));
> size -= sizeof(u32);
>
> entry = perf_trace_buf_alloc(size, NULL, &rctx);
Here, we can borrow the pt_regs.
> if (!entry)
> - return 0;
> + goto out;
>
> entry->ip = entry_ip;
> memset(&entry[1], 0, dsize);
> - store_trace_args(&entry[1], &tf->tp, regs, sizeof(*entry), dsize);
> + store_trace_args(&entry[1], &tf->tp, fregs, sizeof(*entry), dsize);
> perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,
> head, NULL);
> +out:
> + perf_fprobe_return_regs(regs);
> return 0;
> }
> NOKPROBE_SYMBOL(fentry_perf_func);
>
> static void
> fexit_perf_func(struct trace_fprobe *tf, unsigned long entry_ip,
> - unsigned long ret_ip, struct pt_regs *regs)
> + unsigned long ret_ip, struct ftrace_regs *fregs)
> {
> struct trace_event_call *call = trace_probe_event_call(&tf->tp);
> struct fexit_trace_entry_head *entry;
> struct hlist_head *head;
> int size, __size, dsize;
> + struct pt_regs *regs;
> int rctx;
>
> + regs = perf_fprobe_partial_regs(fregs);
> + if (!regs)
> + return;
> +
> head = this_cpu_ptr(call->perf_events);
> if (hlist_empty(head))
> - return;
> + goto out;
>
> - dsize = __get_data_size(&tf->tp, regs);
> + dsize = __get_data_size(&tf->tp, fregs);
> __size = sizeof(*entry) + tf->tp.size + dsize;
> size = ALIGN(__size + sizeof(u32), sizeof(u64));
> size -= sizeof(u32);
>
> entry = perf_trace_buf_alloc(size, NULL, &rctx);
Ditto.
Thanks,
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2023-08-30 19:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 15:15 [PATCH v4 0/9] bpf: fprobe: rethook: Use ftrace_regs instead of pt_regs Masami Hiramatsu (Google)
2023-08-23 15:15 ` [PATCH v4 1/9] Documentation: probes: Add a new ret_ip callback parameter Masami Hiramatsu (Google)
2023-08-25 16:11 ` Florent Revest
2023-08-23 15:15 ` [PATCH v4 2/9] fprobe: Use fprobe_regs in fprobe entry handler Masami Hiramatsu (Google)
2023-08-25 16:11 ` Florent Revest
2023-08-23 15:16 ` [PATCH v4 3/9] tracing: Expose ftrace_regs regardless of CONFIG_FUNCTION_TRACER Masami Hiramatsu (Google)
2023-08-23 15:16 ` [PATCH v4 4/9] fprobe: rethook: Use ftrace_regs in fprobe exit handler and rethook Masami Hiramatsu (Google)
2023-08-25 16:12 ` Florent Revest
2023-09-04 13:40 ` Masami Hiramatsu
2023-09-05 7:17 ` Sven Schnelle
2023-09-05 13:36 ` Masami Hiramatsu
2023-09-05 16:30 ` Steven Rostedt
2023-09-06 0:06 ` Masami Hiramatsu
2023-09-06 6:49 ` Sven Schnelle
2023-09-09 14:24 ` Masami Hiramatsu
2023-09-11 7:55 ` Sven Schnelle
2023-09-11 14:15 ` Masami Hiramatsu
2023-08-23 15:16 ` [PATCH v4 5/9] ftrace: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs Masami Hiramatsu (Google)
2023-08-25 21:49 ` Andrii Nakryiko
2023-08-26 1:56 ` Masami Hiramatsu
2023-09-05 19:50 ` Andrii Nakryiko
2023-09-06 0:28 ` Masami Hiramatsu
2023-09-08 22:56 ` Andrii Nakryiko
2023-08-23 15:16 ` [PATCH v4 6/9] tracing/fprobe: Enable fprobe events with CONFIG_DYNAMIC_FTRACE_WITH_ARGS Masami Hiramatsu (Google)
2023-08-25 16:12 ` Florent Revest
2023-08-26 3:38 ` Masami Hiramatsu
2023-08-30 7:20 ` Masami Hiramatsu [this message]
2023-08-23 15:16 ` [PATCH v4 7/9] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Masami Hiramatsu (Google)
2023-08-23 15:16 ` [PATCH v4 8/9] Documentations: probes: Update fprobe document to use ftrace_regs Masami Hiramatsu (Google)
2023-08-23 15:17 ` [PATCH v4 9/9] Documentation: tracing: Add a note about argument and retval access Masami Hiramatsu (Google)
2023-08-25 16:12 ` Florent Revest
2023-08-25 16:11 ` [PATCH v4 0/9] bpf: fprobe: rethook: Use ftrace_regs instead of pt_regs Florent Revest
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230830162039.95c575460609cebdc34ab0c1@kernel.org \
--to=mhiramat@kernel.org \
--cc=acme@kernel.org \
--cc=alan.maguire@oracle.com \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=martin.lau@linux.dev \
--cc=peterz@infradead.org \
--cc=revest@chromium.org \
--cc=rostedt@goodmis.org \
--cc=svens@linux.ibm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®