From: Yafang Shao <laoar.shao@gmail.com>
To: 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
Cc: bpf@vger.kernel.org, Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH bpf-next 1/6] bpf: Support ->fill_link_info for kprobe_multi
Date: Fri, 2 Jun 2023 08:52:34 +0000 [thread overview]
Message-ID: <20230602085239.91138-2-laoar.shao@gmail.com> (raw)
In-Reply-To: <20230602085239.91138-1-laoar.shao@gmail.com>
By adding support for ->fill_link_info to the kprobe_multi link, users will
be able to inspect it using `bpftool link show`. This enhancement will
expose both the count of probed functions and their respective addresses to
the user.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
include/uapi/linux/bpf.h | 4 ++++
kernel/trace/bpf_trace.c | 26 ++++++++++++++++++++++++++
tools/include/uapi/linux/bpf.h | 4 ++++
3 files changed, 34 insertions(+)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index a7b5e91..22c8168 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -6438,6 +6438,10 @@ struct bpf_link_info {
__s32 priority;
__u32 flags;
} netfilter;
+ struct {
+ __u64 addrs;
+ __u32 count;
+ } kprobe_multi;
};
} __attribute__((aligned(8)));
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 2bc41e6..ec53bc9 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -2548,9 +2548,35 @@ 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 *uaddrs = (u64 *)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;
+ if (copy_to_user(uaddrs, kmulti_link->addrs, ucount * sizeof(u64)))
+ return -EFAULT;
+ return 0;
+}
+
static const struct bpf_link_ops bpf_kprobe_multi_link_lops = {
.release = bpf_kprobe_multi_link_release,
.dealloc = bpf_kprobe_multi_link_dealloc,
+ .fill_link_info = bpf_kprobe_multi_link_fill_link_info,
};
static void bpf_kprobe_multi_cookie_swap(void *a, void *b, int size, const void *priv)
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index a7b5e91..22c8168 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -6438,6 +6438,10 @@ struct bpf_link_info {
__s32 priority;
__u32 flags;
} netfilter;
+ struct {
+ __u64 addrs;
+ __u32 count;
+ } kprobe_multi;
};
} __attribute__((aligned(8)));
--
1.8.3.1
next prev parent reply other threads:[~2023-06-02 8:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 8:52 [PATCH bpf-next 0/6] bpf: Support ->fill_link_info for kprobe prog Yafang Shao
2023-06-02 8:52 ` Yafang Shao [this message]
2023-06-02 16:45 ` [PATCH bpf-next 1/6] bpf: Support ->fill_link_info for kprobe_multi Stanislav Fomichev
2023-06-04 3:21 ` Yafang Shao
2023-06-03 6:38 ` kernel test robot
2023-06-04 3:22 ` Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 2/6] bpftool: Show probed function in kprobe_multi link info Yafang Shao
2023-06-02 20:36 ` Alexei Starovoitov
2023-06-04 3:24 ` Yafang Shao
2023-06-02 22:16 ` Andrii Nakryiko
2023-06-04 3:26 ` Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 3/6] bpf: Always expose the probed address Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 4/6] bpf: Add a common helper bpf_copy_to_user() Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 5/6] bpf: Support ->fill_link_info for perf_event Yafang Shao
2023-06-02 22:19 ` Andrii Nakryiko
2023-06-04 3:28 ` Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 6/6] bpftool: Show probed function in perf_event link info Yafang Shao
2023-06-02 20:38 ` Alexei Starovoitov
2023-06-04 3:23 ` 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=20230602085239.91138-2-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=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).