Skip to contentSkip to conversation

bpf_trace: bail out from bpf_kprobe_multi_link_attach when in compat

PATCH In review Eugene Syromiatnikov 3 participants 5 messages May 6, 2022 – May 16, 2022

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf_trace: bail out from bpf_kprobe_multi_link_attach when in compat

Since bpf_kprobe_multi_link_attach doesn't support 32-bit kernels for whatever reason, having it enabled for compat processes on 64-bit kernels makes even less sense due to discrepances in the type sizes that it does not handle.

Fixes 0dcac272540613d4 ("bpf: Add multi kprobe link")
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/bpf_trace.c +1 -1
index d8553f4..9560af6 100644
@@ -2410,7 +2410,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
 	int err;
 
 	/* no support for 32bit archs yet */
-	if (sizeof(u64) != sizeof(void *))
+	if (sizeof(u64) != sizeof(void *) || in_compat_syscall())
 		return -EOPNOTSUPP;
 
 	if (prog->expected_attach_type != BPF_TRACE_KPROBE_MULTI)
Signature · 1 line
2.1.4
#1 lore raw
Quoted 3 lines · Eugene Syromiatnikov

Since bpf_kprobe_multi_link_attach doesn't support 32-bit kernels for whatever reason,

Jiri,
why did you add this restriction?

Quoted 3 lines

having it enabled for compat processes on 64-bit
kernels makes even less sense due to discrepances in the type sizes that it does not handle.

I don't follow this logic.
bpf progs are always 64-bit. Even when user space is 32-bit. Jiri's check is for the kernel.

Quoted 22 lines
Fixes 0dcac272540613d4 ("bpf: Add multi kprobe link")
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/bpf_trace.c +1 -2
index d8553f4..9560af6 100644
@@ -2410,7 +2410,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
        int err;
 
        /* no support for 32bit archs yet */
-       if (sizeof(u64) != sizeof(void *))
+       if (sizeof(u64) != sizeof(void *) || in_compat_syscall())
                return -EOPNOTSUPP;
 
        if (prog->expected_attach_type != BPF_TRACE_KPROBE_MULTI)
--

2.1.4

#2 lore raw
Quoted 8 lines · Alexei Starovoitov
Quoted 3 lines · Eugene Syromiatnikov

Since bpf_kprobe_multi_link_attach doesn't support 32-bit kernels for whatever reason,

Jiri,
why did you add this restriction?

Quoted 7 lines
Quoted 3 lines

having it enabled for compat processes on 64-bit
kernels makes even less sense due to discrepances in the type sizes that it does not handle.

I don't follow this logic.
bpf progs are always 64-bit. Even when user space is 32-bit. Jiri's check is for the kernel.

The interface as defined (and implemented in libbpf) expects arrays of userspace pointers to be passed (for example, syms points to an array of userspace pointers—character strings; same goes for addrs, but with generic userspace pointers) without regard to possible difference in the pointer size in case of compat userspace.

Quoted 23 lines
Quoted 22 lines
Fixes 0dcac272540613d4 ("bpf: Add multi kprobe link")
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/bpf_trace.c +1 -2
index d8553f4..9560af6 100644
@@ -2410,7 +2410,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
        int err;
 
        /* no support for 32bit archs yet */
-       if (sizeof(u64) != sizeof(void *))
+       if (sizeof(u64) != sizeof(void *) || in_compat_syscall())
                return -EOPNOTSUPP;
 
        if (prog->expected_attach_type != BPF_TRACE_KPROBE_MULTI)
--

2.1.4

#3 lore raw
Quoted 18 lines · Eugene Syromiatnikov
Quoted 8 lines · Alexei Starovoitov
Quoted 3 lines · Eugene Syromiatnikov

Since bpf_kprobe_multi_link_attach doesn't support 32-bit kernels for whatever reason,

Jiri,
why did you add this restriction?

Quoted 7 lines
Quoted 3 lines

having it enabled for compat processes on 64-bit
kernels makes even less sense due to discrepances in the type sizes that it does not handle.

I don't follow this logic.
bpf progs are always 64-bit. Even when user space is 32-bit. Jiri's check is for the kernel.

Quoted 5 lines

The interface as defined (and implemented in libbpf) expects arrays of userspace pointers to be passed (for example, syms points to an array of userspace pointers—character strings; same goes for addrs, but with generic userspace pointers) without regard to possible difference in the pointer size in case of compat userspace.

I see. So kprobe_multi.syms and kprobe_multi.addrs will be 'long' and 32-bit user space will have an issue with the 64-bit kernel. Let's fix it properly.
We can remove sizeof(u64) != sizeof(void *) and keep libbpf as-is by keeping syms and addrs 'long' in uapi.
As far as I can see 32-bit user space on a 32-bit kernel should work with existing code.
in_compat_syscall() can be used to extend addrs/syms.

#4 lore raw
Quoted 10 lines · Alexei Starovoitov
Quoted 9 lines · Eugene Syromiatnikov
Quoted 7 lines · Alexei Starovoitov
Quoted 3 lines · Eugene Syromiatnikov

Since bpf_kprobe_multi_link_attach doesn't support 32-bit kernels for whatever reason,

Jiri,
why did you add this restriction?

sorry, I overlooked this email

the reason for that check is that we link addrs array with cookies which are u64 and we need to swap cookies together with addrs when we sort them

but now when I look at that, that could perhaps work event if unsigned long is 32 bits, will check

Quoted 15 lines
Quoted 9 lines
Quoted 8 lines
Quoted 4 lines

having it enabled for compat processes on 64-bit
kernels makes even less sense due to discrepances in the type sizes that it does not handle.

I don't follow this logic.
bpf progs are always 64-bit. Even when user space is 32-bit. Jiri's check is for the kernel.

Quoted 5 lines

The interface as defined (and implemented in libbpf) expects arrays of userspace pointers to be passed (for example, syms points to an array of userspace pointers—character strings; same goes for addrs, but with generic userspace pointers) without regard to possible difference in the pointer size in case of compat userspace.

Quoted 8 lines

I see. So kprobe_multi.syms and kprobe_multi.addrs will be 'long' and 32-bit user space will have an issue with the 64-bit kernel. Let's fix it properly.
We can remove sizeof(u64) != sizeof(void *) and keep libbpf as-is by keeping syms and addrs 'long' in uapi.
As far as I can see 32-bit user space on a 32-bit kernel should work with existing code.
in_compat_syscall() can be used to extend addrs/syms.

I'll check Eugene's new patchset

jirka