From: Yafang Shao <laoar.shao@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com,
andrii@kernel.org, martin.lau@linux.dev, song@kernel.org,
yhs@fb.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, quentin@isovalent.com,
rostedt@goodmis.org, mhiramat@kernel.org
Cc: bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH v7 bpf-next 06/10] bpf: Expose symbol's respective address
Date: Sun, 9 Jul 2023 02:56:26 +0000 [thread overview]
Message-ID: <20230709025630.3735-7-laoar.shao@gmail.com> (raw)
In-Reply-To: <20230709025630.3735-1-laoar.shao@gmail.com>
Since different symbols can share the same name, it is insufficient to only
expose the symbol name. It is essential to also expose the symbol address
so that users can accurately identify which one is being probed.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/trace/trace_kprobe.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 249eb14d0f7a..bf2872ca5aaf 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1544,18 +1544,10 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
*fd_type = trace_kprobe_is_return(tk) ? BPF_FD_TYPE_KRETPROBE
: BPF_FD_TYPE_KPROBE;
- if (tk->symbol) {
- *symbol = tk->symbol;
- *probe_offset = tk->rp.kp.offset;
- *probe_addr = 0;
- } else {
- *symbol = NULL;
- *probe_offset = 0;
- if (kallsyms_show_value(current_cred()))
- *probe_addr = (unsigned long)tk->rp.kp.addr;
- else
- *probe_addr = 0;
- }
+ *probe_offset = tk->rp.kp.offset;
+ *probe_addr = kallsyms_show_value(current_cred()) ?
+ (unsigned long)tk->rp.kp.addr : 0;
+ *symbol = tk->symbol;
return 0;
}
#endif /* CONFIG_PERF_EVENTS */
--
2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2023-07-09 2:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-09 2:56 [PATCH v7 bpf-next 00/11] bpf: Support ->fill_link_info for kprobe_multi and perf_event links Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 01/10] bpf: Support ->fill_link_info for kprobe_multi Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 02/10] bpftool: Dump the kernel symbol's module name Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 03/10] bpftool: Show kprobe_multi link info Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 04/10] bpf: Protect probed address based on kptr_restrict setting Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 05/10] bpf: Clear the probe_addr for uprobe Yafang Shao
2023-07-09 2:56 ` Yafang Shao [this message]
2023-07-09 2:56 ` [PATCH v7 bpf-next 07/10] bpf: Add a common helper bpf_copy_to_user() Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 08/10] bpf: Support ->fill_link_info for perf_event Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 09/10] bpftool: Add perf event names Yafang Shao
2023-08-29 9:20 ` Quentin Monnet
2023-08-29 14:35 ` Yafang Shao
2023-07-09 2:56 ` [PATCH v7 bpf-next 10/10] bpftool: Show perf link info Yafang Shao
2023-07-12 3:20 ` [PATCH v7 bpf-next 00/11] bpf: Support ->fill_link_info for kprobe_multi and perf_event links patchwork-bot+netdevbpf
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=20230709025630.3735-7-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mhiramat@kernel.org \
--cc=quentin@isovalent.com \
--cc=rostedt@goodmis.org \
--cc=sdf@google.com \
--cc=song@kernel.org \
--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).