Add bpf_link support for sk_msg prog
Subsystems (9)
Yonghong Song
reviewercover Add bpf_link support for sk_msg prog
One of our internal services started to use sk_msg program and currently it used existing prog attach/detach2 as demonstrated in selftests. But attach/detach of all other bpf programs are based on bpf_link. Consistent attach/detach APIs for all programs will make things easy to undersand and less error prone. So this patch added bpf_link support for BPF_PROG_TYPE_SK_MSG.
I marked the patch as RFC as not all functionality are covered by tests yet, e.g. update_prog(). Maybe somebody can suggest an existing test which I can look into.
Or maybe some other tests need to be added as well.
Yonghong Song (5):
bpf: Add link support for sk_msg prog
libbpf: Refactor bpf_program_attach_fd()
libbpf: Add link support for BPF_PROG_TYPE_SK_MSG
bpftool: Add link dump support for BPF_LINK_TYPE_SK_MSG selftests/bpf: Add some tests with new bpf_program__attach_sk_msg()
API
include/linux/bpf.h | 13 ++ include/uapi/linux/bpf.h | 5 + kernel/bpf/syscall.c | 3 + net/core/skmsg.c | 153 ++++++++++++++++++ net/core/sock_map.c | 6 +- tools/bpf/bpftool/link.c | 8 + tools/include/uapi/linux/bpf.h | 5 + tools/lib/bpf/libbpf.c | 26 ++- tools/lib/bpf/libbpf.h | 3 + tools/lib/bpf/libbpf.map | 1 + .../selftests/bpf/prog_tests/sockmap_basic.c | 27 ++++ .../selftests/bpf/prog_tests/sockmap_listen.c | 38 +++++ 12 files changed, 279 insertions(+), 9 deletions(-)
Signature · 1 line
2.43.0
Yonghong Song
reviewerRFC PATCH 1/5 bpf: Add link support for sk_msg prog
Add link support for sk_msg program. This will make user space easy to manage as most common used programs have alrady have link support.
--- include/linux/bpf.h | 13 +++ include/uapi/linux/bpf.h | 5 ++ kernel/bpf/syscall.c | 3 + net/core/skmsg.c | 153 +++++++++++++++++++++++++++++++++ net/core/sock_map.c | 6 +- tools/include/uapi/linux/bpf.h | 5 ++ 6 files changed, 181 insertions(+), 4 deletions(-)
include/linux/bpf.h +13 -0
@@ -2982,10 +2982,14 @@ int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype);int sock_map_update_elem_sys (struct bpf_map *map,void *key,void *value,u64 flags);int sock_map_bpf_prog_query (const union bpf_attr *attr,union bpf_attr __user *uattr); +int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, +struct bpf_prog *old,u32 which);void sock_map_unhash (struct sock *sk);void sock_map_destroy (struct sock *sk);void sock_map_close (struct sock *sk,long timeout); + +int bpf_skmsg_link_create (const union bpf_attr *attr,struct bpf_prog *prog);#else static inline int bpf_dev_bound_kfunc_check (struct bpf_verifier_log *log,struct bpf_prog_aux *prog_aux)
@@ -3080,6 +3084,15 @@ static inline int sock_map_bpf_prog_query(const union bpf_attr *attr, {return -EINVAL ; } +int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, +struct bpf_prog *old,u32 which) +{ +return -EOPNOTSUPP ; +} +int bpf_skmsg_link_create (const union bpf_attr *attr,struct bpf_prog *prog) +{ +return -EOPNOTSUPP ; +}#endif /* CONFIG_BPF_SYSCALL */ #endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */
include/uapi/linux/bpf.h +5 -0
@@ -1129,6 +1129,7 @@ enum bpf_link_type {BPF_LINK_TYPE_TCX =11 ,BPF_LINK_TYPE_UPROBE_MULTI =12 ,BPF_LINK_TYPE_NETKIT =13 , +BPF_LINK_TYPE_SK_MSG =14 , __MAX_BPF_LINK_TYPE, };
@@ -6699,6 +6700,10 @@ struct bpf_link_info {__u32 ifindex;__u32 attach_type; } netkit; +struct { +__u32 map_id; +__u32 attach_type; + } skmsg; }; } __attribute__((aligned(8)));
kernel/bpf/syscall.c +3 -0
@@ -5155,6 +5155,9 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)case BPF_PROG_TYPE_SK_LOOKUP : ret =netns_bpf_link_create (attr, prog);break ; +case BPF_PROG_TYPE_SK_MSG : + ret =bpf_skmsg_link_create (attr, prog); +break ;#ifdef CONFIG_NET case BPF_PROG_TYPE_XDP : ret =bpf_xdp_link_attach (attr, prog);
net/core/skmsg.c +153 -0
156 lines not on this page · raw message
net/core/sock_map.c +2 -4
@@ -24,8 +24,6 @@ struct bpf_stab {#define SOCK_CREATE_FLAG_MASK \ (BPF_F_NUMA_NODE | BPF_F_RDONLY | BPF_F_WRONLY) -static int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, -struct bpf_prog *old,u32 which);static struct sk_psock_progs *sock_map_progs (struct bpf_map *map);static struct bpf_map *sock_map_alloc (union bpf_attr *attr)
@@ -1488,8 +1486,8 @@ static int sock_map_prog_lookup(struct bpf_map *map, struct bpf_prog ***pprog,return 0 ; } -static int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, -struct bpf_prog *old,u32 which) +int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, +struct bpf_prog *old,u32 which) {struct bpf_prog **pprog;int ret;
tools/include/uapi/linux/bpf.h +5 -0
@@ -1129,6 +1129,7 @@ enum bpf_link_type {BPF_LINK_TYPE_TCX =11 ,BPF_LINK_TYPE_UPROBE_MULTI =12 ,BPF_LINK_TYPE_NETKIT =13 , +BPF_LINK_TYPE_SK_MSG =14 , __MAX_BPF_LINK_TYPE, };
@@ -6699,6 +6700,10 @@ struct bpf_link_info {__u32 ifindex;__u32 attach_type; } netkit; +struct { +__u32 map_id; +__u32 attach_type; + } skmsg; }; } __attribute__((aligned(8)));
Signature · 1 line
2.43.0
kernel test robot
build botRe: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog
kernel test robot noticed the following build errors:
Hi Yonghong,
[This is a private test report for your RFC patch.] kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Yonghong-Song/bpf-Add-link-support-for-sk_msg-prog/20240306-042552 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20240305202201.3891042-1-yonghong.song%40linux.dev patch subject: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog config: i386-buildonly-randconfig-004-20240308 (https://download.01.org/0day-ci/archive/20240309/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240309/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All error/warnings (new ones prefixed by >>):
In file included from include/linux/security.h:35,
from include/linux/perf_event.h:62, from include/linux/trace_events.h:10, from include/trace/trace_events.h:21, from include/trace/define_trace.h:102, from include/trace/events/siox.h:66, from drivers/siox/siox-core.c:37:
>> include/linux/bpf.h:3087:5: warning: no previous prototype for 'sock_map_prog_update' [-Wmissing-prototypes]
3087 | int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
| ^~~~~~~~~~~~~~~~~~~~
>> include/linux/bpf.h:3092:5: warning: no previous prototype for 'bpf_skmsg_link_create' [-Wmissing-prototypes] 3092 | int bpf_skmsg_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
| ^~~~~~~~~~~~~~~~~~~~~
--
In file included from include/linux/security.h:35,
from include/linux/perf_event.h:62,
from include/linux/trace_events.h:10,
from include/trace/syscall.h:7,
from include/linux/syscalls.h:93,
from include/linux/entry-common.h:7,
from kernel/entry/common.c:4:
>> include/linux/bpf.h:3087:5: warning: no previous prototype for 'sock_map_prog_update' [-Wmissing-prototypes]
3087 | int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
| ^~~~~~~~~~~~~~~~~~~~
>> include/linux/bpf.h:3092:5: warning: no previous prototype for 'bpf_skmsg_link_create' [-Wmissing-prototypes]
3092 | int bpf_skmsg_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
| ^~~~~~~~~~~~~~~~~~~~~
In file included from include/linux/string.h:292,
from arch/x86/include/asm/page_32.h:18,
from arch/x86/include/asm/page.h:14,
from arch/x86/include/asm/processor.h:20,
from include/linux/sched.h:13,
from include/linux/context_tracking.h:5,
from kernel/entry/common.c:3:
In function 'fortify_memcpy_chk',
inlined from 'syscall_get_arguments' at arch/x86/include/asm/syscall.h:87:2,
inlined from 'perf_trace_sys_enter' at include/trace/events/syscalls.h:18:1:
include/linux/fortify-string.h:537:25: warning: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Wattribute-warning]
537 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'fortify_memcpy_chk',
inlined from 'syscall_get_arguments' at arch/x86/include/asm/syscall.h:87:2,
inlined from 'trace_event_raw_event_sys_enter' at include/trace/events/syscalls.h:18:1:
include/linux/fortify-string.h:537:25: warning: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Wattribute-warning]
537 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--
In file included from include/linux/security.h:35,
from include/linux/perf_event.h:62, from include/linux/trace_events.h:10, from include/trace/syscall.h:7, from include/linux/syscalls.h:93, from kernel/time/hrtimer.c:30:
>> include/linux/bpf.h:3087:5: warning: no previous prototype for 'sock_map_prog_update' [-Wmissing-prototypes]
3087 | int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
| ^~~~~~~~~~~~~~~~~~~~
>> include/linux/bpf.h:3092:5: warning: no previous prototype for 'bpf_skmsg_link_create' [-Wmissing-prototypes] 3092 | int bpf_skmsg_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
| ^~~~~~~~~~~~~~~~~~~~~
kernel/time/hrtimer.c:120:35: warning: initialized field overwritten [-Woverride-init]
120 | [CLOCK_REALTIME] = HRTIMER_BASE_REALTIME,
| ^~~~~~~~~~~~~~~~~~~~~
kernel/time/hrtimer.c:120:35: note: (near initialization for 'hrtimer_clock_to_base_table[0]') kernel/time/hrtimer.c:121:35: warning: initialized field overwritten [-Woverride-init]
121 | [CLOCK_MONOTONIC] = HRTIMER_BASE_MONOTONIC,
| ^~~~~~~~~~~~~~~~~~~~~~
kernel/time/hrtimer.c:121:35: note: (near initialization for 'hrtimer_clock_to_base_table[1]') kernel/time/hrtimer.c:122:35: warning: initialized field overwritten [-Woverride-init]
122 | [CLOCK_BOOTTIME] = HRTIMER_BASE_BOOTTIME,
| ^~~~~~~~~~~~~~~~~~~~~
kernel/time/hrtimer.c:122:35: note: (near initialization for 'hrtimer_clock_to_base_table[7]') kernel/time/hrtimer.c:123:35: warning: initialized field overwritten [-Woverride-init]
123 | [CLOCK_TAI] = HRTIMER_BASE_TAI,
| ^~~~~~~~~~~~~~~~
kernel/time/hrtimer.c:123:35: note: (near initialization for 'hrtimer_clock_to_base_table[11]')
--
ld: init/do_mounts.o: in function `sock_map_prog_update':
>> do_mounts.c:(.text+0xc): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here ld: init/do_mounts.o: in function `bpf_skmsg_link_create': >> do_mounts.c:(.text+0x14): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: init/do_mounts_initrd.o: in function `sock_map_prog_update':
do_mounts_initrd.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: init/do_mounts_initrd.o: in function `bpf_skmsg_link_create':
do_mounts_initrd.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: init/initramfs.o: in function `sock_map_prog_update':
initramfs.c:(.text+0xf8): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: init/initramfs.o: in function `bpf_skmsg_link_create':
initramfs.c:(.text+0x100): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/entry/syscall_32.o: in function `sock_map_prog_update':
syscall_32.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/entry/syscall_32.o: in function `bpf_skmsg_link_create':
syscall_32.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/entry/common.o: in function `sock_map_prog_update':
common.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/entry/common.o: in function `bpf_skmsg_link_create':
common.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/entry/vdso/extable.o: in function `sock_map_prog_update':
extable.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/entry/vdso/extable.o: in function `bpf_skmsg_link_create':
extable.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/events/core.o: in function `sock_map_prog_update':
core.c:(.text+0x2530): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/events/core.o: in function `bpf_skmsg_link_create':
core.c:(.text+0x2538): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/events/utils.o: in function `sock_map_prog_update':
utils.c:(.text+0x3c8): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/events/utils.o: in function `bpf_skmsg_link_create':
utils.c:(.text+0x3d0): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/events/amd/core.o: in function `sock_map_prog_update':
core.c:(.text+0x1960): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/events/amd/core.o: in function `bpf_skmsg_link_create':
core.c:(.text+0x1968): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/events/amd/lbr.o: in function `sock_map_prog_update':
lbr.c:(.text+0x444): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/events/amd/lbr.o: in function `bpf_skmsg_link_create':
lbr.c:(.text+0x44c): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/events/amd/brs.o: in function `sock_map_prog_update':
brs.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/events/amd/brs.o: in function `bpf_skmsg_link_create':
brs.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/events/amd/power.o: in function `sock_map_prog_update':
power.c:(.text+0x4f4): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/events/amd/power.o: in function `bpf_skmsg_link_create':
power.c:(.text+0x4fc): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/events/zhaoxin/core.o: in function `sock_map_prog_update':
core.c:(.text+0x974): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/events/zhaoxin/core.o: in function `bpf_skmsg_link_create':
core.c:(.text+0x97c): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/process_32.o: in function `sock_map_prog_update':
process_32.c:(.text+0x3c): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/process_32.o: in function `bpf_skmsg_link_create':
process_32.c:(.text+0x44): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/signal.o: in function `sock_map_prog_update':
signal.c:(.text+0x14c): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/signal.o: in function `bpf_skmsg_link_create':
signal.c:(.text+0x154): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/signal_32.o: in function `sock_map_prog_update':
signal_32.c:(.text+0x104): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/signal_32.o: in function `bpf_skmsg_link_create':
signal_32.c:(.text+0x10c): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/traps.o: in function `sock_map_prog_update':
traps.c:(.text+0x480): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/traps.o: in function `bpf_skmsg_link_create':
traps.c:(.text+0x488): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/idt.o: in function `sock_map_prog_update':
idt.c:(.text+0x44): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/idt.o: in function `bpf_skmsg_link_create':
idt.c:(.text+0x4c): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/irq.o: in function `sock_map_prog_update':
irq.c:(.text+0x10c): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/irq.o: in function `bpf_skmsg_link_create':
irq.c:(.text+0x114): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/ioport.o: in function `sock_map_prog_update':
ioport.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/ioport.o: in function `bpf_skmsg_link_create':
ioport.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/nmi.o: in function `sock_map_prog_update':
nmi.c:(.text+0x6d0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/nmi.o: in function `bpf_skmsg_link_create':
nmi.c:(.text+0x6d8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/ldt.o: in function `sock_map_prog_update':
ldt.c:(.text+0x42c): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/ldt.o: in function `bpf_skmsg_link_create':
ldt.c:(.text+0x434): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/setup.o: in function `sock_map_prog_update':
setup.c:(.text+0x34): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/setup.o: in function `bpf_skmsg_link_create':
setup.c:(.text+0x3c): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/irqinit.o: in function `sock_map_prog_update':
irqinit.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/irqinit.o: in function `bpf_skmsg_link_create':
irqinit.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/irq_work.o: in function `sock_map_prog_update':
irq_work.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/irq_work.o: in function `bpf_skmsg_link_create':
irq_work.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
ld: arch/x86/kernel/sys_ia32.o: in function `sock_map_prog_update':
sys_ia32.c:(.text+0x0): multiple definition of `sock_map_prog_update'; init/main.o:main.c:(.text+0x798): first defined here
ld: arch/x86/kernel/sys_ia32.o: in function `bpf_skmsg_link_create':
sys_ia32.c:(.text+0x8): multiple definition of `bpf_skmsg_link_create'; init/main.o:main.c:(.text+0x7a0): first defined here
--
In file included from include/linux/security.h:35,
from include/net/scm.h:9,
from include/linux/netlink.h:9,
from include/uapi/linux/neighbour.h:6,
from include/linux/netdevice.h:45,
from include/net/sock.h:46,
from include/linux/tcp.h:19,
from include/linux/ipv6.h:101,
from include/net/addrconf.h:61,
from lib/vsprintf.c:41:
>> include/linux/bpf.h:3087:5: warning: no previous prototype for 'sock_map_prog_update' [-Wmissing-prototypes]
3087 | int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
| ^~~~~~~~~~~~~~~~~~~~
>> include/linux/bpf.h:3092:5: warning: no previous prototype for 'bpf_skmsg_link_create' [-Wmissing-prototypes]
3092 | int bpf_skmsg_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
| ^~~~~~~~~~~~~~~~~~~~~
lib/vsprintf.c: In function 'va_format':
lib/vsprintf.c:1683:9: warning: function 'va_format' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
1683 | buf += vsnprintf(buf, end > buf ? end - buf : 0, va_fmt->fmt, va);
| ^~~
--
In file included from include/linux/security.h:35,
from kernel/ptrace.c:22:
>> include/linux/bpf.h:3087:5: warning: no previous prototype for 'sock_map_prog_update' [-Wmissing-prototypes]
3087 | int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
| ^~~~~~~~~~~~~~~~~~~~
>> include/linux/bpf.h:3092:5: warning: no previous prototype for 'bpf_skmsg_link_create' [-Wmissing-prototypes]
3092 | int bpf_skmsg_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
| ^~~~~~~~~~~~~~~~~~~~~
In file included from include/linux/string.h:292,
from arch/x86/include/asm/page_32.h:18,
from arch/x86/include/asm/page.h:14,
from arch/x86/include/asm/processor.h:20,
from include/linux/sched.h:13,
from kernel/ptrace.c:13:
In function 'fortify_memcpy_chk',
inlined from 'syscall_get_arguments.constprop' at arch/x86/include/asm/syscall.h:87:2:
include/linux/fortify-string.h:537:25: warning: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Wattribute-warning]
537 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
In file included from include/linux/security.h:35,
from include/linux/perf_event.h:62,
from include/linux/trace_events.h:10,
from include/trace/syscall.h:7,
from include/linux/syscalls.h:93,
from include/linux/entry-common.h:7,
from arch/x86/include/asm/idtentry.h:11,
from arch/x86/include/asm/traps.h:9,
from arch/x86/kernel/irq.c:23:
>> include/linux/bpf.h:3087:5: warning: no previous prototype for 'sock_map_prog_update' [-Wmissing-prototypes]
3087 | int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
| ^~~~~~~~~~~~~~~~~~~~
>> include/linux/bpf.h:3092:5: warning: no previous prototype for 'bpf_skmsg_link_create' [-Wmissing-prototypes]
3092 | int bpf_skmsg_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
| ^~~~~~~~~~~~~~~~~~~~~
In file included from include/trace/trace_events.h:27,
from include/trace/define_trace.h:102,
from arch/x86/include/asm/trace/irq_vectors.h:383,
from arch/x86/kernel/irq.c:27:
include/trace/stages/init.h:2:23: warning: 'str__irq_vectors__trace_system_name' defined but not used [-Wunused-const-variable=]
2 | #define __app__(x, y) str__##x##y
| ^~~~~
include/trace/stages/init.h:3:21: note: in expansion of macro '__app__'
3 | #define __app(x, y) __app__(x, y)
| ^~~~~~~
include/trace/stages/init.h:5:29: note: in expansion of macro '__app'
5 | #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
| ^~~~~
include/trace/stages/init.h:8:27: note: in expansion of macro 'TRACE_SYSTEM_STRING'
8 | static const char TRACE_SYSTEM_STRING[] = \
| ^~~~~~~~~~~~~~~~~~~
include/trace/stages/init.h:11:1: note: in expansion of macro 'TRACE_MAKE_SYSTEM_STR'
11 | TRACE_MAKE_SYSTEM_STR();
| ^~~~~~~~~~~~~~~~~~~~~
--
In file included from include/linux/bpf_verifier.h:7,
from kernel/bpf/btf.c:19:
>> include/linux/bpf.h:3087:5: warning: no previous prototype for 'sock_map_prog_update' [-Wmissing-prototypes]
3087 | int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
| ^~~~~~~~~~~~~~~~~~~~
>> include/linux/bpf.h:3092:5: warning: no previous prototype for 'bpf_skmsg_link_create' [-Wmissing-prototypes]
3092 | int bpf_skmsg_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
| ^~~~~~~~~~~~~~~~~~~~~
kernel/bpf/btf.c: In function 'btf_seq_show':
kernel/bpf/btf.c:7330:29: warning: function 'btf_seq_show' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
7330 | seq_vprintf((struct seq_file *)show->target, fmt, args);
| ^~~~~~~~
kernel/bpf/btf.c: In function 'btf_snprintf_show':
kernel/bpf/btf.c:7367:9: warning: function 'btf_snprintf_show' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
7367 | len = vsnprintf(show->target, ssnprintf->len_left, fmt, args);
| ^~~Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog
In reply to Yonghong SongQuoted 4 lines · Yonghong Song
Add link support for
sk_msgprogram. This will make user space easy to manage as most common used programs have alrady have link support.
So we have:
SEC("sk_skb/stream_parser") mapping to SK_SKB/BPF_SK_SKB_STREAM_PARSER. SEC("sk_skb/stream_verdict") mapping to SK_SKB/BPF_SK_SKB_STREAM_VERDICT. SEC("sk_msg") mapping to SK_MSG/BPF_SK_MSG_VERDICT.
Are those all kind of in the same category and should we support link for both SK_MSG and SK_SKB? I'm not too familiar, maybe John or someone else can clarify.
Quoted 11 lines
Signed-off-by Yonghong Song <[email protected]>--- include/linux/bpf.h | 13 +++ include/uapi/linux/bpf.h | 5 ++ kernel/bpf/syscall.c | 3 + net/core/skmsg.c | 153 +++++++++++++++++++++++++++++++++ net/core/sock_map.c | 6 +- tools/include/uapi/linux/bpf.h | 5 ++ 6 files changed, 181 insertions(+), 4 deletions(-)
[...]
Yonghong Song
reviewerRe: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog
Quoted 6 lines · Andrii Nakryiko
Quoted 3 lines · Yonghong Song
Add link support for
sk_msgprogram. This will make user space easy to manage as most common used programs have alrady have link support.So we have:
Quoted 7 lines
SEC("sk_skb/stream_parser")mapping to SK_SKB/BPF_SK_SKB_STREAM_PARSER.SEC("sk_skb/stream_verdict")mapping to SK_SKB/BPF_SK_SKB_STREAM_VERDICT.SEC("sk_msg")mapping to SK_MSG/BPF_SK_MSG_VERDICT.Are those all kind of in the same category and should we support link for both
SK_MSGandSK_SKB? I'm not too familiar, maybe John or someone else can clarify.
I can add sk_skb bpf_link support as well. Yes, sk_msg and sk_skb are similar to each other.
Quoted 12 lines
Quoted 11 lines
Signed-off-by Yonghong Song <[email protected]>--- include/linux/bpf.h | 13 +++ include/uapi/linux/bpf.h | 5 ++ kernel/bpf/syscall.c | 3 + net/core/skmsg.c | 153 +++++++++++++++++++++++++++++++++ net/core/sock_map.c | 6 +- tools/include/uapi/linux/bpf.h | 5 ++ 6 files changed, 181 insertions(+), 4 deletions(-)[...]
Jakub Sitnicki
maintainerRe: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog
In reply to Andrii NakryikoQuoted 8 lines · Andrii Nakryiko
Quoted 4 lines · Yonghong Song
Add link support for
sk_msgprogram. This will make user space easy to manage as most common used programs have alrady have link support.So we have:
Quoted 7 lines
SEC("sk_skb/stream_parser")mapping to SK_SKB/BPF_SK_SKB_STREAM_PARSER.SEC("sk_skb/stream_verdict")mapping to SK_SKB/BPF_SK_SKB_STREAM_VERDICT.SEC("sk_msg")mapping to SK_MSG/BPF_SK_MSG_VERDICT.Are those all kind of in the same category and should we support link for both
SK_MSGandSK_SKB? I'm not too familiar, maybe John or someone else can clarify.
We also have the most recent SK_SKB/BPF_SK_SKB_VERDICT [1], which is what one would use instead of SK_SKB/BPF_SK_SKB_STREAM_* prog pair when chopping the stream of bytes into frames is not needed. For instance, because we're redirecting from a UDP socket.
I have a cheatsheet that clarifies in which redirect-with-sockmap configuration what program type + attach type is used [2].
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a7ba4558e69a3c2ae4ca521f015832ef44799538
[2] https://github.com/jsitnicki/srecon-2023-sockmap/blob/main/sockmap-cheatsheet.png
Yonghong Song
reviewerRe: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog
Quoted 19 lines · Jakub Sitnicki
Quoted 6 lines · Andrii Nakryiko
Quoted 3 lines · Yonghong Song
Add link support for
sk_msgprogram. This will make user space easy to manage as most common used programs have alrady have link support.So we have:
Quoted 7 lines
SEC("sk_skb/stream_parser")mapping to SK_SKB/BPF_SK_SKB_STREAM_PARSER.SEC("sk_skb/stream_verdict")mapping to SK_SKB/BPF_SK_SKB_STREAM_VERDICT.SEC("sk_msg")mapping to SK_MSG/BPF_SK_MSG_VERDICT.Are those all kind of in the same category and should we support link for both
SK_MSGandSK_SKB? I'm not too familiar, maybe John or someone else can clarify.We also have the most recent SK_SKB/BPF_SK_SKB_VERDICT [1], which is what one would use instead of SK_SKB/BPF_SK_SKB_STREAM_* prog pair when chopping the stream of bytes into frames is not needed. For instance, because we're redirecting from a UDP socket.
Quoted 5 lines
I have a cheatsheet that clarifies in which redirect-with-sockmap configuration what program type + attach type is used [2].
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a7ba4558e69a3c2ae4ca521f015832ef44799538
[2] https://github.com/jsitnicki/srecon-2023-sockmap/blob/main/sockmap-cheatsheet.png
Thanks. I will take a look. Yes, agree, we only need to implement
the recommended one, which is SK_SKB/BPF_SK_SKB_VERDICT if I understand correctly.
Re: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog
In reply to Yonghong SongOn Tue, Mar 05, 2024 at 12:22:00PM -0800, Yonghong Song wrote:
SNIP
Quoted 30 lines
net/core/skmsg.c +30
-0+ +int bpf_skmsg_link_create (const union bpf_attr *attr,struct bpf_prog *prog) +{ +struct bpf_link_primer link_primer; +struct bpf_skmsg_link *skmsg_link; +enum bpf_attach_type attach_type; +struct bpf_map *map; +int ret; + +if (attr->link_create.flags) +return -EINVAL ; + + map =bpf_map_get_with_uref (attr->link_create.target_fd); +if (IS_ERR (map)) +return PTR_ERR (map); + + skmsg_link =kzalloc (sizeof (*skmsg_link),GFP_USER ); +if (!skmsg_link) { + ret = -ENOMEM ; + goto out; + } + + attach_type = attr->link_create.attach_type; +bpf_link_init (&skmsg_link->link,BPF_LINK_TYPE_SK_MSG , &bpf_skmsg_link_ops, prog); + skmsg_link->map = map; + skmsg_link->attach_type = attach_type; + + ret =bpf_link_prime (&skmsg_link->link, &link_primer); +if (ret) { +kfree (skmsg_link);
net/core/skmsg.c void sk_psock_stop_verdict(struct sock *sk, struct sk_psock *psock) · line 1404
Quoted 10 lines
net/core/skmsg.c +10
-0+ goto out; + } + + ret =sock_map_prog_update (map, prog,NULL , attach_type); +if (ret) { +bpf_link_cleanup (&link_primer); + goto out; + } + +bpf_prog_inc (prog);
there's already prog ref taken in link_create, is this needed? also I might be missing some skmsg logic, but I can't see thi being released
jirka
Quoted 58 lines
net/core/skmsg.c +7
-0+ +return bpf_link_settle (&link_primer); + +out: +bpf_map_put_with_uref (map); +return ret; +}net/core/sock_map.c +2
-4@@ -24,8 +24,6 @@ struct bpf_stab {#define SOCK_CREATE_FLAG_MASK \ (BPF_F_NUMA_NODE | BPF_F_RDONLY | BPF_F_WRONLY) -static int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, -struct bpf_prog *old,u32 which);static struct sk_psock_progs *sock_map_progs (struct bpf_map *map);static struct bpf_map *sock_map_alloc (union bpf_attr *attr)@@ -1488,8 +1486,8 @@ static int sock_map_prog_lookup(struct bpf_map *map, struct bpf_prog ***pprog,return 0 ; } -static int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, -struct bpf_prog *old,u32 which) +int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, +struct bpf_prog *old,u32 which) {struct bpf_prog **pprog;int ret;tools/include/uapi/linux/bpf.h +5
-0@@ -1129,6 +1129,7 @@ enum bpf_link_type {BPF_LINK_TYPE_TCX =11 ,BPF_LINK_TYPE_UPROBE_MULTI =12 ,BPF_LINK_TYPE_NETKIT =13 , +BPF_LINK_TYPE_SK_MSG =14 , __MAX_BPF_LINK_TYPE, };@@ -6699,6 +6700,10 @@ struct bpf_link_info {__u32 ifindex;__u32 attach_type; } netkit; +struct { +__u32 map_id; +__u32 attach_type; + } skmsg; }; } __attribute__((aligned(8)));Signature · 1 line
2.43.0
Yonghong Song
reviewerRe: [RFC PATCH bpf-next 1/5] bpf: Add link support for sk_msg prog
Quoted 39 lines · Jiri Olsa
On Tue, Mar 05, 2024 at 12:22:00PM -0800, Yonghong Song wrote:
SNIP
Quoted 35 lines
net/core/skmsg.c +35
-0+ +int bpf_skmsg_link_create (const union bpf_attr *attr,struct bpf_prog *prog) +{ +struct bpf_link_primer link_primer; +struct bpf_skmsg_link *skmsg_link; +enum bpf_attach_type attach_type; +struct bpf_map *map; +int ret; + +if (attr->link_create.flags) +return -EINVAL ; + + map =bpf_map_get_with_uref (attr->link_create.target_fd); +if (IS_ERR (map)) +return PTR_ERR (map); + + skmsg_link =kzalloc (sizeof (*skmsg_link),GFP_USER ); +if (!skmsg_link) { + ret = -ENOMEM ; + goto out; + } + + attach_type = attr->link_create.attach_type; +bpf_link_init (&skmsg_link->link,BPF_LINK_TYPE_SK_MSG , &bpf_skmsg_link_ops, prog); + skmsg_link->map = map; + skmsg_link->attach_type = attach_type; + + ret =bpf_link_prime (&skmsg_link->link, &link_primer); +if (ret) { +kfree (skmsg_link); + goto out; + } + + ret =sock_map_prog_update (map, prog,NULL , attach_type); +if (ret) {
Quoted 8 lines
net/core/skmsg.c void sk_psock_stop_verdict(struct sock *sk, struct sk_psock *psock) · line 1404
Quoted 5 lines
net/core/skmsg.c +5
-0+bpf_link_cleanup (&link_primer); + goto out; + } + +bpf_prog_inc (prog);there's already prog ref taken in
link_create, is this needed? also I might be missing some skmsg logic, but I can't see thi being released
Here, we are trying to do create/attach.
The prog reference count will be decremented during detach (sock_map_prog_detach), so we need to increase prog ref count here.
Another thing, it is possible a attached prog is swapped out. In current implementation, ref count will be decremented for the prog swapped out. So increasing ref count for prog here is needed to balance that ref count decrement.
Quoted 10 lines
jirka
Quoted 7 lines
net/core/skmsg.c +7
-0+ +return bpf_link_settle (&link_primer); + +out: +bpf_map_put_with_uref (map); +return ret; +}
[...]
Yonghong Song
reviewerRFC PATCH 2/5 libbpf: Refactor bpf_program_attach_fd()
In reply to Yonghong SongRefactor function bpf_program_attach_fd() to provide a helper function which has attach_type as one of input parameters. This will make later libbpf change easier to understand.
--- tools/lib/bpf/libbpf.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
tools/lib/bpf/libbpf.c +13 -5
@@ -12151,11 +12151,10 @@ static int attach_lsm(const struct bpf_program *prog, long cookie, struct bpf_li }static struct bpf_link * -bpf_program_attach_fd (const struct bpf_program *prog, -int target_fd,const char *target_name, -const struct bpf_link_create_opts *opts) +__bpf_program_attach_fd (const struct bpf_program *prog,int target_fd, +enum bpf_attach_type attach_type,const char *target_name, +const struct bpf_link_create_opts *opts) { -enum bpf_attach_type attach_type;char errmsg[STRERR_BUFSIZE ];struct bpf_link *link;int prog_fd, link_fd;
@@ -12171,7 +12170,6 @@ bpf_program_attach_fd(const struct bpf_program *prog,return libbpf_err_ptr (-ENOMEM ); link->detach = &bpf_link__detach_fd; - attach_type =bpf_program__expected_attach_type (prog); link_fd =bpf_link_create (prog_fd, target_fd, attach_type, opts);if (link_fd <0 ) { link_fd = -errno;
@@ -12185,6 +12183,16 @@ bpf_program_attach_fd(const struct bpf_program *prog,return link; } +static struct bpf_link * +bpf_program_attach_fd (const struct bpf_program *prog, +int target_fd,const char *target_name, +const struct bpf_link_create_opts *opts) +{ +return __bpf_program_attach_fd (prog, target_fd, +bpf_program__expected_attach_type (prog), + target_name, opts); +} +struct bpf_link *bpf_program__attach_cgroup (const struct bpf_program *prog,int cgroup_fd) {
Signature · 1 line
2.43.0
Re: [RFC PATCH bpf-next 2/5] libbpf: Refactor bpf_program_attach_fd()
Quoted 15 lines · Yonghong Song
Refactor function
bpf_program_attach_fd()to provide a helper function which hasattach_typeas one of input parameters. This will make later libbpf change easier to understand.Signed-off-by Yonghong Song <[email protected]>--- tools/lib/bpf/libbpf.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)tools/lib/bpf/libbpf.c +0
-0
tools/lib/bpf/libbpf.c static int attach_lsm(const struct bpf_program *prog, long cookie, struct bpf_li · line 12154
Quoted 7 lines
tools/lib/bpf/libbpf.c +1
-3@@ -12151,11 +12151,10 @@ static int attach_lsm(const struct bpf_program *prog, long cookie, struct bpf_li }static struct bpf_link * -bpf_program_attach_fd (const struct bpf_program *prog, -int target_fd,const char *target_name, -const struct bpf_link_create_opts *opts) +__bpf_program_attach_fd(const struct bpf_program *prog, int target_fd,
I hope we won't need this patch at all (see my comment on later patch), but if we do need to do this refactoring then a) let's not used underscore-prefixed names, this is not a common practice in libbpf code base and b) I think we can just update all callers of bpf_program_attach_fd() to pass attach_type directly, there are just 6 of them.
Quoted 35 lines
tools/lib/bpf/libbpf.c +12
-3+ enum bpf_attach_type attach_type, const char *target_name, + const struct bpf_link_create_opts *opts) { -enum bpf_attach_type attach_type; char errmsg[STRERR_BUFSIZE];struct bpf_link *link;int prog_fd, link_fd;@@ -12171,7 +12170,6 @@ bpf_program_attach_fd(const struct bpf_program *prog,return libbpf_err_ptr (-ENOMEM ); link->detach = &bpf_link__detach_fd; - attach_type =bpf_program__expected_attach_type (prog); link_fd =bpf_link_create (prog_fd, target_fd, attach_type, opts);if (link_fd <0 ) { link_fd = -errno;@@ -12185,6 +12183,16 @@ bpf_program_attach_fd(const struct bpf_program *prog,return link; } +static struct bpf_link * +bpf_program_attach_fd (const struct bpf_program *prog, +int target_fd,const char *target_name, +const struct bpf_link_create_opts *opts) +{ +return __bpf_program_attach_fd (prog, target_fd, +bpf_program__expected_attach_type (prog), + target_name, opts); +} +struct bpf_link *bpf_program__attach_cgroup (const struct bpf_program *prog,int cgroup_fd) { --2.43.0
Yonghong Song
reviewerRe: [RFC PATCH bpf-next 2/5] libbpf: Refactor bpf_program_attach_fd()
Quoted 17 lines · Andrii Nakryiko
Quoted 16 lines · Yonghong Song
Refactor function
bpf_program_attach_fd()to provide a helper function which hasattach_typeas one of input parameters. This will make later libbpf change easier to understand.Signed-off-by Yonghong Song <[email protected]>--- tools/lib/bpf/libbpf.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)tools/lib/bpf/libbpf.c +0
-0@@ -12151,11 +12151,10 @@ static int attach_lsm(const struct bpf_program *prog, long cookie, struct bpf_li }
Quoted 11 lines
tools/lib/bpf/libbpf.c static int attach_lsm(const struct bpf_program *prog, long cookie, struct bpf_li · line 12154
Quoted 5 lines
tools/lib/bpf/libbpf.c +1
-3static struct bpf_link * -bpf_program_attach_fd (const struct bpf_program *prog, -int target_fd,const char *target_name, -const struct bpf_link_create_opts *opts) +__bpf_program_attach_fd(const struct bpf_program *prog, int target_fd,I hope we won't need this patch at all (see my comment on later patch), but if we do need to do this refactoring then a) let's not used underscore-prefixed names, this is not a common practice in libbpf code base and b) I think we can just update all callers of
bpf_program_attach_fd()to passattach_typedirectly, there are just 6 of them.
I thought about this 'update all callers of bpf_program_attach_fd ' but did not do that since it needs to update all callers. But since you suggest this I certainly can do this.
Quoted 36 lines
Quoted 36 lines
tools/lib/bpf/libbpf.c +12
-3+ enum bpf_attach_type attach_type, const char *target_name, + const struct bpf_link_create_opts *opts) { -enum bpf_attach_type attach_type; char errmsg[STRERR_BUFSIZE];struct bpf_link *link;int prog_fd, link_fd;@@ -12171,7 +12170,6 @@ bpf_program_attach_fd(const struct bpf_program *prog,return libbpf_err_ptr (-ENOMEM ); link->detach = &bpf_link__detach_fd; - attach_type =bpf_program__expected_attach_type (prog); link_fd =bpf_link_create (prog_fd, target_fd, attach_type, opts);if (link_fd <0 ) { link_fd = -errno;@@ -12185,6 +12183,16 @@ bpf_program_attach_fd(const struct bpf_program *prog,return link; } +static struct bpf_link * +bpf_program_attach_fd (const struct bpf_program *prog, +int target_fd,const char *target_name, +const struct bpf_link_create_opts *opts) +{ +return __bpf_program_attach_fd (prog, target_fd, +bpf_program__expected_attach_type (prog), + target_name, opts); +} +struct bpf_link *bpf_program__attach_cgroup (const struct bpf_program *prog,int cgroup_fd) { --2.43.0
Yonghong Song
reviewerRFC PATCH 3/5 libbpf: Add link support for BPF_PROG_TYPE_SK_MSG
In reply to Yonghong SongIntroduce a libbpf API bpf_program__attach_sk_msg() which allows user to get a bpf_link. The API makes auto-deletion easier and also allows user space application easier as link based APIs are used for all programs.
--- tools/lib/bpf/libbpf.c | 8 ++++++++ tools/lib/bpf/libbpf.h | 3 +++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 12 insertions(+)
tools/lib/bpf/libbpf.c +8 -0
@@ -149,6 +149,7 @@ static const char * const link_type_name[] = { [BPF_LINK_TYPE_TCX] = "tcx", [BPF_LINK_TYPE_UPROBE_MULTI] = "uprobe_multi", [BPF_LINK_TYPE_NETKIT] = "netkit", + [BPF_LINK_TYPE_SK_MSG] = "sk_msg", };static const char *const map_type_name[] = {
@@ -12280,6 +12281,13 @@ bpf_program__attach_netkit(const struct bpf_program *prog, int ifindex,return bpf_program_attach_fd (prog, ifindex,"netkit" , &link_create_opts); } +struct bpf_link * +bpf_program__attach_sk_msg (const struct bpf_program *prog,int map_fd, +enum bpf_attach_type attach_type) +{ +return __bpf_program_attach_fd (prog, map_fd, attach_type,"sk_msg" ,NULL ); +} +struct bpf_link *bpf_program__attach_freplace (const struct bpf_program *prog,int target_fd,const char *attach_func_name)
tools/lib/bpf/libbpf.h +3 -0
@@ -786,6 +786,9 @@ bpf_program__attach_netns(const struct bpf_program *prog, int netns_fd); LIBBPF_API struct bpf_link *bpf_program__attach_xdp (const struct bpf_program *prog,int ifindex); LIBBPF_API struct bpf_link * +bpf_program__attach_sk_msg (const struct bpf_program *prog,int map_fd, +enum bpf_attach_type attach_type); +LIBBPF_API struct bpf_link *bpf_program__attach_freplace (const struct bpf_program *prog,int target_fd,const char *attach_func_name);
tools/lib/bpf/libbpf.map +1 -0
@@ -410,6 +410,7 @@ LIBBPF_1.3.0 { LIBBPF_1.4.0 { global: + bpf_program__attach_sk_msg; bpf_token_create; btf__new_split; btf_ext__raw_data;
Signature · 1 line
2.43.0
Re: [RFC PATCH bpf-next 3/5] libbpf: Add link support for BPF_PROG_TYPE_SK_MSG
Quoted 26 lines · Yonghong Song
Introduce a libbpf API
bpf_program__attach_sk_msg()which allows user to get abpf_link. The API makes auto-deletion easier and also allows user space application easier as link based APIs are used for all programs.Signed-off-by Yonghong Song <[email protected]>--- tools/lib/bpf/libbpf.c | 8 ++++++++ tools/lib/bpf/libbpf.h | 3 +++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 12 insertions(+)tools/lib/bpf/libbpf.c +1
-0@@ -149,6 +149,7 @@ static const char * const link_type_name[] = { [BPF_LINK_TYPE_TCX] = "tcx", [BPF_LINK_TYPE_UPROBE_MULTI] = "uprobe_multi", [BPF_LINK_TYPE_NETKIT] = "netkit", + [BPF_LINK_TYPE_SK_MSG] = "sk_msg", };static const char *const map_type_name[] = {
tools/lib/bpf/libbpf.c bpf_program__attach_netkit(const struct bpf_program *prog, int ifindex, · line 12286
Quoted 6 lines
tools/lib/bpf/libbpf.c +3
-0@@ -12280,6 +12281,13 @@ bpf_program__attach_netkit(const struct bpf_program *prog, int ifindex,return bpf_program_attach_fd (prog, ifindex,"netkit" , &link_create_opts); } +struct bpf_link * +bpf_program__attach_sk_msg (const struct bpf_program *prog,int map_fd, +enum bpf_attach_type attach_type)
Why do we need to allow users to override attach_type? Why can't it come from bpf_program's expected attach type?
Quoted 36 lines
tools/lib/bpf/libbpf.c +4
-0+{ +return __bpf_program_attach_fd (prog, map_fd, attach_type,"sk_msg" ,NULL ); +} +struct bpf_link *bpf_program__attach_freplace (const struct bpf_program *prog,int target_fd,const char *attach_func_name)tools/lib/bpf/libbpf.h +3
-0@@ -786,6 +786,9 @@ bpf_program__attach_netns(const struct bpf_program *prog, int netns_fd); LIBBPF_API struct bpf_link *bpf_program__attach_xdp (const struct bpf_program *prog,int ifindex); LIBBPF_API struct bpf_link * +bpf_program__attach_sk_msg (const struct bpf_program *prog,int map_fd, +enum bpf_attach_type attach_type); +LIBBPF_API struct bpf_link *bpf_program__attach_freplace (const struct bpf_program *prog,int target_fd,const char *attach_func_name);tools/lib/bpf/libbpf.map +1
-1@@ -410,6 +410,7 @@ LIBBPF_1.3.0 { LIBBPF_1.4.0 { global: + bpf_program__attach_sk_msg; bpf_token_create; btf__new_split; btf_ext__raw_data; --2.43.0
Yonghong Song
reviewerRe: [RFC PATCH bpf-next 3/5] libbpf: Add link support for BPF_PROG_TYPE_SK_MSG
Quoted 29 lines · Andrii Nakryiko
Quoted 28 lines · Yonghong Song
Introduce a libbpf API
bpf_program__attach_sk_msg()which allows user to get abpf_link. The API makes auto-deletion easier and also allows user space application easier as link based APIs are used for all programs.Signed-off-by Yonghong Song <[email protected]>--- tools/lib/bpf/libbpf.c | 8 ++++++++ tools/lib/bpf/libbpf.h | 3 +++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 12 insertions(+)tools/lib/bpf/libbpf.c +1
-0@@ -149,6 +149,7 @@ static const char * const link_type_name[] = { [BPF_LINK_TYPE_TCX] = "tcx", [BPF_LINK_TYPE_UPROBE_MULTI] = "uprobe_multi", [BPF_LINK_TYPE_NETKIT] = "netkit", + [BPF_LINK_TYPE_SK_MSG] = "sk_msg", };static const char *const map_type_name[] = {@@ -12280,6 +12281,13 @@ bpf_program__attach_netkit(const struct bpf_program *prog, int ifindex,return bpf_program_attach_fd (prog, ifindex,"netkit" , &link_create_opts); }
Quoted 5 lines
tools/lib/bpf/libbpf.c bpf_program__attach_netkit(const struct bpf_program *prog, int ifindex, · line 12286
Quoted 3 lines
tools/lib/bpf/libbpf.c +3
-0+struct bpf_link * +bpf_program__attach_sk_msg (const struct bpf_program *prog,int map_fd, +enum bpf_attach_type attach_type)Why do we need to allow users to override
attach_type? Why can't it come from bpf_program's expected attach type?
The interface is similar to previously used bpf_prog_attach(), but you are right that this may not be needed. Let me double check.
Quoted 37 lines
Quoted 37 lines
tools/lib/bpf/libbpf.c +4
-0+{ +return __bpf_program_attach_fd (prog, map_fd, attach_type,"sk_msg" ,NULL ); +} +struct bpf_link *bpf_program__attach_freplace (const struct bpf_program *prog,int target_fd,const char *attach_func_name)tools/lib/bpf/libbpf.h +3
-0@@ -786,6 +786,9 @@ bpf_program__attach_netns(const struct bpf_program *prog, int netns_fd); LIBBPF_API struct bpf_link *bpf_program__attach_xdp (const struct bpf_program *prog,int ifindex); LIBBPF_API struct bpf_link * +bpf_program__attach_sk_msg (const struct bpf_program *prog,int map_fd, +enum bpf_attach_type attach_type); +LIBBPF_API struct bpf_link *bpf_program__attach_freplace (const struct bpf_program *prog,int target_fd,const char *attach_func_name);tools/lib/bpf/libbpf.map +1
-1@@ -410,6 +410,7 @@ LIBBPF_1.3.0 { LIBBPF_1.4.0 { global: + bpf_program__attach_sk_msg; bpf_token_create; btf__new_split; btf_ext__raw_data; --2.43.0
Yonghong Song
reviewerRFC PATCH 4/5 bpftool: Add link dump support for BPF_LINK_TYPE_SK_MSG
In reply to Yonghong SongAn example output looks like:
9: sk_msg prog 108
map_id 84 attach_type sk_msg_verdict
--- tools/bpf/bpftool/link.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/bpf/bpftool/link.c +8 -0
@@ -526,6 +526,9 @@ static int show_link_close_json(int fd, struct bpf_link_info *info)show_link_ifindex_json (info->netkit.ifindex, json_wtr);show_link_attach_type_json (info->netkit.attach_type, json_wtr);break ; +case BPF_LINK_TYPE_SK_MSG : +jsonw_uint_field (json_wtr,"map_id" , info->skmsg.map_id); +show_link_attach_type_json (info->skmsg.attach_type, json_wtr);case BPF_LINK_TYPE_XDP :show_link_ifindex_json (info->xdp.ifindex, json_wtr);break ;
@@ -915,6 +918,11 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info)show_link_ifindex_plain (info->netkit.ifindex);show_link_attach_type_plain (info->netkit.attach_type);break ; +case BPF_LINK_TYPE_SK_MSG : +printf ("\n\t" ); +printf ("map_id %u " , info->skmsg.map_id); +show_link_attach_type_plain (info->skmsg.attach_type); +break ;case BPF_LINK_TYPE_XDP :printf ("\n\t" );show_link_ifindex_plain (info->xdp.ifindex);
Signature · 1 line
2.43.0
Jakub Sitnicki
maintainerRe: [RFC PATCH bpf-next 4/5] bpftool: Add link dump support for BPF_LINK_TYPE_SK_MSG
Quoted 14 lines · Yonghong Song
An example output looks like:
9:sk_msgprog 108
map_id84attach_typesk_msg_verdictSigned-off-by Yonghong Song <[email protected]>--- tools/bpf/bpftool/link.c | 8 ++++++++ 1 file changed, 8 insertions(+)tools/bpf/bpftool/link.c +0
-0
tools/bpf/bpftool/link.c static int show_link_close_json(int fd, struct bpf_link_info *info) · line 531
Quoted 6 lines
tools/bpf/bpftool/link.c +3
-0@@ -526,6 +526,9 @@ static int show_link_close_json(int fd, struct bpf_link_info *info)show_link_ifindex_json (info->netkit.ifindex, json_wtr);show_link_attach_type_json (info->netkit.attach_type, json_wtr);break ; +case BPF_LINK_TYPE_SK_MSG : +jsonw_uint_field (json_wtr,"map_id" , info->skmsg.map_id); +show_link_attach_type_json (info->skmsg.attach_type, json_wtr);
Compiler says - missing break.
Quoted 15 lines
tools/bpf/bpftool/link.c +5
-0case BPF_LINK_TYPE_XDP :show_link_ifindex_json (info->xdp.ifindex, json_wtr);break ;@@ -915,6 +918,11 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info)show_link_ifindex_plain (info->netkit.ifindex);show_link_attach_type_plain (info->netkit.attach_type);break ; +case BPF_LINK_TYPE_SK_MSG : +printf ("\n\t" ); +printf ("map_id %u " , info->skmsg.map_id); +show_link_attach_type_plain (info->skmsg.attach_type); +break ;case BPF_LINK_TYPE_XDP :printf ("\n\t" );show_link_ifindex_plain (info->xdp.ifindex);
Yonghong Song
reviewerRe: [RFC PATCH bpf-next 4/5] bpftool: Add link dump support for BPF_LINK_TYPE_SK_MSG
Quoted 10 lines · Jakub Sitnicki
Quoted 9 lines · Yonghong Song
An example output looks like:
9:sk_msgprog 108
map_id84attach_typesk_msg_verdictSigned-off-by Yonghong Song <[email protected]>--- tools/bpf/bpftool/link.c | 8 ++++++++ 1 file changed, 8 insertions(+)
Quoted 12 lines
tools/bpf/bpftool/link.c static int show_link_close_json(int fd, struct bpf_link_info *info) · line 531
Quoted 11 lines
tools/bpf/bpftool/link.c +3
-0@@ -526,6 +526,9 @@ static int show_link_close_json(int fd, struct bpf_link_info *info)show_link_ifindex_json (info->netkit.ifindex, json_wtr);show_link_attach_type_json (info->netkit.attach_type, json_wtr);break ; +case BPF_LINK_TYPE_SK_MSG : +jsonw_uint_field (json_wtr,"map_id" , info->skmsg.map_id); +show_link_attach_type_json (info->skmsg.attach_type, json_wtr);Compiler says - missing break.
Ack, will fix.
Quoted 16 lines
Quoted 16 lines
tools/bpf/bpftool/link.c +5
-0case BPF_LINK_TYPE_XDP :show_link_ifindex_json (info->xdp.ifindex, json_wtr);break ;@@ -915,6 +918,11 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info)show_link_ifindex_plain (info->netkit.ifindex);show_link_attach_type_plain (info->netkit.attach_type);break ; +case BPF_LINK_TYPE_SK_MSG : +printf ("\n\t" ); +printf ("map_id %u " , info->skmsg.map_id); +show_link_attach_type_plain (info->skmsg.attach_type); +break ;case BPF_LINK_TYPE_XDP :printf ("\n\t" );show_link_ifindex_plain (info->xdp.ifindex);
Yonghong Song
reviewerRFC PATCH 5/5 selftests/bpf: Add some tests with new bpf_program__attach_sk_msg() API
In reply to Yonghong SongIn sockmap_basic.c and sockmap_listen.c, there are a few tests dealing with BPF_PROG_TYPE_SK_MSG and those tests are using prog attach/detach. This patch added new tests by copying the original corresponding tests but using bpf_program__attach_sk_msg() and bpf_link__detach() APIs.
All tests are passed.
--- .../selftests/bpf/prog_tests/sockmap_basic.c | 27 +++++++++++++ .../selftests/bpf/prog_tests/sockmap_listen.c | 38 +++++++++++++++++++ 2 files changed, 65 insertions(+)
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +27 -0
@@ -131,6 +131,29 @@ static void test_skmsg_helpers(enum bpf_map_type map_type)test_skmsg_load_helpers__destroy (skel); } +static void test_skmsg_helpers_with_link (enum bpf_map_type map_type) +{ +struct test_skmsg_load_helpers *skel; +struct bpf_program *prog; +struct bpf_link *link; +int map; + + skel =test_skmsg_load_helpers__open_and_load (); +if (!ASSERT_OK_PTR (skel,"test_skmsg_load_helpers__open_and_load" )) +return ; + + prog = skel->progs.prog_msg_verdict; + map =bpf_map__fd (skel->maps.sock_map); + + link =bpf_program__attach_sk_msg (prog, map,BPF_SK_MSG_VERDICT ); +if (!ASSERT_OK_PTR (link,"bpf_program__attach_sk_msg" )) + goto out; + +close (bpf_link__fd (link)); +out: +test_skmsg_load_helpers__destroy (skel); +} +static void test_sockmap_update (enum bpf_map_type map_type) {int err, prog, src;
@@ -812,4 +835,8 @@ void test_sockmap_basic(void)test_sockmap_many_maps ();if (test__start_subtest ("sockmap same socket replace" ))test_sockmap_same_sock (); +if (test__start_subtest ("sockmap sk_msg attach helpers with link" )) +test_skmsg_helpers_with_link (BPF_MAP_TYPE_SOCKMAP ); +if (test__start_subtest ("sockhash sk_msg attach helpers with link" )) +test_skmsg_helpers_with_link (BPF_MAP_TYPE_SOCKHASH ); }
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +38 -0
@@ -767,6 +767,24 @@ static void test_msg_redir_to_connected(struct test_sockmap_listen *skel,xbpf_prog_detach2 (verdict, sock_map,BPF_SK_MSG_VERDICT ); } +static void test_msg_redir_to_connected_with_link (struct test_sockmap_listen *skel, +struct bpf_map *inner_map,int family, +int sotype) +{ +struct bpf_program *verdict = skel->progs.prog_msg_verdict; +int verdict_map =bpf_map__fd (skel->maps.verdict_map); +int sock_map =bpf_map__fd (inner_map); +struct bpf_link *link; + + link =bpf_program__attach_sk_msg (verdict, sock_map,BPF_SK_MSG_VERDICT ); +if (!ASSERT_OK_PTR (link,"bpf_program__attach_sk_msg" )) +return ; + +redir_to_connected (family, sotype, sock_map, verdict_map,REDIR_EGRESS ); + +close (bpf_link__fd (link)); +} +static void redir_to_listening (int family,int sotype,int sock_mapfd,int verd_mapfd,enum redir_mode mode) {
@@ -869,6 +887,24 @@ static void test_msg_redir_to_listening(struct test_sockmap_listen *skel,xbpf_prog_detach2 (verdict, sock_map,BPF_SK_MSG_VERDICT ); } +static void test_msg_redir_to_listening_with_link (struct test_sockmap_listen *skel, +struct bpf_map *inner_map,int family, +int sotype) +{ +struct bpf_program *verdict = skel->progs.prog_msg_verdict; +int verdict_map =bpf_map__fd (skel->maps.verdict_map); +int sock_map =bpf_map__fd (inner_map); +struct bpf_link *link; + + link =bpf_program__attach_sk_msg (verdict, sock_map,BPF_SK_MSG_VERDICT ); +if (!ASSERT_OK_PTR (link,"bpf_program__attach_sk_msg" )) +return ; + +redir_to_listening (family, sotype, sock_map, verdict_map,REDIR_EGRESS ); + +close (bpf_link__fd (link)); +} +static void redir_partial (int family,int sotype,int sock_map,int parser_map) {int s, c0 =-1 , c1 =-1 , p0 =-1 , p1 =-1 ;
@@ -1316,7 +1352,9 @@ static void test_redir(struct test_sockmap_listen *skel, struct bpf_map *map,TEST (test_skb_redir_to_listening),TEST (test_skb_redir_partial),TEST (test_msg_redir_to_connected), +TEST (test_msg_redir_to_connected_with_link),TEST (test_msg_redir_to_listening), + TEST(test_msg_redir_to_listening_with_link), };const char *family_name, *map_name;const struct redir_test *t;
Signature · 1 line
2.43.0
John Fastabend
maintainerQuoted 11 lines · Yonghong Song
One of our internal services started to use
sk_msgprogram and currently it used existing prog attach/detach2 as demonstrated in selftests. But attach/detach of all other bpf programs are based onbpf_link. Consistent attach/detach APIs for all programs will make things easy to undersand and less error prone. So this patch addedbpf_linksupport forBPF_PROG_TYPE_SK_MSG.I marked the patch as RFC as not all functionality are covered by tests yet, e.g.
update_prog(). Maybe somebody can suggest an existing test which I can look into.
Or maybe some other tests need to be added as well.
Agree this was missing it will be nice to get this merged. The links are much nicer to deal with.
Yonghong Song
reviewerQuoted 8 lines · John Fastabend
Quoted 7 lines · Yonghong Song
One of our internal services started to use
sk_msgprogram and currently it used existing prog attach/detach2 as demonstrated in selftests. But attach/detach of all other bpf programs are based onbpf_link. Consistent attach/detach APIs for all programs will make things easy to undersand and less error prone. So this patch addedbpf_linksupport forBPF_PROG_TYPE_SK_MSG.
Quoted 6 lines
Quoted 4 lines
I marked the patch as RFC as not all functionality are covered by tests yet, e.g.
update_prog(). Maybe somebody can suggest an existing test which I can look into.
Or maybe some other tests need to be added as well.Agree this was missing it will be nice to get this merged. The links are much nicer to deal with.
Agree that bpf_link is better as proved by other cases. It would be great if you can take a look at the patch set and let me any issues, missing cases, missing tests, etc. Thanks!
Jakub Sitnicki
maintainerQuoted 11 lines · Yonghong Song
One of our internal services started to use
sk_msgprogram and currently it used existing prog attach/detach2 as demonstrated in selftests. But attach/detach of all other bpf programs are based onbpf_link. Consistent attach/detach APIs for all programs will make things easy to undersand and less error prone. So this patch addedbpf_linksupport forBPF_PROG_TYPE_SK_MSG.I marked the patch as RFC as not all functionality are covered by tests yet, e.g.
update_prog(). Maybe somebody can suggest an existing test which I can look into.
Or maybe some other tests need to be added as well.
I have a general remark, not specific to this work.
We can't attach with links from CLI, apart from when auto-attach is supported. bpftool prog attach doesn't use bpf links. For instance:
bpftool prog attach \
pinned /sys/fs/bpf/test/sk_msg_prog \
sk_msg_verdict \
pinned /sys/fs/bpf/test/sock_mapIs there a plan for the CLI tooling to support it?
Yonghong Song
reviewerQuoted 17 lines · Jakub Sitnicki
Quoted 11 lines · Yonghong Song
One of our internal services started to use
sk_msgprogram and currently it used existing prog attach/detach2 as demonstrated in selftests. But attach/detach of all other bpf programs are based onbpf_link. Consistent attach/detach APIs for all programs will make things easy to undersand and less error prone. So this patch addedbpf_linksupport forBPF_PROG_TYPE_SK_MSG.I marked the patch as RFC as not all functionality are covered by tests yet, e.g.
update_prog(). Maybe somebody can suggest an existing test which I can look into.
Or maybe some other tests need to be added as well.I have a general remark, not specific to this work.
We can't attach with links from CLI, apart from when auto-attach is supported.
bpftool prog attachdoesn't use bpf links. For instance:
Quoted 6 lines
bpftool prog attach \ pinned /sys/fs/bpf/test/sk_msg_prog \ sk_msg_verdict \ pinned /sys/fs/bpf/test/sock_mapIs there a plan for the CLI tooling to support it?
As far as I know, there is no plan to support this. Of course, somebody could try to implement this ...
Jakub Sitnicki
maintainerOn Tue, Mar 05, 2024 at 12:21 PM -08, Yonghong Song wrote:
[...]
Quoted 4 lines
I marked the patch as RFC as not all functionality are covered by tests yet, e.g.
update_prog(). Maybe somebody can suggest an existing test which I can look into.
Or maybe some other tests need to be added as well.
Looks like we don't have prog update covered today. That would be something to add to sockmap_basic suite.