From: Yonghong Song <yhs@fb.com>
To: Andrii Nakryiko <andriin@fb.com>, <bpf@vger.kernel.org>,
Martin KaFai Lau <kafai@fb.com>, <netdev@vger.kernel.org>
Cc: Alexei Starovoitov <ast@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>
Subject: [RFC PATCH bpf-next 03/16] bpf: provide a way for targets to register themselves
Date: Wed, 8 Apr 2020 16:25:23 -0700 [thread overview]
Message-ID: <20200408232523.2675550-1-yhs@fb.com> (raw)
In-Reply-To: <20200408232520.2675265-1-yhs@fb.com>
Here, the target refers to a particular data structure
inside the kernel we want to dump. For example, it
can be all task_structs in the current pid namespace,
or it could be all open files for all task_structs
in the current pid namespace.
Each target is identified with the following information:
target_rel_path <=== relative path to /sys/kernel/bpfdump
target_proto <=== kernel func proto which represents
bpf program signature for this target
seq_ops <=== seq_ops for seq_file operations
seq_priv_size <=== seq_file private data size
target_feature <=== target specific feature which needs
handling outside seq_ops.
The target relative path is a relative directory to /sys/kernel/bpfdump/.
For example, it could be:
task <=== all tasks
task/file <=== all open files under all tasks
ipv6_route <=== all ipv6_routes
tcp6/sk_local_storage <=== all tcp6 socket local storages
foo/bar/tar <=== all tar's in bar in foo
The "target_feature" is mostly used for reusing existing seq_ops.
For example, for /proc/net/<> stats, the "net" namespace is often
stored in file private data. The target_feature enables bpf based
dumper to set "net" properly for itself before calling shared
seq_ops.
bpf_dump_reg_target() is implemented so targets
can register themselves. Currently, module is not
supported, so there is no bpf_dump_unreg_target().
The main reason is that BTF is not available for modules
yet.
Since target might call bpf_dump_reg_target() before
bpfdump mount point is created, __bpfdump_init()
may be called in bpf_dump_reg_target() as well.
The file-based dumpers will be regular files under
the specific target directory. For example,
task/my1 <=== dumper "my1" iterates through all tasks
task/file/my2 <=== dumper "my2" iterates through all open files
under all tasks
Signed-off-by: Yonghong Song <yhs@fb.com>
---
include/linux/bpf.h | 4 +
kernel/bpf/dump.c | 190 +++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 193 insertions(+), 1 deletion(-)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index fd2b2322412d..53914bec7590 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1109,6 +1109,10 @@ struct bpf_link *bpf_link_get_from_fd(u32 ufd);
int bpf_obj_pin_user(u32 ufd, const char __user *pathname);
int bpf_obj_get_user(const char __user *pathname, int flags);
+int bpf_dump_reg_target(const char *target, const char *target_proto,
+ const struct seq_operations *seq_ops,
+ u32 seq_priv_size, u32 target_feature);
+
int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value);
int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value);
int bpf_percpu_hash_update(struct bpf_map *map, void *key, void *value,
diff --git a/kernel/bpf/dump.c b/kernel/bpf/dump.c
index e0c33486e0e7..45528846557f 100644
--- a/kernel/bpf/dump.c
+++ b/kernel/bpf/dump.c
@@ -12,6 +12,173 @@
#include <linux/filter.h>
#include <linux/bpf.h>
+struct bpfdump_target_info {
+ struct list_head list;
+ const char *target;
+ const char *target_proto;
+ struct dentry *dir_dentry;
+ const struct seq_operations *seq_ops;
+ u32 seq_priv_size;
+ u32 target_feature;
+};
+
+struct bpfdump_targets {
+ struct list_head dumpers;
+ struct mutex dumper_mutex;
+};
+
+/* registered dump targets */
+static struct bpfdump_targets dump_targets;
+
+static struct dentry *bpfdump_dentry;
+
+static struct dentry *bpfdump_add_dir(const char *name, struct dentry *parent,
+ const struct inode_operations *i_ops,
+ void *data);
+static int __bpfdump_init(void);
+
+static int dumper_unlink(struct inode *dir, struct dentry *dentry)
+{
+ kfree(d_inode(dentry)->i_private);
+ return simple_unlink(dir, dentry);
+}
+
+static const struct inode_operations bpf_dir_iops = {
+ .lookup = simple_lookup,
+ .unlink = dumper_unlink,
+};
+
+int bpf_dump_reg_target(const char *target,
+ const char *target_proto,
+ const struct seq_operations *seq_ops,
+ u32 seq_priv_size, u32 target_feature)
+{
+ struct bpfdump_target_info *tinfo, *ptinfo;
+ struct dentry *dentry, *parent;
+ const char *lastslash;
+ bool existed = false;
+ int err, parent_len;
+
+ if (!bpfdump_dentry) {
+ err = __bpfdump_init();
+ if (err)
+ return err;
+ }
+
+ tinfo = kmalloc(sizeof(*tinfo), GFP_KERNEL);
+ if (!tinfo)
+ return -ENOMEM;
+
+ tinfo->target = target;
+ tinfo->target_proto = target_proto;
+ tinfo->seq_ops = seq_ops;
+ tinfo->seq_priv_size = seq_priv_size;
+ tinfo->target_feature = target_feature;
+ INIT_LIST_HEAD(&tinfo->list);
+
+ lastslash = strrchr(target, '/');
+ if (!lastslash) {
+ parent = bpfdump_dentry;
+ } else {
+ parent_len = (unsigned long)lastslash - (unsigned long)target;
+
+ mutex_lock(&dump_targets.dumper_mutex);
+ list_for_each_entry(ptinfo, &dump_targets.dumpers, list) {
+ if (strlen(ptinfo->target) == parent_len &&
+ strncmp(ptinfo->target, target, parent_len) == 0) {
+ existed = true;
+ break;
+ }
+ }
+ mutex_unlock(&dump_targets.dumper_mutex);
+ if (existed == false) {
+ err = -ENOENT;
+ goto free_tinfo;
+ }
+
+ parent = ptinfo->dir_dentry;
+ target = lastslash + 1;
+ }
+ dentry = bpfdump_add_dir(target, parent, &bpf_dir_iops, tinfo);
+ if (IS_ERR(dentry)) {
+ err = PTR_ERR(dentry);
+ goto free_tinfo;
+ }
+
+ tinfo->dir_dentry = dentry;
+
+ mutex_lock(&dump_targets.dumper_mutex);
+ list_add(&tinfo->list, &dump_targets.dumpers);
+ mutex_unlock(&dump_targets.dumper_mutex);
+ return 0;
+
+free_tinfo:
+ kfree(tinfo);
+ return err;
+}
+
+static struct dentry *
+bpfdump_create_dentry(const char *name, umode_t mode, struct dentry *parent,
+ void *data, const struct inode_operations *i_ops,
+ const struct file_operations *f_ops)
+{
+ struct inode *dir, *inode;
+ struct dentry *dentry;
+ int err;
+
+ dir = d_inode(parent);
+
+ inode_lock(dir);
+ dentry = lookup_one_len(name, parent, strlen(name));
+ if (IS_ERR(dentry))
+ goto unlock;
+
+ if (d_really_is_positive(dentry)) {
+ err = -EEXIST;
+ goto dentry_put;
+ }
+
+ inode = new_inode(dir->i_sb);
+ if (!inode) {
+ err = -ENOMEM;
+ goto dentry_put;
+ }
+
+ inode->i_ino = get_next_ino();
+ inode->i_mode = mode;
+ inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+ inode->i_private = data;
+
+ if (S_ISDIR(mode)) {
+ inode->i_op = i_ops;
+ inode->i_fop = f_ops;
+ inc_nlink(inode);
+ inc_nlink(dir);
+ } else {
+ inode->i_fop = f_ops;
+ }
+
+ d_instantiate(dentry, inode);
+ dget(dentry);
+ inode_unlock(dir);
+ return dentry;
+
+dentry_put:
+ dput(dentry);
+ dentry = ERR_PTR(err);
+unlock:
+ inode_unlock(dir);
+ return dentry;
+}
+
+static struct dentry *
+bpfdump_add_dir(const char *name, struct dentry *parent,
+ const struct inode_operations *i_ops, void *data)
+{
+ return bpfdump_create_dentry(name, S_IFDIR | 0755, parent,
+ data, i_ops, &simple_dir_operations);
+}
+
static void bpfdump_free_inode(struct inode *inode)
{
kfree(inode->i_private);
@@ -58,8 +225,10 @@ static struct file_system_type fs_type = {
.kill_sb = kill_litter_super,
};
-static int __init bpfdump_init(void)
+static int __bpfdump_init(void)
{
+ struct vfsmount *mount;
+ int mount_count;
int ret;
ret = sysfs_create_mount_point(kernel_kobj, "bpfdump");
@@ -70,10 +239,29 @@ static int __init bpfdump_init(void)
if (ret)
goto remove_mount;
+ /* get a reference to mount so we can populate targets
+ * at init time.
+ */
+ ret = simple_pin_fs(&fs_type, &mount, &mount_count);
+ if (ret)
+ goto remove_mount;
+
+ bpfdump_dentry = mount->mnt_root;
+
+ INIT_LIST_HEAD(&dump_targets.dumpers);
+ mutex_init(&dump_targets.dumper_mutex);
return 0;
remove_mount:
sysfs_remove_mount_point(kernel_kobj, "bpfdump");
return ret;
}
+
+static int __init bpfdump_init(void)
+{
+ if (bpfdump_dentry)
+ return 0;
+
+ return __bpfdump_init();
+}
core_initcall(bpfdump_init);
--
2.24.1
next prev parent reply other threads:[~2020-04-08 23:25 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 23:25 [RFC PATCH bpf-next 00/16] bpf: implement bpf based dumping of kernel data structures Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 01/16] net: refactor net assignment for seq_net_private structure Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 02/16] bpf: create /sys/kernel/bpfdump mount file system Yonghong Song
2020-04-08 23:25 ` Yonghong Song [this message]
2020-04-10 22:18 ` [RFC PATCH bpf-next 03/16] bpf: provide a way for targets to register themselves Andrii Nakryiko
2020-04-10 23:24 ` Yonghong Song
2020-04-13 19:31 ` Andrii Nakryiko
2020-04-15 22:57 ` Yonghong Song
2020-04-10 22:25 ` Andrii Nakryiko
2020-04-10 23:25 ` Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 04/16] bpf: allow loading of a dumper program Yonghong Song
2020-04-10 22:36 ` Andrii Nakryiko
2020-04-10 23:28 ` Yonghong Song
2020-04-13 19:33 ` Andrii Nakryiko
2020-04-08 23:25 ` [RFC PATCH bpf-next 05/16] bpf: create file or anonymous dumpers Yonghong Song
2020-04-10 3:00 ` Alexei Starovoitov
2020-04-10 6:09 ` Yonghong Song
2020-04-10 22:42 ` Yonghong Song
2020-04-10 22:53 ` Andrii Nakryiko
2020-04-10 23:47 ` Yonghong Song
2020-04-11 23:11 ` Alexei Starovoitov
2020-04-12 6:51 ` Yonghong Song
2020-04-13 20:48 ` Andrii Nakryiko
2020-04-10 22:51 ` Andrii Nakryiko
2020-04-10 23:41 ` Yonghong Song
2020-04-13 19:45 ` Andrii Nakryiko
2020-04-10 23:25 ` Andrii Nakryiko
2020-04-11 0:23 ` Yonghong Song
2020-04-11 23:17 ` Alexei Starovoitov
2020-04-13 21:04 ` Andrii Nakryiko
2020-04-13 19:59 ` Andrii Nakryiko
2020-04-14 5:56 ` Andrii Nakryiko
2020-04-14 23:59 ` Yonghong Song
2020-04-15 4:45 ` Andrii Nakryiko
2020-04-15 16:46 ` Alexei Starovoitov
2020-04-16 1:48 ` Andrii Nakryiko
2020-04-16 7:15 ` Yonghong Song
2020-04-16 17:04 ` Alexei Starovoitov
2020-04-16 19:35 ` Andrii Nakryiko
2020-04-16 23:18 ` Alexei Starovoitov
2020-04-17 5:11 ` Andrii Nakryiko
2020-04-19 6:11 ` Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 06/16] bpf: add netlink and ipv6_route targets Yonghong Song
2020-04-10 23:13 ` Andrii Nakryiko
2020-04-10 23:52 ` Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 07/16] bpf: add bpf_map target Yonghong Song
2020-04-13 22:18 ` Andrii Nakryiko
2020-04-13 22:47 ` Andrii Nakryiko
2020-04-08 23:25 ` [RFC PATCH bpf-next 08/16] bpf: add task and task/file targets Yonghong Song
2020-04-10 3:22 ` Alexei Starovoitov
2020-04-10 6:19 ` Yonghong Song
2020-04-10 21:31 ` Alexei Starovoitov
2020-04-10 21:33 ` Alexei Starovoitov
2020-04-13 23:00 ` Andrii Nakryiko
2020-04-08 23:25 ` [RFC PATCH bpf-next 09/16] bpf: add bpf_seq_printf and bpf_seq_write helpers Yonghong Song
2020-04-10 3:26 ` Alexei Starovoitov
2020-04-10 6:12 ` Yonghong Song
2020-04-14 5:28 ` Andrii Nakryiko
2020-04-08 23:25 ` [RFC PATCH bpf-next 10/16] bpf: support variable length array in tracing programs Yonghong Song
2020-04-14 0:13 ` Andrii Nakryiko
2020-04-08 23:25 ` [RFC PATCH bpf-next 11/16] bpf: implement query for target_proto and file dumper prog_id Yonghong Song
2020-04-10 3:10 ` Alexei Starovoitov
2020-04-10 6:11 ` Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 12/16] tools/libbpf: libbpf support for bpfdump Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 13/16] tools/bpftool: add bpf dumper support Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 14/16] tools/bpf: selftests: add dumper programs for ipv6_route and netlink Yonghong Song
2020-04-14 5:39 ` Andrii Nakryiko
2020-04-08 23:25 ` [RFC PATCH bpf-next 15/16] tools/bpf: selftests: add dumper progs for bpf_map/task/task_file Yonghong Song
2020-04-10 3:33 ` Alexei Starovoitov
2020-04-10 6:41 ` Yonghong Song
2020-04-08 23:25 ` [RFC PATCH bpf-next 16/16] tools/bpf: selftests: add a selftest for anonymous dumper Yonghong Song
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=20200408232523.2675550-1-yhs@fb.com \
--to=yhs@fb.com \
--cc=andriin@fb.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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