Introduce bpf_cgroup_read_xattr
Subsystems (7)
Song Liu
reviewerv3 cover Introduce bpf_cgroup_read_xattr
Introduce a new kfunc bpf_cgroup_read_xattr, which can read xattr from cgroupfs nodes. The primary users are LSMs, cgroup programs, and sched_ext.
---
Changes v2 => v3:
1. Make bpf_cgroup_read_xattr available to all program types.
2. Fix gcc build warning on the selftests.
3. Add "ifdef CONFIG_CGROUPS" around bpf_cgroup_read_xattr.
v2: https://lore.kernel.org/bpf/[email protected]/
Changes v1 => v2:
1. Replace 1/4 in v1 with Chritian's version (1/5 in v2).
2. Rename bpf_kernfs_read_xattr => bpf_cgroup_read_xattr, and limit access to cgroup only.
3. Add 5/5, which makes bpf_cgroup_read_xattr available to cgroup and struct_ops programs.
v1: https://lore.kernel.org/bpf/[email protected]/
Christian Brauner (1):
kernfs: remove iattr_mutex
Song Liu (3):
bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node
bpf: Mark cgroup_subsys_state->cgroup RCU safe selftests/bpf: Add tests for bpf_cgroup_read_xattr
fs/bpf_fs_kfuncs.c | 34 ++++ fs/kernfs/inode.c | 74 ++++---- kernel/bpf/helpers.c | 3 + kernel/bpf/verifier.c | 5 + .../testing/selftests/bpf/bpf_experimental.h | 3 + .../selftests/bpf/prog_tests/cgroup_xattr.c | 145 ++++++++++++++++ .../selftests/bpf/progs/cgroup_read_xattr.c | 158 ++++++++++++++++++ .../selftests/bpf/progs/read_cgroupfs_xattr.c | 60 +++++++ 8 files changed, 448 insertions(+), 34 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c create mode 100644 tools/testing/selftests/bpf/progs/cgroup_read_xattr.c create mode 100644 tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c
--
2.47.1
Song Liu
reviewerPATCH v3 1/4 kernfs: remove iattr_mutex
From: Christian Brauner <[email protected]>
All allocations of struct kernfs_iattrs are serialized through a global mutex. Simply do a racy allocation and let the first one win. I bet most callers are under inode->i_rwsem anyway and it wouldn't be needed but let's not require that.
--- fs/kernfs/inode.c | 74 +++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 34 deletions(-)
fs/kernfs/inode.c +40 -34
@@ -24,45 +24,46 @@ static const struct inode_operations kernfs_iops = { .listxattr = kernfs_iop_listxattr, }; -static struct kernfs_iattrs *__kernfs_iattrs (struct kernfs_node *kn,int alloc) +static struct kernfs_iattrs *__kernfs_iattrs (struct kernfs_node *kn,bool alloc) { -static DEFINE_MUTEX (iattr_mutex); -struct kernfs_iattrs *ret; + struct kernfs_iattrs *ret __free(kfree) = NULL; +struct kernfs_iattrs *attr; -mutex_lock (&iattr_mutex); + attr =READ_ONCE (kn->iattr); +if (attr || !alloc) +return attr; -if (kn->iattr || !alloc) - goto out_unlock; - - kn->iattr =kmem_cache_zalloc (kernfs_iattrs_cache,GFP_KERNEL ); -if (!kn->iattr) - goto out_unlock; + ret =kmem_cache_zalloc (kernfs_iattrs_cache,GFP_KERNEL ); +if (!ret) +return NULL ;/* assign default attributes */ - kn->iattr->ia_uid =GLOBAL_ROOT_UID ; - kn->iattr->ia_gid =GLOBAL_ROOT_GID ; - -ktime_get_real_ts64 (&kn->iattr->ia_atime); - kn->iattr->ia_mtime = kn->iattr->ia_atime; - kn->iattr->ia_ctime = kn->iattr->ia_atime; - -simple_xattrs_init (&kn->iattr->xattrs); -atomic_set (&kn->iattr->nr_user_xattrs,0 ); -atomic_set (&kn->iattr->user_xattr_size,0 ); -out_unlock: - ret = kn->iattr; -mutex_unlock (&iattr_mutex); -return ret; + ret->ia_uid =GLOBAL_ROOT_UID ; + ret->ia_gid =GLOBAL_ROOT_GID ; + +ktime_get_real_ts64 (&ret->ia_atime); + ret->ia_mtime = ret->ia_atime; + ret->ia_ctime = ret->ia_atime; + +simple_xattrs_init (&ret->xattrs); +atomic_set (&ret->nr_user_xattrs,0 ); +atomic_set (&ret->user_xattr_size,0 ); + +/* If someone raced us, recognize it. */ +if (!try_cmpxchg (&kn->iattr, &attr, ret)) +return READ_ONCE (kn->iattr); + +return no_free_ptr (ret); }static struct kernfs_iattrs *kernfs_iattrs (struct kernfs_node *kn) { -return __kernfs_iattrs (kn,1 ); +return __kernfs_iattrs (kn, true); }static struct kernfs_iattrs *kernfs_iattrs_noalloc (struct kernfs_node *kn) { -return __kernfs_iattrs (kn,0 ); +return __kernfs_iattrs (kn, false); }int __kernfs_setattr (struct kernfs_node *kn,const struct iattr *iattr)
@@ -141,9 +142,9 @@ ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size)struct kernfs_node *kn =kernfs_dentry_node (dentry);struct kernfs_iattrs *attrs; - attrs =kernfs_iattrs (kn); + attrs =kernfs_iattrs_noalloc (kn);if (!attrs) -return -ENOMEM ; +return -ENODATA ;return simple_xattr_list (d_inode (dentry), &attrs->xattrs, buf, size); }
@@ -166,9 +167,10 @@ static inline void set_inode_attr(struct inode *inode,static void kernfs_refresh_inode (struct kernfs_node *kn,struct inode *inode) { -struct kernfs_iattrs *attrs = kn->iattr; +struct kernfs_iattrs *attrs; inode->i_mode = kn->mode; + attrs =kernfs_iattrs_noalloc (kn);if (attrs)/* * kernfs_node has non-default attributes get them from
@@ -306,7 +308,9 @@ int kernfs_xattr_set(struct kernfs_node *kn, const char *name, const void *value, size_t size, int flags) { struct simple_xattr *old_xattr; -struct kernfs_iattrs *attrs =kernfs_iattrs (kn); +struct kernfs_iattrs *attrs; + + attrs =kernfs_iattrs (kn);if (!attrs)return -ENOMEM ;
@@ -345,8 +349,9 @@ static int kernfs_vfs_user_xattr_add(struct kernfs_node *kn,struct simple_xattrs *xattrs, const void *value, size_t size, int flags) { - atomic_t *sz = &kn->iattr->user_xattr_size; -atomic_t *nr = &kn->iattr->nr_user_xattrs; + struct kernfs_iattrs *attr = kernfs_iattrs_noalloc(kn); +atomic_t *sz = &attr->user_xattr_size; +atomic_t *nr = &attr->nr_user_xattrs;struct simple_xattr *old_xattr;int ret;
@@ -384,8 +389,9 @@ static int kernfs_vfs_user_xattr_rm(struct kernfs_node *kn,struct simple_xattrs *xattrs, const void *value, size_t size, int flags) { - atomic_t *sz = &kn->iattr->user_xattr_size; -atomic_t *nr = &kn->iattr->nr_user_xattrs; + struct kernfs_iattrs *attr = kernfs_iattrs(kn); +atomic_t *sz = &attr->user_xattr_size; +atomic_t *nr = &attr->nr_user_xattrs;struct simple_xattr *old_xattr; old_xattr =simple_xattr_set (xattrs, full_name, value, size, flags);
Signature · 1 line
2.47.1
Re: [PATCH v3 bpf-next 1/4] kernfs: remove iattr_mutex
Hi,
Quoted 11 lines · Song Liu
From: Christian Brauner <[email protected]>
All allocations of struct
kernfs_iattrsare serialized through a global mutex. Simply do a racy allocation and let the first one win. I bet most callers are underinode->i_rwsemanyway and it wouldn't be needed but let's not require that.Signed-off-by Christian Brauner <[email protected]>Acked-by Tejun Heo <[email protected]>Signed-off-by Song Liu <[email protected]>
On next-20250701, ls -lA gives errors on /sys:
$ ls -lA /sys/ ls: /sys/: No data available ls: /sys/kernel: No data available ls: /sys/power: No data available ls: /sys/class: No data available ls: /sys/devices: No data available ls: /sys/dev: No data available ls: /sys/hypervisor: No data available ls: /sys/fs: No data available ls: /sys/bus: No data available ls: /sys/firmware: No data available ls: /sys/block: No data available ls: /sys/module: No data available total 0 drwxr-xr-x 2 root root 0 Jan 1 1970 block drwxr-xr-x 52 root root 0 Jan 1 1970 bus drwxr-xr-x 88 root root 0 Jan 1 1970 class drwxr-xr-x 4 root root 0 Jan 1 1970 dev drwxr-xr-x 11 root root 0 Jan 1 1970 devices drwxr-xr-x 3 root root 0 Jan 1 1970 firmware drwxr-xr-x 10 root root 0 Jan 1 1970 fs drwxr-xr-x 2 root root 0 Jul 2 09:43 hypervisor drwxr-xr-x 14 root root 0 Jan 1 1970 kernel drwxr-xr-x 251 root root 0 Jan 1 1970 module drwxr-xr-x 3 root root 0 Jul 2 09:43 power
and my bisect is pointing to this commit. Simply reverting it also fixes the errors.
Do you have any suggestions?
Cheers,
Andre'
Christian Brauner
maintainerRe: [PATCH v3 bpf-next 1/4] kernfs: remove iattr_mutex
Quoted 44 lines · André Draszik
Hi,
Quoted 11 lines · Song Liu
From: Christian Brauner <[email protected]>
All allocations of struct
kernfs_iattrsare serialized through a global mutex. Simply do a racy allocation and let the first one win. I bet most callers are underinode->i_rwsemanyway and it wouldn't be needed but let's not require that.Signed-off-by Christian Brauner <[email protected]>Acked-by Tejun Heo <[email protected]>Signed-off-by Song Liu <[email protected]>On next-20250701, ls -lA gives errors on /sys:
$ ls -lA /sys/ ls: /sys/: No data available ls: /sys/kernel: No data available ls: /sys/power: No data available ls: /sys/class: No data available ls: /sys/devices: No data available ls: /sys/dev: No data available ls: /sys/hypervisor: No data available ls: /sys/fs: No data available ls: /sys/bus: No data available ls: /sys/firmware: No data available ls: /sys/block: No data available ls: /sys/module: No data available total 0 drwxr-xr-x 2 root root 0 Jan 1 1970 block drwxr-xr-x 52 root root 0 Jan 1 1970 bus drwxr-xr-x 88 root root 0 Jan 1 1970 class drwxr-xr-x 4 root root 0 Jan 1 1970 dev drwxr-xr-x 11 root root 0 Jan 1 1970 devices drwxr-xr-x 3 root root 0 Jan 1 1970 firmware drwxr-xr-x 10 root root 0 Jan 1 1970 fs drwxr-xr-x 2 root root 0 Jul 2 09:43 hypervisor drwxr-xr-x 14 root root 0 Jan 1 1970 kernel drwxr-xr-x 251 root root 0 Jan 1 1970 module drwxr-xr-x 3 root root 0 Jul 2 09:43 power
Quoted 5 lines
and my bisect is pointing to this commit. Simply reverting it also fixes the errors.
Do you have any suggestions?
Yes, apparently the xattr selftest don't cover sysfs/kernfs. The issue is that the commit changed listxattr() to skip allocation of the xattr header and instead just returned ENODATA. We should just allocate like before tested just now:
user1@localhost:~$ sudo ls -al /sys/kernel/ total 0 drwxr-xr-x 17 root root 0 Jul 2 13:41 . dr-xr-xr-x 12 root root 0 Jul 2 13:41 .. -r--r--r-- 1 root root 4096 Jul 2 13:41 address_bits drwxr-xr-x 3 root root 0 Jul 2 13:41 boot_params drwxr-xr-x 2 root root 0 Jul 2 13:41 btf drwxr-xr-x 2 root root 0 Jul 2 13:41 cgroup drwxr-xr-x 2 root root 0 Jul 2 13:41 config -r--r--r-- 1 root root 4096 Jul 2 13:41 cpu_byteorder -r--r--r-- 1 root root 4096 Jul 2 13:41 crash_elfcorehdr_size drwx------ 34 root root 0 Jul 2 13:41 debug -r--r--r-- 1 root root 4096 Jul 2 13:41 fscaps -r--r--r-- 1 root root 4096 Jul 2 13:41 hardlockup_count drwxr-xr-x 2 root root 0 Jul 2 13:41 iommu_groups drwxr-xr-x 344 root root 0 Jul 2 13:41 irq -r--r--r-- 1 root root 4096 Jul 2 13:41 kexec_crash_loaded -rw-r--r-- 1 root root 4096 Jul 2 13:41 kexec_crash_size -r--r--r-- 1 root root 4096 Jul 2 13:41 kexec_loaded drwxr-xr-x 9 root root 0 Jul 2 13:41 mm -r--r--r-- 1 root root 84 Jul 2 13:41 notes -r--r--r-- 1 root root 4096 Jul 2 13:41 oops_count -rw-r--r-- 1 root root 4096 Jul 2 13:41 profiling -rw-r--r-- 1 root root 4096 Jul 2 13:41 rcu_expedited -rw-r--r-- 1 root root 4096 Jul 2 13:41 rcu_normal -r--r--r-- 1 root root 4096 Jul 2 13:41 rcu_stall_count drwxr-xr-x 2 root root 0 Jul 2 13:41 reboot drwxr-xr-x 2 root root 0 Jul 2 13:41 sched_ext drwxr-xr-x 4 root root 0 Jul 2 13:41 security drwxr-xr-x 190 root root 0 Jul 2 13:41 slab -r--r--r-- 1 root root 4096 Jul 2 13:41 softlockup_count drwxr-xr-x 2 root root 0 Jul 2 13:41 software_nodes drwxr-xr-x 4 root root 0 Jul 2 13:41 sunrpc drwxr-xr-x 6 root root 0 Jul 2 13:41 tracing -r--r--r-- 1 root root 4096 Jul 2 13:41 uevent_seqnum -r--r--r-- 1 root root 4096 Jul 2 13:41 vmcoreinfo -r--r--r-- 1 root root 4096 Jul 2 13:41 warn_count
I'm folding:
fs/kernfs/inode.c +2 -2
@@ -142,9 +142,9 @@ ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size)struct kernfs_node *kn =kernfs_dentry_node (dentry);struct kernfs_iattrs *attrs; - attrs =kernfs_iattrs_noalloc (kn); + attrs =kernfs_iattrs (kn);if (!attrs) -return -ENODATA ; +return -ENOMEM ;return simple_xattr_list (d_inode (dentry), &attrs->xattrs, buf, size); }
which brings it back to the old behavior.
I'm also adding a selftest for this behavior. Patch appended.
From c20804314ae1ca5678e6b135b0ab1bc54fb3e410 Mon Sep 17 00:00:00 2001
From: Christian Brauner <[email protected]>
Date: Wed, 2 Jul 2025 13:53:21 +0200
Subject: [PATCH] selftests/kernfs: test xattr retrieval
Make sure that listxattr() returns zero and that getxattr() returns ENODATA when no extended attributs are set. Use /sys/kernel/warn_count as that always exists and is a read-only file.
--- .../testing/selftests/filesystems/.gitignore | 1 + tools/testing/selftests/filesystems/Makefile | 2 +- .../selftests/filesystems/kernfs_test.c | 38 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/filesystems/kernfs_test.c
tools/testing/selftests/filesystems/.gitignore +1 -0
@@ -3,3 +3,4 @@ dnotify_test devpts_pts file_stressor anon_inode_test +kernfs_test
tools/testing/selftests/filesystems/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += $(KHDR_INCLUDES) -TEST_GEN_PROGS := devpts_pts file_stressor anon_inode_test +TEST_GEN_PROGS := devpts_pts file_stressor anon_inode_test kernfs_test TEST_GEN_PROGS_EXTENDED := dnotify_test include ../lib.mk
tools/testing/selftests/filesystems/kernfs_test.c new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#define __SANE_USERSPACE_TYPES__ + +#include <fcntl.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/xattr.h> + +#include "../kselftest_harness.h" +#include "wrappers.h" + +TEST (kernfs_listxattr) +{ +int fd; + +/* Read-only file that can never have any extended attributes set. */ + fd =open ("/sys/kernel/warn_count" ,O_RDONLY |O_CLOEXEC ); +ASSERT_GE (fd,0 ); +ASSERT_EQ (flistxattr (fd,NULL ,0 ),0 ); +EXPECT_EQ (close (fd),0 ); +} + +TEST (kernfs_getxattr) +{ +int fd; +char buf[1 ]; + +/* Read-only file that can never have any extended attributes set. */ + fd =open ("/sys/kernel/warn_count" ,O_RDONLY |O_CLOEXEC ); +ASSERT_GE (fd,0 ); +ASSERT_LT (fgetxattr (fd,"user.foo" , buf,sizeof (buf)),0 ); +ASSERT_EQ (errno,ENODATA ); +EXPECT_EQ (close (fd),0 ); +} + +TEST_HARNESS_MAIN +
Signature · 1 line
2.47.2
Re: [PATCH v3 bpf-next 1/4] kernfs: remove iattr_mutex
Quoted 19 lines · Christian Brauner
I'm folding:
fs/kernfs/inode.c +2
-2@@ -142,9 +142,9 @@ ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size) struct kernfs_node *kn = kernfs_dentry_node(dentry); struct kernfs_iattrs *attrs; - attrs = kernfs_iattrs_noalloc(kn); + attrs = kernfs_iattrs(kn); if (!attrs) - return -ENODATA; + return -ENOMEM; return simple_xattr_list(d_inode(dentry), &attrs->xattrs, buf, size); }
Quoted 1 line
which brings it back to the old behavior.
Yes, that makes sense and works for me too.
Thanks Christian!
Re: [PATCH v3 bpf-next 1/4] kernfs: remove iattr_mutex
In reply to Christian BraunerQuoted 113 lines · Christian Brauner
Quoted 44 lines · André Draszik
Hi,
Quoted 11 lines · Song Liu
From: Christian Brauner <[email protected]>
All allocations of struct
kernfs_iattrsare serialized through a global mutex. Simply do a racy allocation and let the first one win. I bet most callers are underinode->i_rwsemanyway and it wouldn't be needed but let's not require that.Signed-off-by Christian Brauner <[email protected]>Acked-by Tejun Heo <[email protected]>Signed-off-by Song Liu <[email protected]>On next-20250701, ls -lA gives errors on /sys:
$ ls -lA /sys/ ls: /sys/: No data available ls: /sys/kernel: No data available ls: /sys/power: No data available ls: /sys/class: No data available ls: /sys/devices: No data available ls: /sys/dev: No data available ls: /sys/hypervisor: No data available ls: /sys/fs: No data available ls: /sys/bus: No data available ls: /sys/firmware: No data available ls: /sys/block: No data available ls: /sys/module: No data available total 0 drwxr-xr-x 2 root root 0 Jan 1 1970 block drwxr-xr-x 52 root root 0 Jan 1 1970 bus drwxr-xr-x 88 root root 0 Jan 1 1970 class drwxr-xr-x 4 root root 0 Jan 1 1970 dev drwxr-xr-x 11 root root 0 Jan 1 1970 devices drwxr-xr-x 3 root root 0 Jan 1 1970 firmware drwxr-xr-x 10 root root 0 Jan 1 1970 fs drwxr-xr-x 2 root root 0 Jul 2 09:43 hypervisor drwxr-xr-x 14 root root 0 Jan 1 1970 kernel drwxr-xr-x 251 root root 0 Jan 1 1970 module drwxr-xr-x 3 root root 0 Jul 2 09:43 powerQuoted 5 lines
and my bisect is pointing to this commit. Simply reverting it also fixes the errors.
Do you have any suggestions?
Yes, apparently the xattr selftest don't cover sysfs/kernfs. The issue is that the commit changed
listxattr()to skip allocation of the xattr header and instead just returned ENODATA. We should just allocate like before tested just now:user1@localhost:~$ sudo ls -al /sys/kernel/ total 0 drwxr-xr-x 17 root root 0 Jul 2 13:41 . dr-xr-xr-x 12 root root 0 Jul 2 13:41 .. -r--r--r-- 1 root root 4096 Jul 2 13:41 address_bits drwxr-xr-x 3 root root 0 Jul 2 13:41 boot_params drwxr-xr-x 2 root root 0 Jul 2 13:41 btf drwxr-xr-x 2 root root 0 Jul 2 13:41 cgroup drwxr-xr-x 2 root root 0 Jul 2 13:41 config(quoted diff) +0
-2-r--r--r-- 1 root root 4096 Jul 2 13:41 cpu_byteorder -r--r--r-- 1 root root 4096 Jul 2 13:41 crash_elfcorehdr_sizedrwx------ 34 root root 0 Jul 2 13:41 debug
(quoted diff) +0
-2-r--r--r-- 1 root root 4096 Jul 2 13:41 fscaps -r--r--r-- 1 root root 4096 Jul 2 13:41 hardlockup_countdrwxr-xr-x 2 root root 0 Jul 2 13:41 iommu_groups drwxr-xr-x 344 root root 0 Jul 2 13:41 irq(quoted diff) +0
-3-r--r--r-- 1 root root 4096 Jul 2 13:41 kexec_crash_loaded -rw-r--r-- 1 root root 4096 Jul 2 13:41 kexec_crash_size -r--r--r-- 1 root root 4096 Jul 2 13:41 kexec_loadeddrwxr-xr-x 9 root root 0 Jul 2 13:41 mm
(quoted diff) +0
-6-r--r--r-- 1 root root 84 Jul 2 13:41 notes -r--r--r-- 1 root root 4096 Jul 2 13:41 oops_count -rw-r--r-- 1 root root 4096 Jul 2 13:41 profiling -rw-r--r-- 1 root root 4096 Jul 2 13:41 rcu_expedited -rw-r--r-- 1 root root 4096 Jul 2 13:41 rcu_normal -r--r--r-- 1 root root 4096 Jul 2 13:41 rcu_stall_countdrwxr-xr-x 2 root root 0 Jul 2 13:41 reboot drwxr-xr-x 2 root root 0 Jul 2 13:41 sched_ext drwxr-xr-x 4 root root 0 Jul 2 13:41 security drwxr-xr-x 190 root root 0 Jul 2 13:41 slab -r--r--r-- 1 root root 4096 Jul 2 13:41 softlockup_count drwxr-xr-x 2 root root 0 Jul 2 13:41 software_nodes drwxr-xr-x 4 root root 0 Jul 2 13:41 sunrpc drwxr-xr-x 6 root root 0 Jul 2 13:41 tracing(quoted diff) +0
-3-r--r--r-- 1 root root 4096 Jul 2 13:41 uevent_seqnum -r--r--r-- 1 root root 4096 Jul 2 13:41 vmcoreinfo -r--r--r-- 1 root root 4096 Jul 2 13:41 warn_countI'm folding:
fs/kernfs/inode.c +2
-2@@ -142,9 +142,9 @@ ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size)struct kernfs_node *kn =kernfs_dentry_node (dentry);struct kernfs_iattrs *attrs; - attrs =kernfs_iattrs_noalloc (kn); + attrs =kernfs_iattrs (kn);if (!attrs) -return -ENODATA ; +return -ENOMEM ;return simple_xattr_list (d_inode (dentry), &attrs->xattrs, buf, size); }
Quoted 2 lines
which brings it back to the old behavior.
...but it looks like v3 was merged as-is in the end, without this fixup. Is there some separate patch in the pipeline, or was this forgotten?
Quoted 1 line
I'm also adding a selftest for this behavior. Patch appended.
Jan
Signature · 2 lines
Siemens AG, Foundational Technologies Linux Expert Center
Christian Brauner
maintainerRe: [PATCH v3 bpf-next 1/4] kernfs: remove iattr_mutex
Quoted 2 lines
...but it looks like v3 was merged as-is in the end, without this fixup. Is there some separate patch in the pipeline, or was this forgotten?
This is a result of the trees diverging which we discussed earlier. I sent a fix.
Christian Brauner
maintainerPATCH 1/1 kernfs: don't fail listing extended attributes
Userspace doesn't expect a failure to list extended attributes:
$ ls -lA /sys/ ls: /sys/: No data available ls: /sys/kernel: No data available ls: /sys/power: No data available ls: /sys/class: No data available ls: /sys/devices: No data available ls: /sys/dev: No data available ls: /sys/hypervisor: No data available ls: /sys/fs: No data available ls: /sys/bus: No data available ls: /sys/firmware: No data available ls: /sys/block: No data available ls: /sys/module: No data available total 0 drwxr-xr-x 2 root root 0 Jan 1 1970 block drwxr-xr-x 52 root root 0 Jan 1 1970 bus drwxr-xr-x 88 root root 0 Jan 1 1970 class drwxr-xr-x 4 root root 0 Jan 1 1970 dev drwxr-xr-x 11 root root 0 Jan 1 1970 devices drwxr-xr-x 3 root root 0 Jan 1 1970 firmware drwxr-xr-x 10 root root 0 Jan 1 1970 fs drwxr-xr-x 2 root root 0 Jul 2 09:43 hypervisor drwxr-xr-x 14 root root 0 Jan 1 1970 kernel drwxr-xr-x 251 root root 0 Jan 1 1970 module drwxr-xr-x 3 root root 0 Jul 2 09:43 power
Fix it by simply reporting success when no extended attributes are available instead of reporting ENODATA.
--- fs/kernfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/kernfs/inode.c +2 -2
@@ -142,9 +142,9 @@ ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size)struct kernfs_node *kn =kernfs_dentry_node (dentry);struct kernfs_iattrs *attrs; - attrs =kernfs_iattrs_noalloc (kn); + attrs =kernfs_iattrs (kn);if (!attrs) -return -ENODATA ; +return -ENOMEM ;return simple_xattr_list (d_inode (dentry), &attrs->xattrs, buf, size); }
Signature · 1 line
2.47.2
Song Liu
reviewerPATCH v3 2/4 bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node
In reply to Song LiuBPF programs, such as LSM and sched_ext, would benefit from tags on cgroups. One common practice to apply such tags is to set xattrs on cgroupfs folders.
Introduce kfunc bpf_cgroup_read_xattr, which allows reading cgroup's xattr.
Note that, we already have bpf_get_[file|dentry]_xattr. However, these two APIs are not ideal for reading cgroupfs xattrs, because:
1) These two APIs only works in sleepable contexts;
2) There is no kfunc that matches current cgroup to cgroupfs dentry.
bpf_cgroup_read_xattr is generic and can be useful for many program types. It is also safe, because it requires trusted or rcu protected argument (KF_RCU). Therefore, we make it available to all program types.
--- fs/bpf_fs_kfuncs.c | 34 ++++++++++++++++++++++++++++++++++ kernel/bpf/helpers.c | 3 +++ 2 files changed, 37 insertions(+)
fs/bpf_fs_kfuncs.c +34 -0
@@ -9,6 +9,7 @@#include <linux/fs.h> #include <linux/fsnotify.h> #include <linux/file.h> +#include <linux/kernfs.h> #include <linux/mm.h> #include <linux/xattr.h>
@@ -322,6 +323,39 @@ __bpf_kfunc int bpf_remove_dentry_xattr(struct dentry *dentry, const char *name_return ret; } +#ifdef CONFIG_CGROUPS +/** +* bpf_cgroup_read_xattr - read xattr of a cgroup's node in cgroupfs +* @cgroup: cgroup to get xattr from +* @name__str: name of the xattr +* @value_p: output buffer of the xattr value +* +* Get xattr *name__str* of *cgroup* and store the output in *value_ptr*. +* +* For security reasons, only *name__str* with prefix "user." is allowed. +* +* Return: length of the xattr value on success, a negative value on error. +*/ +__bpf_kfunc int bpf_cgroup_read_xattr(struct cgroup *cgroup, const char *name__str, +struct bpf_dynptr *value_p) +{ +struct bpf_dynptr_kern *value_ptr = (struct bpf_dynptr_kern *)value_p; +u32 value_len; +void *value; + +/* Only allow reading "user.*" xattrs */ +if (strncmp (name__str,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN )) +return -EPERM ; + + value_len =__bpf_dynptr_size (value_ptr); + value =__bpf_dynptr_data_rw (value_ptr, value_len); +if (!value) +return -EINVAL ; + +return kernfs_xattr_get (cgroup->kn, name__str, value, value_len); +} +#endif /* CONFIG_CGROUPS */ +__bpf_kfunc_end_defs ();BTF_KFUNCS_START (bpf_fs_kfunc_set_ids)
kernel/bpf/helpers.c +3 -0
@@ -3397,6 +3397,9 @@ BTF_ID_FLAGS(func, bpf_iter_dmabuf_next, KF_ITER_NEXT | KF_RET_NULL | KF_SLEEPAB BTF_ID_FLAGS(func, bpf_iter_dmabuf_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)#endif BTF_ID_FLAGS(func, __bpf_trap) +#ifdef CONFIG_CGROUPS +BTF_ID_FLAGS(func, bpf_cgroup_read_xattr, KF_RCU) +#endif BTF_KFUNCS_END (common_btf_ids) static const struct btf_kfunc_id_set common_kfunc_set = {
Signature · 1 line
2.47.1
Song Liu
reviewerPATCH v3 3/4 bpf: Mark cgroup_subsys_state->cgroup RCU safe
In reply to Song LiuMark struct cgroup_subsys_state->cgroup as safe under RCU read lock. This will enable accessing css->cgroup from a bpf css iterator.
--- kernel/bpf/verifier.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/bpf/verifier.c +5 -0
@@ -7058,6 +7058,10 @@ BTF_TYPE_SAFE_RCU(struct css_set) {struct cgroup *dfl_cgrp; }; +BTF_TYPE_SAFE_RCU(struct cgroup_subsys_state) { +struct cgroup *cgroup; +}; +/* RCU trusted: these fields are trusted in RCU CS and can be NULL */ BTF_TYPE_SAFE_RCU_OR_NULL(struct mm_struct) {struct file __rcu *exe_file;
@@ -7108,6 +7112,7 @@ static bool type_is_rcu(struct bpf_verifier_env *env,BTF_TYPE_EMIT (BTF_TYPE_SAFE_RCU(struct task_struct ));BTF_TYPE_EMIT (BTF_TYPE_SAFE_RCU(struct cgroup ));BTF_TYPE_EMIT (BTF_TYPE_SAFE_RCU(struct css_set )); +BTF_TYPE_EMIT (BTF_TYPE_SAFE_RCU(struct cgroup_subsys_state ));return btf_nested_type_is_trusted (&env->log, reg, field_name, btf_id,"__safe_rcu" ); }
Signature · 1 line
2.47.1
Song Liu
reviewerPATCH v3 4/4 selftests/bpf: Add tests for bpf_cgroup_read_xattr
In reply to Song LiuAdd tests for different scenarios with bpf_cgroup_read_xattr:
1. Read cgroup xattr from bpf_cgroup_from_id;
2. Read cgroup xattr from bpf_cgroup_ancestor;
3. Read cgroup xattr from css_iter;
4. Use bpf_cgroup_read_xattr in LSM hook security_socket_connect.
5. Use bpf_cgroup_read_xattr in cgroup program.
--- .../testing/selftests/bpf/bpf_experimental.h | 3 + .../selftests/bpf/prog_tests/cgroup_xattr.c | 145 ++++++++++++++++ .../selftests/bpf/progs/cgroup_read_xattr.c | 158 ++++++++++++++++++ .../selftests/bpf/progs/read_cgroupfs_xattr.c | 60 +++++++ 4 files changed, 366 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c create mode 100644 tools/testing/selftests/bpf/progs/cgroup_read_xattr.c create mode 100644 tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c
tools/testing/selftests/bpf/bpf_experimental.h +3 -0
@@ -596,4 +596,7 @@ extern int bpf_iter_dmabuf_new(struct bpf_iter_dmabuf *it) __weak __ksym;extern struct dma_buf *bpf_iter_dmabuf_next (struct bpf_iter_dmabuf *it)__weak __ksym; extern void bpf_iter_dmabuf_destroy(struct bpf_iter_dmabuf *it) __weak __ksym; +extern int bpf_cgroup_read_xattr(struct cgroup *cgroup, const char *name__str, + struct bpf_dynptr *value_p) __weak __ksym; +#endif
tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c new file +145 -0
145 lines not on this page · raw message
tools/testing/selftests/bpf/progs/cgroup_read_xattr.c new file +158 -0
158 lines not on this page · raw message
tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c new file +60 -0
60 lines not on this page · raw message
Signature · 1 line
2.47.1
Quoted 3 lines · Song Liu
Introduce a new kfunc
bpf_cgroup_read_xattr, which can read xattr from cgroupfs nodes. The primary users are LSMs, cgroup programs, andsched_ext.
Applied to the vfs-6.17.bpf branch of the vfs/vfs.git tree. Patches in the vfs-6.17.bpf branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.17.bpf
[1/4] kernfs: remove iattr_mutex
https://git.kernel.org/vfs/vfs/c/d1f4e9026007 [2/4] bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node https://git.kernel.org/vfs/vfs/c/535b070f4a80 [3/4] bpf: Mark cgroup_subsys_state->cgroup RCU safe https://git.kernel.org/vfs/vfs/c/1504d8c7c702 [4/4] selftests/bpf: Add tests for bpf_cgroup_read_xattr https://git.kernel.org/vfs/vfs/c/f4fba2d6d282
Quoted 8 lines · Christian Brauner
Quoted 3 lines · Song Liu
Introduce a new kfunc
bpf_cgroup_read_xattr, which can read xattr from cgroupfs nodes. The primary users are LSMs, cgroup programs, andsched_ext.Applied to the vfs-6.17.bpf branch of the vfs/vfs.git tree. Patches in the vfs-6.17.bpf branch should appear in linux-next soon.
Thanks.
Now merged into bpf-next/master as well.
Quoted 2 lines
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
bugs :(
Quoted 2 lines
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Pls don't. Keep it as-is, otherwise there will be merge conflicts during the merge window.
Quoted 6 lines
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.17.bpf
Quoted 8 lines
[1/4] kernfs: remove
iattr_mutexhttps://git.kernel.org/vfs/vfs/c/d1f4e9026007 [2/4] bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node https://git.kernel.org/vfs/vfs/c/535b070f4a80 [3/4] bpf: Mark cgroup_subsys_state->cgroup RCU safe https://git.kernel.org/vfs/vfs/c/1504d8c7c702 [4/4] selftests/bpf: Add tests for bpf_cgroup_read_xattr https://git.kernel.org/vfs/vfs/c/f4fba2d6d282
Something wrong with this selftest.
Cleanup is not done correctly.
./test_progs -t lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -t lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -t cgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -t lsm_cgroup test_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpected start_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor) getsockopt(SOL_PROTOCOL) test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpected sk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILED
Song,
Please follow up with the fix for selftest.
It will be in bpf-next only.
Song Liu
reviewerOn Thu, Jun 26, 2025 at 7:14 PM Alexei Starovoitov <[email protected]> wrote:
[...]
Quoted 24 lines
./test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILED
Quoted 3 lines
Song,
Please follow up with the fix for selftest. It will be in bpf-next only.
The issue is because cgroup_xattr calls "ip link set dev lo up" in setup, and calls "ip link set dev lo down" in cleanup. Most other tests only call "ip link set dev lo up". IOW, it appears to me that cgroup_xattr is doing the cleanup properly. To fix this, we can either remove "dev lo down" from cgroup_xattr, or add "dev lo up" to lsm_cgroups. Do you have any preference one way or another?
Thanks,
Song
Quoted 32 lines · Song Liu
On Thu, Jun 26, 2025 at 7:14 PM Alexei Starovoitov <[email protected]> wrote:
[...]Quoted 24 lines
./test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILEDQuoted 3 lines
Song,
Please follow up with the fix for selftest. It will be in bpf-next only.
Quoted 7 lines
The issue is because
cgroup_xattrcalls "ip link set dev lo up" in setup, and calls "ip link set dev lo down" in cleanup. Most other tests only call "ip link set dev lo up". IOW, it appears to me thatcgroup_xattris doing the cleanup properly. To fix this, we can either remove "dev lo down" fromcgroup_xattr, or add "dev lo up" tolsm_cgroups. Do you have any preference one way or another?
It messes with "lo" without switching netns? Ouch.
Not sure what tests you copied that code from,
but all "ip" commands, ping_group_range, and sockets don't need to be in the test. Instead of triggering progs through lsm/socket_connect hook can't you use
a simple hook like lsm/bpf or lsm/file_open that doesn't require networking setup ?
Quoted 45 lines · Alexei Starovoitov
Quoted 32 lines · Song Liu
On Thu, Jun 26, 2025 at 7:14 PM Alexei Starovoitov <[email protected]> wrote:
[...]Quoted 24 lines
./test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILEDQuoted 3 lines
Song,
Please follow up with the fix for selftest. It will be in bpf-next only.Quoted 7 lines
The issue is because
cgroup_xattrcalls "ip link set dev lo up" in setup, and calls "ip link set dev lo down" in cleanup. Most other tests only call "ip link set dev lo up". IOW, it appears to me thatcgroup_xattris doing the cleanup properly. To fix this, we can either remove "dev lo down" fromcgroup_xattr, or add "dev lo up" tolsm_cgroups. Do you have any preference one way or another?
Quoted 1 line
It messes with "lo" without switching netns? Ouch.
Ah, I see the problem now.
Quoted 6 lines
Not sure what tests you copied that code from,
but all "ip" commands,ping_group_range, and sockets don't need to be in the test. Instead of triggering progs through lsm/socket_connect hook can't you use
a simple hook like lsm/bpf or lsm/file_open that doesn't require networking setup ?
Yeah, let me fix the test with a different hook.
Thanks,
Song
Christian Brauner
maintainerQuoted 49 lines · Song Liu
Quoted 45 lines · Alexei Starovoitov
Quoted 32 lines · Song Liu
On Thu, Jun 26, 2025 at 7:14 PM Alexei Starovoitov <[email protected]> wrote:
[...]Quoted 24 lines
./test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILEDQuoted 3 lines
Song,
Please follow up with the fix for selftest. It will be in bpf-next only.Quoted 7 lines
The issue is because
cgroup_xattrcalls "ip link set dev lo up" in setup, and calls "ip link set dev lo down" in cleanup. Most other tests only call "ip link set dev lo up". IOW, it appears to me thatcgroup_xattris doing the cleanup properly. To fix this, we can either remove "dev lo down" fromcgroup_xattr, or add "dev lo up" tolsm_cgroups. Do you have any preference one way or another?Quoted 1 line
It messes with "lo" without switching netns? Ouch.
Ah, I see the problem now.
Quoted 8 lines
Quoted 6 lines
Not sure what tests you copied that code from,
but all "ip" commands,ping_group_range, and sockets don't need to be in the test. Instead of triggering progs through lsm/socket_connect hook can't you use
a simple hook like lsm/bpf or lsm/file_open that doesn't require networking setup ?Yeah, let me fix the test with a different hook.
Where's the patch?
Song Liu
reviewerQuoted 58 lines · Christian Brauner
Quoted 56 lines · Song Liu
Quoted 45 lines · Alexei Starovoitov
Quoted 32 lines · Song Liu
On Thu, Jun 26, 2025 at 7:14 PM Alexei Starovoitov <[email protected]> wrote:
[...]Quoted 24 lines
./test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILEDQuoted 3 lines
Song,
Please follow up with the fix for selftest. It will be in bpf-next only.Quoted 7 lines
The issue is because
cgroup_xattrcalls "ip link set dev lo up" in setup, and calls "ip link set dev lo down" in cleanup. Most other tests only call "ip link set dev lo up". IOW, it appears to me thatcgroup_xattris doing the cleanup properly. To fix this, we can either remove "dev lo down" fromcgroup_xattr, or add "dev lo up" tolsm_cgroups. Do you have any preference one way or another?Quoted 1 line
It messes with "lo" without switching netns? Ouch.
Ah, I see the problem now.
Quoted 6 lines
Not sure what tests you copied that code from,
but all "ip" commands,ping_group_range, and sockets don't need to be in the test. Instead of triggering progs through lsm/socket_connect hook can't you use
a simple hook like lsm/bpf or lsm/file_open that doesn't require networking setup ?
Quoted 3 lines
Quoted 1 line
Yeah, let me fix the test with a different hook.
Where's the patch?
Here is a fix to kernel/bpf/helprs.c by Eduard:
https://lore.kernel.org/bpf/[email protected]/
This fix addresses build errors with certain config.
Here is my fix to the selftests:
https://lore.kernel.org/bpf/[email protected]/
I didn't CC linux-fsdevel because all the changes are in the selftests, and the error is independent of the new code.
Thanks,
Song
Christian Brauner
maintainerQuoted 66 lines · Song Liu
Quoted 58 lines · Christian Brauner
Quoted 56 lines · Song Liu
Quoted 45 lines · Alexei Starovoitov
Quoted 32 lines · Song Liu
On Thu, Jun 26, 2025 at 7:14 PM Alexei Starovoitov <[email protected]> wrote:
[...]Quoted 24 lines
./test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILEDQuoted 3 lines
Song,
Please follow up with the fix for selftest. It will be in bpf-next only.Quoted 7 lines
The issue is because
cgroup_xattrcalls "ip link set dev lo up" in setup, and calls "ip link set dev lo down" in cleanup. Most other tests only call "ip link set dev lo up". IOW, it appears to me thatcgroup_xattris doing the cleanup properly. To fix this, we can either remove "dev lo down" fromcgroup_xattr, or add "dev lo up" tolsm_cgroups. Do you have any preference one way or another?Quoted 1 line
It messes with "lo" without switching netns? Ouch.
Ah, I see the problem now.
Quoted 6 lines
Not sure what tests you copied that code from,
but all "ip" commands,ping_group_range, and sockets don't need to be in the test. Instead of triggering progs through lsm/socket_connect hook can't you use
a simple hook like lsm/bpf or lsm/file_open that doesn't require networking setup ?Quoted 3 lines
Quoted 1 line
Yeah, let me fix the test with a different hook.
Where's the patch?
Here is a fix to
kernel/bpf/helprs.cby Eduard:
https://lore.kernel.org/bpf/[email protected]/
Quoted 7 lines
This fix addresses build errors with certain config.
Here is my fix to the selftests:
https://lore.kernel.org/bpf/[email protected]/I didn't CC linux-fsdevel because all the changes are in the selftests, and the error is independent of the new code.
Ah great, thank you for the info. That helped and we don't have to care then.
Christian Brauner
maintainerQuoted 16 lines · Alexei Starovoitov
Quoted 8 lines · Christian Brauner
Quoted 3 lines · Song Liu
Introduce a new kfunc
bpf_cgroup_read_xattr, which can read xattr from cgroupfs nodes. The primary users are LSMs, cgroup programs, andsched_ext.Applied to the vfs-6.17.bpf branch of the vfs/vfs.git tree. Patches in the vfs-6.17.bpf branch should appear in linux-next soon.
Thanks.
Now merged into bpf-next/master as well.Quoted 2 lines
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
Quoted 7 lines
bugs :(
Quoted 2 lines
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Pls don't. Keep it as-is, otherwise there will be merge conflicts during the merge window.
This is just the common blurb. As soon as another part of the tree relies on something we stabilize the branch and only do fixes on top and never rebase. We usually recommend just pulling the branch which I think you did.
Quoted 43 lines
Quoted 7 lines
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.17.bpfQuoted 8 lines
[1/4] kernfs: remove
iattr_mutexhttps://git.kernel.org/vfs/vfs/c/d1f4e9026007 [2/4] bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node https://git.kernel.org/vfs/vfs/c/535b070f4a80 [3/4] bpf: Mark cgroup_subsys_state->cgroup RCU safe https://git.kernel.org/vfs/vfs/c/1504d8c7c702 [4/4] selftests/bpf: Add tests for bpf_cgroup_read_xattr https://git.kernel.org/vfs/vfs/c/f4fba2d6d282Something wrong with this selftest.
Cleanup is not done correctly../test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILED
Quoted 3 lines
Song,
Please follow up with the fix for selftest.
It will be in bpf-next only.
We should put that commit on the shared vfs-6.17.bpf branch.
Quoted 74 lines · Christian Brauner
Quoted 16 lines · Alexei Starovoitov
Quoted 8 lines · Christian Brauner
Quoted 3 lines · Song Liu
Introduce a new kfunc
bpf_cgroup_read_xattr, which can read xattr from cgroupfs nodes. The primary users are LSMs, cgroup programs, andsched_ext.Applied to the vfs-6.17.bpf branch of the vfs/vfs.git tree. Patches in the vfs-6.17.bpf branch should appear in linux-next soon.
Thanks.
Now merged into bpf-next/master as well.Quoted 2 lines
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
Quoted 7 lines
bugs :(
Quoted 2 lines
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Pls don't. Keep it as-is, otherwise there will be merge conflicts during the merge window.
This is just the common blurb. As soon as another part of the tree relies on something we stabilize the branch and only do fixes on top and never rebase. We usually recommend just pulling the branch which I think you did.
Quoted 43 lines
Quoted 7 lines
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.17.bpfQuoted 8 lines
[1/4] kernfs: remove
iattr_mutexhttps://git.kernel.org/vfs/vfs/c/d1f4e9026007 [2/4] bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node https://git.kernel.org/vfs/vfs/c/535b070f4a80 [3/4] bpf: Mark cgroup_subsys_state->cgroup RCU safe https://git.kernel.org/vfs/vfs/c/1504d8c7c702 [4/4] selftests/bpf: Add tests for bpf_cgroup_read_xattr https://git.kernel.org/vfs/vfs/c/f4fba2d6d282Something wrong with this selftest.
Cleanup is not done correctly../test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILED
Quoted 5 lines
Quoted 3 lines
Song,
Please follow up with the fix for selftest.
It will be in bpf-next only.We should put that commit on the shared vfs-6.17.bpf branch.
The branch had a conflict with bpf-next which was resolved in the merge commit. Then _two_ fixes were applied on top. And one fix is right where conflict was.
So it's not possible to apply both fixes to vfs-6.17.bpf. imo this shared branch experience wasn't good.
We should have applied the series to bpf-next only. It was more bpf material than vfs. I wouldn't do this again.
Christian Brauner
maintainerQuoted 81 lines · Alexei Starovoitov
Quoted 74 lines · Christian Brauner
Quoted 16 lines · Alexei Starovoitov
Quoted 8 lines · Christian Brauner
Quoted 3 lines · Song Liu
Introduce a new kfunc
bpf_cgroup_read_xattr, which can read xattr from cgroupfs nodes. The primary users are LSMs, cgroup programs, andsched_ext.Applied to the vfs-6.17.bpf branch of the vfs/vfs.git tree. Patches in the vfs-6.17.bpf branch should appear in linux-next soon.
Thanks.
Now merged into bpf-next/master as well.Quoted 2 lines
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
Quoted 7 lines
bugs :(
Quoted 2 lines
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Pls don't. Keep it as-is, otherwise there will be merge conflicts during the merge window.
This is just the common blurb. As soon as another part of the tree relies on something we stabilize the branch and only do fixes on top and never rebase. We usually recommend just pulling the branch which I think you did.
Quoted 43 lines
Quoted 7 lines
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.17.bpfQuoted 8 lines
[1/4] kernfs: remove
iattr_mutexhttps://git.kernel.org/vfs/vfs/c/d1f4e9026007 [2/4] bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node https://git.kernel.org/vfs/vfs/c/535b070f4a80 [3/4] bpf: Mark cgroup_subsys_state->cgroup RCU safe https://git.kernel.org/vfs/vfs/c/1504d8c7c702 [4/4] selftests/bpf: Add tests for bpf_cgroup_read_xattr https://git.kernel.org/vfs/vfs/c/f4fba2d6d282Something wrong with this selftest.
Cleanup is not done correctly../test_progs -t
lsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgroup
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tcgroup_xattr
Summary: 1/8 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -tlsm_cgrouptest_lsm_cgroup_functional:PASS:bind(ETH_P_ALL) 0 nsec (network_helpers.c:121: errno: Cannot assign requested address) Failed to bind socket
test_lsm_cgroup_functional:FAIL:start_server unexpectedstart_server:
actual -1 < expected 0
(network_helpers.c:360: errno: Bad file descriptor)getsockopt(SOL_PROTOCOL)test_lsm_cgroup_functional:FAIL:connect_to_fd unexpectedconnect_to_fd: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:accept unexpected accept: actual -1 < expected 0 test_lsm_cgroup_functional:FAIL:getsockopt unexpected getsockopt:
actual -1 < expected 0
test_lsm_cgroup_functional:FAIL:sk_priority unexpectedsk_priority:
actual 0 != expected 234
...
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILEDQuoted 5 lines
Quoted 3 lines
Song,
Please follow up with the fix for selftest.
It will be in bpf-next only.We should put that commit on the shared vfs-6.17.bpf branch.
Quoted 7 lines
The branch had a conflict with bpf-next which was resolved in the merge commit. Then _two_ fixes were applied on top. And one fix is right where conflict was.
So it's not possible to apply both fixes to vfs-6.17.bpf. imo this shared branch experience wasn't good.
We should have applied the series to bpf-next only. It was more bpf material than vfs. I wouldn't do this again.
Absolutely not. Anything that touches VFS will go through VFS. Shared branches work just fine. We manage to do this with everyone else in the kernel so bpf is able to do this as well. If you'd just asked this would not have been an issue. Merge conflicts are a fact of kernel development, we all deal with it you can too.
This series was applied to bpf/bpf-next.git (master) by Christian Brauner <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Christian Brauner <[email protected]>:
Quoted 11 lines · On Sun, 22 Jun 2025 23:38:50 -0700 you wrote:
Introduce a new kfunc
bpf_cgroup_read_xattr, which can read xattr from cgroupfs nodes. The primary users are LSMs, cgroup programs, andsched_ext.---
Changes v2 => v3:
1. Makebpf_cgroup_read_xattravailable to all program types.
2. Fix gcc build warning on the selftests.
3. Add "ifdefCONFIG_CGROUPS" aroundbpf_cgroup_read_xattr.[...]
Here is the summary with links:
- [v3,bpf-next,1/4] kernfs: remove iattr_mutex
(no matching commit)
- [v3,bpf-next,2/4] bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node
https://git.kernel.org/bpf/bpf-next/c/535b070f4a80 - [v3,bpf-next,3/4] bpf: Mark cgroup_subsys_state->cgroup RCU safe https://git.kernel.org/bpf/bpf-next/c/1504d8c7c702 - [v3,bpf-next,4/4] selftests/bpf: Add tests for bpf_cgroup_read_xattr https://git.kernel.org/bpf/bpf-next/c/f4fba2d6d282
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html