From: Masami Hiramatsu <mhiramat@kernel.org>
To: Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
mhiramat@kernel.org, rostedt@goodmis.org, mingo@redhat.com,
ast@kernel.org, daniel@iogearbox.net, kafai@fb.com,
songliubraving@fb.com, yhs@fb.com, andriin@fb.com,
john.fastabend@gmail.com, kpsingh@chromium.org
Subject: Re: [PATCH] tracing/probe: Fix bpf_task_fd_query() for kprobes and uprobes
Date: Tue, 9 Jun 2020 16:12:34 +0900 [thread overview]
Message-ID: <20200609161234.c0b1460e6a6ce73ba478a22a@kernel.org> (raw)
In-Reply-To: <20200608124531.819838-1-jean-philippe@linaro.org>
On Mon, 8 Jun 2020 14:45:32 +0200
Jean-Philippe Brucker <jean-philippe@linaro.org> wrote:
> Commit 60d53e2c3b75 ("tracing/probe: Split trace_event related data from
> trace_probe") removed the trace_[ku]probe structure from the
> trace_event_call->data pointer. As bpf_get_[ku]probe_info() were
> forgotten in that change, fix them now. These functions are currently
> only used by the bpf_task_fd_query() syscall handler to collect
> information about a perf event.
>
Oops, good catch!
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
> Fixes: 60d53e2c3b75 ("tracing/probe: Split trace_event related data from trace_probe")
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: stable@vger.kernel.org
Thank you!
> ---
> Found while trying to run the task_fd_query BPF sample. I intend to try
> and move that sample to kselftests since it seems like a useful
> regression test.
> ---
> kernel/trace/trace_kprobe.c | 2 +-
> kernel/trace/trace_uprobe.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 35989383ae113..8eeb95e04bf52 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -1629,7 +1629,7 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
> if (perf_type_tracepoint)
> tk = find_trace_kprobe(pevent, group);
> else
> - tk = event->tp_event->data;
> + tk = trace_kprobe_primary_from_call(event->tp_event);
> if (!tk)
> return -EINVAL;
>
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 2a8e8e9c1c754..fdd47f99b18fd 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -1412,7 +1412,7 @@ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
> if (perf_type_tracepoint)
> tu = find_probe_event(pevent, group);
> else
> - tu = event->tp_event->data;
> + tu = trace_uprobe_primary_from_call(event->tp_event);
> if (!tu)
> return -EINVAL;
>
> --
> 2.27.0
>
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2020-06-09 7:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-08 12:45 [PATCH] tracing/probe: Fix bpf_task_fd_query() for kprobes and uprobes Jean-Philippe Brucker
2020-06-08 15:24 ` Yonghong Song
2020-06-09 7:12 ` Masami Hiramatsu [this message]
2020-06-09 18:18 ` Alexei Starovoitov
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=20200609161234.c0b1460e6a6ce73ba478a22a@kernel.org \
--to=mhiramat@kernel.org \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jean-philippe@linaro.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/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;
as well as URLs for NNTP newsgroup(s).