bpf-core changes for preparation of

[PATCH bpf-next v11 5/7] bpf/btf: bump BTF_KFUNC_SET_MAX_CNT

Posted by Benjamin Tissoires 3 years, 7 months ago

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(-)

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

Re: [PATCH bpf-next v11 5/7] bpf/btf: bump BTF_KFUNC_SET_MAX_CNT

Posted by Kumar Kartikeya Dwivedi 3 years, 7 months ago

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
>