Re: [PATCH 6.8 000/715] 6.8.2-rc1 review

Holger Hoffstätte
2024-03-25T11:33:41Z

On 2024-03-24 23:22, Sasha Levin wrote:
>
> This is the start of the stable review cycle for the 6.8.2 release.
> There are 715 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.

Applying the patch to 6.8.1 quickly fails the build of a previously
working config with:

CALL scripts/checksyscalls.sh
DESCEND objtool
INSTALL libsubcmd_headers
DESCEND bpf/resolve_btfids
CC /tmp/linux-6.8.2/tools/bpf/resolve_btfids/libbpf/staticobjs/bpf.o
In file included from /usr/include/stdio.h:34,
from libbpf.h:14,
from bpf.c:36:
bpf.c: In function 'bpf_token_create':
bpf.c:1293:60: error: 'union bpf_attr' has no member named 'token_create'; did you mean 'iter_create'?
1293 | const size_t attr_sz = offsetofend(union bpf_attr, token_create);
| ^~~~~~~~~~~~
bpf.c:1293:32: note: in expansion of macro 'offsetofend'
1293 | const size_t attr_sz = offsetofend(union bpf_attr, token_create);
| ^~~~~~~~~~~
In file included from bpf.c:37:
bpf.c:1293:60: error: 'union bpf_attr' has no member named 'token_create'; did you mean 'iter_create'?
1293 | const size_t attr_sz = offsetofend(union bpf_attr, token_create);
| ^~~~~~~~~~~~
libbpf_internal.h:107:54: note: in definition of macro 'offsetofend'
107 | (offsetof(TYPE, FIELD) + sizeof(((TYPE *)0)->FIELD))
| ^~~~~
bpf.c:1301:14: error: 'union bpf_attr' has no member named 'token_create'; did you mean 'iter_create'?
1301 | attr.token_create.bpffs_fd = bpffs_fd;
| ^~~~~~~~~~~~
| iter_create
bpf.c:1302:14: error: 'union bpf_attr' has no member named 'token_create'; did you mean 'iter_create'?
1302 | attr.token_create.flags = OPTS_GET(opts, flags, 0);
| ^~~~~~~~~~~~
| iter_create
bpf.c:1304:25: error: 'BPF_TOKEN_CREATE' undeclared (first use in this function); did you mean 'BPF_ITER_CREATE'?
1304 | fd = sys_bpf_fd(BPF_TOKEN_CREATE, &attr, attr_sz);
| ^~~~~~~~~~~~~~~~
| BPF_ITER_CREATE

Introduced by "libbpf-add-bpf_token_create-api.patch".

A quick search indicates that at least mainline commit 35f96de04127
aka "bpf: Introduce BPF token object" is missing (but does not apply),
likely others.