From: Yonghong Song <yhs@fb.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Andrii Nakryiko <andriin@fb.com>, bpf <bpf@vger.kernel.org>,
Martin KaFai Lau <kafai@fb.com>,
Networking <netdev@vger.kernel.org>,
Alexei Starovoitov <ast@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Kernel Team <kernel-team@fb.com>
Subject: Re: [RFC PATCH bpf-next 03/16] bpf: provide a way for targets to register themselves
Date: Fri, 10 Apr 2020 16:24:12 -0700 [thread overview]
Message-ID: <904ce2a9-6318-9360-c1d5-16cb07c9ca5a@fb.com> (raw)
In-Reply-To: <CAEf4Bzb5K6h+Cca63JU35XG+NFoFDCVrC=DhDNVz6KTmoyzpFw@mail.gmail.com>
On 4/10/20 3:18 PM, Andrii Nakryiko wrote:
> On Wed, Apr 8, 2020 at 4:26 PM Yonghong Song <yhs@fb.com> wrote:
>>
>> 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.
>
> It's not clear what "feature" stands for here... Is this just a sort
> of private_data passed through to dumper?
This is described later. It is some kind of target passed to the dumper.
>
>>
>> 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
>
> ^^ this seems useful, but I don't think code as is supports more than 2 levels?
Currently implement should support it.
You need
- first register 'foo'. target name 'foo'.
- then register 'foo/bar'. 'foo' will be the parent of 'bar'. target
name 'foo/bar'.
- then 'foo/bar/tar'. 'foo/bar' will be the parent of 'tar'. target
name 'foo/bar/tar'.
>
>>
>> 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;
>
> nit: would be a bit simpler if these were static variables with static
> initialization, similar to how bpfdump_dentry is separate?
yes, we could do that. not 100% sure whether it will be simpler or not.
the structure is to glue them together.
>
>> +};
>> +
>> +/* 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();
>
> This will be called (again) if bpfdump_init() fails? Not sure why? In
> rare cases, some dumper will fail to initialize, but then some might
> succeed, which is going to be even more confusing, no?
I can have a static variable to say bpfdump_init has been attempted to
avoid such situation to avoid any second try.
>
>> + 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;
>
> Two nits here. First, it supports only one and two levels. But it
> seems like it wouldn't be hard to support multiple? Instead of
> reverse-searching for /, you can forward search and keep track of
> "current parent".
>
> nit2:
>
> parent = bpfdump_dentry;
> if (lastslash) {
>
> parent = ptinfo->dir_dentry;
> }
>
> seems a bit cleaner (and generalizes to multi-level a bit better).
>
>> + } 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;
>> +}
>> +
>
> [...]
>
>> + 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);
>
> lookup_one_len already bumped refcount, why the second time here?
good question. this is what security/inode.c is doing and seems working.
do not really know the science behind this. will check more.
>
>> + inode_unlock(dir);
>> + return dentry;
>> +
>> +dentry_put:
>> + dput(dentry);
>> + dentry = ERR_PTR(err);
>> +unlock:
>> + inode_unlock(dir);
>> + return dentry;
>> +}
>> +
>
> [...]
>
next prev parent reply other threads:[~2020-04-10 23:24 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 ` [RFC PATCH bpf-next 03/16] bpf: provide a way for targets to register themselves Yonghong Song
2020-04-10 22:18 ` Andrii Nakryiko
2020-04-10 23:24 ` Yonghong Song [this message]
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=904ce2a9-6318-9360-c1d5-16cb07c9ca5a@fb.com \
--to=yhs@fb.com \
--cc=andrii.nakryiko@gmail.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