| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220112192547.3054575-8-haoluo@google.com>
Date: Wed, 12 Jan 2022 11:25:46 -0800
From: Hao Luo <haoluo@...gle.com>
To: Alexei Starovoitov <ast@...nel.org>,
Andrii Nakryiko <andrii@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>
Cc: Martin KaFai Lau <kafai@...com>, Song Liu <songliubraving@...com>,
Yonghong Song <yhs@...com>, KP Singh <kpsingh@...nel.org>,
Shakeel Butt <shakeelb@...gle.com>, Joe@...gle.com,
Burton@...gle.com, jevburton.kernel@...il.com,
Tejun Heo <tj@...nel.org>, bpf@...r.kernel.org,
linux-kernel@...r.kernel.org, Hao Luo <haoluo@...gle.com>
Subject: [PATCH RESEND RFC bpf-next v1 7/8] bpf: Add seq_show operation for
bpf in cgroupfs
Previous patches allow exposing bpf objects to kernfs file system.
They allow creating file entries in kernfs, which can reference bpf
objects. The referred bpf objects can be used to customize the new
entry's file operations.
In particular, this patch introduces one concrete use case of this
feature. It implements the .seq_show file operation for the cgroup
file system. The seq_show handler takes the bpf object and use it to
format its output seq file. The bpf object needs to be a link to the
newly introduced "bpf_view" program type.
Signed-off-by: Hao Luo <haoluo@...gle.com>
---
kernel/bpf/bpf_view.c | 11 ++++++++
kernel/bpf/bpf_view.h | 1 +
kernel/bpf/inode.c | 4 +--
kernel/bpf/inode.h | 3 +++
kernel/bpf/kernfs_node.c | 58 +++++++++++++++++++++++++++++++++++++++-
5 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/kernel/bpf/bpf_view.c b/kernel/bpf/bpf_view.c
index 967a9240bab4..8f035c5a9b6a 100644
--- a/kernel/bpf/bpf_view.c
+++ b/kernel/bpf/bpf_view.c
@@ -166,6 +166,17 @@ static struct bpf_view_target_info cgroup_view_tinfo = {
.btf_id = 0,
};
+bool bpf_link_is_cgroup_view(struct bpf_link *link)
+{
+ struct bpf_view_link *view_link;
+
+ if (!bpf_link_is_view(link))
+ return false;
+
+ view_link = container_of(link, struct bpf_view_link, link);
+ return view_link->tinfo == &cgroup_view_tinfo;
+}
+
static int __init bpf_view_init(void)
{
int cgroup_view_idx[BPF_VIEW_CTX_ARG_MAX] = {
diff --git a/kernel/bpf/bpf_view.h b/kernel/bpf/bpf_view.h
index 1a1110a5727f..a02564e529cb 100644
--- a/kernel/bpf/bpf_view.h
+++ b/kernel/bpf/bpf_view.h
@@ -17,6 +17,7 @@ struct bpf_view_cgroup_ctx {
};
bool bpf_link_is_view(struct bpf_link *link);
+bool bpf_link_is_cgroup_view(struct bpf_link *link);
/* Run a bpf_view program */
int run_view_prog(struct bpf_prog *prog, void *ctx);
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index 7e93e477b57c..1ae4a7b8c732 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -115,8 +115,6 @@ struct fsnotify_ops bpf_notify_ops = {
.free_mark = notify_free_mark,
};
-static int bpf_inode_type(const struct inode *inode, enum bpf_type *type);
-
/* Watch the destruction of an inode and calls the callbacks in the given
* notify_ops.
*/
@@ -211,7 +209,7 @@ static struct inode *bpf_get_inode(struct super_block *sb,
return inode;
}
-static int bpf_inode_type(const struct inode *inode, enum bpf_type *type)
+int bpf_inode_type(const struct inode *inode, enum bpf_type *type)
{
*type = BPF_TYPE_UNSPEC;
if (inode->i_op == &bpf_prog_iops)
diff --git a/kernel/bpf/inode.h b/kernel/bpf/inode.h
index c12d385a3e2a..dea78341549b 100644
--- a/kernel/bpf/inode.h
+++ b/kernel/bpf/inode.h
@@ -17,6 +17,9 @@ struct notify_ops {
void (*free_inode)(void *object, enum bpf_type type, void *priv);
};
+/* Get the type of bpf object from bpffs inode. */
+int bpf_inode_type(const struct inode *inode, enum bpf_type *type);
+
#ifdef CONFIG_FSNOTIFY
/* Watch the destruction of an inode and calls the callbacks in the given
* notify_ops.
diff --git a/kernel/bpf/kernfs_node.c b/kernel/bpf/kernfs_node.c
index 3d331d8357db..7b58bfc1951e 100644
--- a/kernel/bpf/kernfs_node.c
+++ b/kernel/bpf/kernfs_node.c
@@ -3,15 +3,33 @@
* Expose eBPF objects in kernfs file system.
*/
+#include <linux/bpf.h>
#include <linux/fs.h>
#include <linux/kernfs.h>
+#include <linux/btf_ids.h>
+#include <linux/magic.h>
+#include <linux/seq_file.h>
#include "inode.h"
+#include "bpf_view.h"
/* file_operations for kernfs file system */
/* Command for removing a kernfs entry */
#define REMOVE_CMD "rm"
+static const struct kernfs_ops bpf_generic_ops;
+static const struct kernfs_ops bpf_cgroup_ops;
+
+/* Choose the right kernfs_ops for different kernfs. */
+static const struct kernfs_ops *bpf_kernfs_ops(struct super_block *sb)
+{
+ if (sb->s_magic == CGROUP_SUPER_MAGIC ||
+ sb->s_magic == CGROUP2_SUPER_MAGIC)
+ return &bpf_cgroup_ops;
+
+ return &bpf_generic_ops;
+}
+
/* Handler when the watched inode is freed. */
static void kn_watch_free_inode(void *obj, enum bpf_type type, void *kn)
{
@@ -80,7 +98,7 @@ int bpf_obj_do_pin_kernfs(struct dentry *dentry, umode_t mode, void *obj,
if (!inode)
return -ENXIO;
- ops = &bpf_generic_ops;
+ ops = bpf_kernfs_ops(sb);
kn = __kernfs_create_file(parent_kn, dentry->d_iname, mode,
GLOBAL_ROOT_UID, GLOBAL_ROOT_GID,
0, ops, inode, NULL, NULL);
@@ -107,3 +125,41 @@ int bpf_obj_do_pin_kernfs(struct dentry *dentry, umode_t mode, void *obj,
iput(inode);
return 0;
}
+
+/* file_operations for cgroup file system */
+static int bpf_cgroup_seq_show(struct seq_file *seq, void *v)
+{
+ struct bpf_view_cgroup_ctx ctx;
+ struct kernfs_open_file *of;
+ struct kernfs_node *kn;
+ struct cgroup *cgroup;
+ struct inode *inode;
+ struct bpf_link *link;
+ enum bpf_type type;
+
+ of = seq->private;
+ kn = of->kn;
+ cgroup = kn->parent->priv;
+
+ inode = kn->priv;
+ if (bpf_inode_type(inode, &type))
+ return -ENXIO;
+
+ if (type != BPF_TYPE_LINK)
+ return -EACCES;
+
+ link = inode->i_private;
+ if (!bpf_link_is_cgroup_view(link))
+ return -EACCES;
+
+ ctx.seq = seq;
+ ctx.cgroup = cgroup;
+
+ return run_view_prog(link->prog, &ctx);
+}
+
+static const struct kernfs_ops bpf_cgroup_ops = {
+ .seq_show = bpf_cgroup_seq_show,
+ .write = bpf_generic_write,
+ .read = bpf_generic_read,
+};
--
2.34.1.448.ga2b2bfdf31-goog
Powered by blists - more mailing lists