| Message ID | 20220906151303.2780789-6-benjamin.tissoires@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f9b348185f4d684cc19e6bd9b87904823d5aa5ed |
| Delegated to: | BPF |
| Headers | show |
| Series | bpf-core changes for preparation of | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for bpf-next, async |
| netdev/apply | fail | Patch does not apply to bpf-next |
| bpf/vmtest-bpf-next-PR | fail | PR summary |
| bpf/vmtest-bpf-next-VM_Test-4 | success | Logs for llvm-toolchain |
| bpf/vmtest-bpf-next-VM_Test-5 | success | Logs for set-matrix |
| bpf/vmtest-bpf-next-VM_Test-2 | success | Logs for build for x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-3 | success | Logs for build for x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-1 | success | Logs for build for s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-16 | success | Logs for test_verifier on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-17 | success | Logs for test_verifier on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-10 | success | Logs for test_progs on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-11 | success | Logs for test_progs on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-13 | fail | Logs for test_progs_no_alu32 on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-14 | fail | Logs for test_progs_no_alu32 on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-7 | success | Logs for test_maps on x86_64 with gcc |
| bpf/vmtest-bpf-next-VM_Test-8 | success | Logs for test_maps on x86_64 with llvm-16 |
| bpf/vmtest-bpf-next-VM_Test-9 | success | Logs for test_progs on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-12 | success | Logs for test_progs_no_alu32 on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-15 | success | Logs for test_verifier on s390x with gcc |
| bpf/vmtest-bpf-next-VM_Test-6 | success | Logs for test_maps on s390x with gcc |
On Tue, 6 Sept 2022 at 17:13, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > net/bpf/test_run.c is already presenting 20 kfuncs. > net/netfilter/nf_conntrack_bpf.c is also presenting an extra 10 kfuncs. > > Given that all the kfuncs are regrouped into one unique set, having > only 2 space left prevent us to add more selftests. > > Bump it to 64 for now. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > --- I can imagine pinning this down as the reason the program was failing to load must have been fun, since I ended up requiring this too in the linked list series... Acked-by: Kumar Kartikeya Dwivedi <memxor@gmail.com> > > no changes in v11 > > new in v10 > --- > kernel/bpf/btf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c > index eca9ea78ee5f..8280c1a8dbce 100644 > --- a/kernel/bpf/btf.c > +++ b/kernel/bpf/btf.c > @@ -208,7 +208,7 @@ enum btf_kfunc_hook { > }; > > enum { > - BTF_KFUNC_SET_MAX_CNT = 32, > + BTF_KFUNC_SET_MAX_CNT = 64, > BTF_DTOR_KFUNC_MAX_CNT = 256, > }; > > -- > 2.36.1 >
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index eca9ea78ee5f..8280c1a8dbce 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -208,7 +208,7 @@ enum btf_kfunc_hook { }; enum { - BTF_KFUNC_SET_MAX_CNT = 32, + BTF_KFUNC_SET_MAX_CNT = 64, BTF_DTOR_KFUNC_MAX_CNT = 256, };
net/bpf/test_run.c is already presenting 20 kfuncs. net/netfilter/nf_conntrack_bpf.c is also presenting an extra 10 kfuncs. Given that all the kfuncs are regrouped into one unique set, having only 2 space left prevent us to add more selftests. Bump it to 64 for now. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> --- no changes in v11 new in v10 --- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)