From: Yafang Shao <laoar.shao@gmail.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, quentin@isovalent.com,
bpf@vger.kernel.org
Subject: Re: [PATCH v2 bpf-next 01/11] bpf: Support ->fill_link_info for kprobe_multi
Date: Fri, 9 Jun 2023 17:13:56 +0800 [thread overview]
Message-ID: <CALOAHbAfiJ7BWzxBWD3vD9vaAkUa8o_95r8x-A_o5jjAyBFpqA@mail.gmail.com> (raw)
In-Reply-To: <CAEf4BzY8Vi4Y6kf7hOmhWQkKOV=R7tBzb4dgCuicni3bBFWb9A@mail.gmail.com>
On Fri, Jun 9, 2023 at 7:05 AM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Thu, Jun 8, 2023 at 3:35 AM Yafang Shao <laoar.shao@gmail.com> wrote:
> >
> > With the addition of support for fill_link_info to the kprobe_multi link,
> > users will gain the ability to inspect it conveniently using the
> > `bpftool link show` command. This enhancement provides valuable information
> > to the user, including the count of probed functions and their respective
> > addresses. It's important to note that if the kptr_restrict setting is set
> > to 2, the probed addresses will not be exposed, ensuring security.
> >
> > Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
> > ---
> > include/uapi/linux/bpf.h | 5 +++++
> > kernel/trace/bpf_trace.c | 30 ++++++++++++++++++++++++++++++
> > tools/include/uapi/linux/bpf.h | 5 +++++
> > 3 files changed, 40 insertions(+)
> >
> > diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> > index a7b5e91..d99cc16 100644
> > --- a/include/uapi/linux/bpf.h
> > +++ b/include/uapi/linux/bpf.h
> > @@ -6438,6 +6438,11 @@ struct bpf_link_info {
> > __s32 priority;
> > __u32 flags;
> > } netfilter;
> > + struct {
> > + __aligned_u64 addrs; /* in/out: addresses buffer ptr */
> > + __u32 count;
> > + __u8 retprobe;
>
> from kernel API side it's probably better to just expose flags?
Agreed. The flags will be extensible.
> retprobe is determined by BPF_F_KPROBE_MULTI_RETURN flag
Should we print 'flags' in `bpftool link show` directly? As we print
it in `bpftool map show`.
>
> > + } kprobe_multi;
> > };
> > } __attribute__((aligned(8)));
> >
> > diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> > index 2bc41e6..738efcf 100644
> > --- a/kernel/trace/bpf_trace.c
> > +++ b/kernel/trace/bpf_trace.c
> > @@ -2548,9 +2548,39 @@ static void bpf_kprobe_multi_link_dealloc(struct bpf_link *link)
> > kfree(kmulti_link);
> > }
> >
> > +static int bpf_kprobe_multi_link_fill_link_info(const struct bpf_link *link,
> > + struct bpf_link_info *info)
> > +{
> > + u64 __user *uaddrs = u64_to_user_ptr(info->kprobe_multi.addrs);
> > + struct bpf_kprobe_multi_link *kmulti_link;
> > + u32 ucount = info->kprobe_multi.count;
> > +
> > + if (!uaddrs ^ !ucount)
> > + return -EINVAL;
> > +
> > + kmulti_link = container_of(link, struct bpf_kprobe_multi_link, link);
> > + if (!uaddrs) {
> > + info->kprobe_multi.count = kmulti_link->cnt;
> > + return 0;
> > + }
> > +
> > + if (!ucount)
> > + return 0;
> > + if (ucount != kmulti_link->cnt)
> > + return -EINVAL;
>
> should this just check that kmulti_link->cnt is <= ucount?...
Agreed.
>
> > + info->kprobe_multi.retprobe = kmulti_link->fp.exit_handler ?
> > + true : false;
> > + if (kptr_restrict == 2)
> > + return 0;
>
> use kallsyms_show_value() instead of hard-coding this?
Good point. Will use it.
--
Regards
Yafang
next prev parent reply other threads:[~2023-06-09 9:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-08 10:35 [PATCH v2 bpf-next 00/11] bpf: Support ->fill_link_info for kprobe_multi and perf_event links Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 01/11] bpf: Support ->fill_link_info for kprobe_multi Yafang Shao
2023-06-08 23:05 ` Andrii Nakryiko
2023-06-09 9:13 ` Yafang Shao [this message]
2023-06-09 18:25 ` Andrii Nakryiko
2023-06-10 2:19 ` Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 02/11] bpftool: Add address filtering in kernel_syms_load() Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 03/11] bpftool: Show probed function in kprobe_multi link info Yafang Shao
2023-06-08 23:08 ` Andrii Nakryiko
2023-06-09 9:15 ` Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 04/11] bpf: Protect probed address based on kptr_restrict setting Yafang Shao
2023-06-08 23:08 ` Andrii Nakryiko
2023-06-09 9:16 ` Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 05/11] bpf: Clear the probe_addr for uprobe Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 06/11] bpf: Expose symbol addresses for precise identification Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 07/11] bpf: Add a common helper bpf_copy_to_user() Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 08/11] bpf: Support ->fill_link_info for perf_event Yafang Shao
2023-06-08 23:12 ` Andrii Nakryiko
2023-06-09 9:53 ` Yafang Shao
2023-06-09 9:56 ` Yafang Shao
2023-06-09 18:26 ` Andrii Nakryiko
2023-06-10 2:21 ` Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 09/11] libbpf: Add perf event names Yafang Shao
2023-06-08 23:14 ` Andrii Nakryiko
2023-06-09 4:36 ` Song Liu
2023-06-10 2:22 ` Yafang Shao
2023-06-10 20:34 ` Quentin Monnet
2023-06-11 15:52 ` Yafang Shao
2023-06-10 22:37 ` Jiri Olsa
2023-06-10 22:43 ` Jiri Olsa
2023-06-11 15:55 ` Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 10/11] bpftool: Move get_prog_info() into do_show_link() Yafang Shao
2023-06-08 10:35 ` [PATCH v2 bpf-next 11/11] bpftool: Show probed function in perf_event link info Yafang Shao
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=CALOAHbAfiJ7BWzxBWD3vD9vaAkUa8o_95r8x-A_o5jjAyBFpqA@mail.gmail.com \
--to=laoar.shao@gmail.com \
--cc=andrii.nakryiko@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=martin.lau@linux.dev \
--cc=quentin@isovalent.com \
--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).