From: Martin KaFai Lau <martin.lau@linux.dev>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>,
Eduard Zingerman <eddyz87@gmail.com>
Cc: andrii@kernel.org, daniel@iogearbox.net, kernel-team@fb.com,
yonghong.song@linux.dev, void@manifault.com, bpf@vger.kernel.org,
ast@kernel.org
Subject: Re: [PATCH bpf-next v1 7/8] libbpf: sync progs autoload with maps autocreate for struct_ops maps
Date: Wed, 28 Feb 2024 16:25:08 -0800 [thread overview]
Message-ID: <ca62c2b8-adbb-4cbd-ab93-10a90dbdf2cf@linux.dev> (raw)
In-Reply-To: <CAEf4BzbQryFpZFd0ruu0w9BC6VV-5BMHCzEJJNJz_OXk5j0DEw@mail.gmail.com>
On 2/28/24 3:55 PM, Andrii Nakryiko wrote:
> On Tue, Feb 27, 2024 at 6:11 PM Martin KaFai Lau <martin.lau@linux.dev> wrote:
>>
>> On 2/27/24 12:45 PM, Eduard Zingerman wrote:
>>> Make bpf_map__set_autocreate() for struct_ops maps toggle autoload
>>> state for referenced programs.
>>>
>>> E.g. for the BPF code below:
>>>
>>> SEC("struct_ops/test_1") int BPF_PROG(foo) { ... }
>>> SEC("struct_ops/test_2") int BPF_PROG(bar) { ... }
>>>
>>> SEC(".struct_ops.link")
>>> struct test_ops___v1 A = {
>>> .foo = (void *)foo
>>> };
>>>
>>> SEC(".struct_ops.link")
>>> struct test_ops___v2 B = {
>>> .foo = (void *)foo,
>>> .bar = (void *)bar,
>>> };
>>>
>>> And the following libbpf API calls:
>>>
>>> bpf_map__set_autocreate(skel->maps.A, true);
>>> bpf_map__set_autocreate(skel->maps.B, false);
>>>
>>> The autoload would be enabled for program 'foo' and disabled for
>>> program 'bar'.
>>>
>>> Do not apply such toggling if program autoload state is set by a call
>>> to bpf_program__set_autoload().
>>>
>>> Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
>>> ---
>>> tools/lib/bpf/libbpf.c | 35 ++++++++++++++++++++++++++++++++++-
>>> 1 file changed, 34 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
>>> index b39d3f2898a1..1ea3046724f8 100644
>>> --- a/tools/lib/bpf/libbpf.c
>>> +++ b/tools/lib/bpf/libbpf.c
>>> @@ -446,13 +446,18 @@ struct bpf_program {
>>> struct bpf_object *obj;
>>>
>>> int fd;
>>> - bool autoload;
>>> + bool autoload:1;
>>> + bool autoload_user_set:1;
>>> bool autoattach;
>>> bool sym_global;
>>> bool mark_btf_static;
>>> enum bpf_prog_type type;
>>> enum bpf_attach_type expected_attach_type;
>>> int exception_cb_idx;
>>> + /* total number of struct_ops maps with autocreate == true
>>> + * that reference this program
>>> + */
>>> + __u32 struct_ops_refs;
>>
>> Instead of adding struct_ops_refs and autoload_user_set,
>>
>> for BPF_PROG_TYPE_STRUCT_OPS, how about deciding to load it or not by checking
>> prog->attach_btf_id (non zero) alone. The prog->attach_btf_id is now decided at
>> load time and is only set if it is used by at least one autocreate map, if I
>> read patch 2 & 3 correctly.
>>
>> Meaning ignore prog->autoload*. Load the struct_ops prog as long as it is used
>> by one struct_ops map with autocreate == true.
>>
>> If the struct_ops prog is not used in any struct_ops map, the bpf prog cannot be
>> loaded even the autoload is set. If bpf prog is used in a struct_ops map and its
>> autoload is set to false, the struct_ops map will be in broken state. Thus,
>
> We can easily detect this condition and report meaningful error.
>
>> prog->autoload does not fit very well with struct_ops prog and may as well
>> depend on whether the struct_ops prog is used by a struct_ops map alone?
>
> I think it's probably fine from a usability standpoint to disable
> loading the BPF program if its struct_ops map was explicitly set to
> not auto-create. It's a bit of deviation from other program types, but
> in practice this logic will make it easier for users.
>
> One question I have, though, is whether we should report as an error a
> stand-alone struct_ops BPF program that is not used from any
> struct_ops map? Or should we load it nevertheless? Or should we
> silently not load it?
I think the libbpf could report an error if the prog is not used in any
struct_ops map at the source code level, not sure if it is useful.
However, it probably should not report error if that struct_ops map (where the
prog is resided) does not have autocreate set to true.
If a BPF program is not used in any struct_ops map, it cannot be loaded anyway
because the prog->attach_btf_id is not set. If libbpf tries to load the prog,
the kernel will reject it also. I think it may be a question on whether it is
the user intention of not loading the prog if the prog is not used in any
struct_ops map. I tend to think it is the user intention of not loading it in
this case.
SEC("struct_ops/test1")
int BPF_PROG(test1) { ... }
SEC("struct_ops/test2")
int BPF_PROG(test2) { ... }
SEC("?.struct_ops.link") struct some_ops___v1 a = { .test1 = test1 }
SEC("?.struct_ops.link") struct some_ops___v2 b = { .test1 = test1,
.test2 = test2, }
In the above, the userspace may try to load with a newer some_ops___v2 first,
failed and then try a lower version some_ops___v1 and then succeeded. The test2
prog will not be used and not expected to be loaded.
>
> I feel like silently not loading is the worst behavior here. So either
> loading it anyway or reporting an error would be my preference,
> probably.
next prev parent reply other threads:[~2024-02-29 0:25 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 20:45 [PATCH bpf-next v1 0/8] libbpf: type suffixes and autocreate flag for struct_ops maps Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 1/8] libbpf: allow version suffixes (___smth) for struct_ops types Eduard Zingerman
2024-02-27 21:47 ` Kui-Feng Lee
2024-02-27 21:49 ` Eduard Zingerman
2024-02-28 16:29 ` David Vernet
2024-02-28 17:28 ` Eduard Zingerman
2024-02-28 17:30 ` David Vernet
2024-02-28 23:21 ` Andrii Nakryiko
2024-02-28 23:37 ` Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 2/8] libbpf: tie struct_ops programs to kernel BTF ids, not to local ids Eduard Zingerman
2024-02-28 7:41 ` Martin KaFai Lau
2024-02-28 17:23 ` David Vernet
2024-02-28 17:40 ` Eduard Zingerman
2024-02-28 17:50 ` David Vernet
2024-02-28 23:28 ` Andrii Nakryiko
2024-02-28 23:31 ` Eduard Zingerman
2024-02-28 23:34 ` Andrii Nakryiko
2024-02-27 20:45 ` [PATCH bpf-next v1 3/8] libbpf: honor autocreate flag for struct_ops maps Eduard Zingerman
2024-02-28 17:44 ` David Vernet
2024-02-27 20:45 ` [PATCH bpf-next v1 4/8] selftests/bpf: test struct_ops map definition with type suffix Eduard Zingerman
2024-02-28 18:03 ` David Vernet
2024-02-27 20:45 ` [PATCH bpf-next v1 5/8] selftests/bpf: bad_struct_ops test Eduard Zingerman
2024-02-28 18:15 ` David Vernet
2024-02-28 20:06 ` Eduard Zingerman
2024-02-28 20:11 ` David Vernet
2024-02-28 23:40 ` Andrii Nakryiko
2024-02-28 23:44 ` Eduard Zingerman
2024-02-28 23:56 ` Andrii Nakryiko
2024-02-29 0:06 ` Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 6/8] selftests/bpf: test autocreate behavior for struct_ops maps Eduard Zingerman
2024-02-28 18:29 ` David Vernet
2024-02-28 18:34 ` David Vernet
2024-02-28 19:31 ` Eduard Zingerman
2024-02-28 23:43 ` Andrii Nakryiko
2024-02-28 23:55 ` Eduard Zingerman
2024-02-29 0:02 ` Andrii Nakryiko
2024-02-29 0:56 ` Martin KaFai Lau
2024-03-01 1:28 ` Eduard Zingerman
2024-03-01 18:03 ` Andrii Nakryiko
2024-03-01 18:07 ` Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 7/8] libbpf: sync progs autoload with maps autocreate " Eduard Zingerman
2024-02-27 22:55 ` Kui-Feng Lee
2024-02-27 23:09 ` Eduard Zingerman
2024-02-27 23:16 ` Kui-Feng Lee
2024-02-27 23:30 ` Eduard Zingerman
2024-02-27 23:40 ` Kui-Feng Lee
2024-02-27 23:43 ` Eduard Zingerman
2024-02-28 0:12 ` Kui-Feng Lee
2024-02-28 0:50 ` Eduard Zingerman
2024-02-28 2:10 ` Martin KaFai Lau
2024-02-28 12:36 ` Eduard Zingerman
2024-02-28 23:55 ` Andrii Nakryiko
2024-02-29 0:04 ` Eduard Zingerman
2024-02-29 0:14 ` Andrii Nakryiko
2024-02-29 0:25 ` Martin KaFai Lau [this message]
2024-02-29 0:30 ` Andrii Nakryiko
2024-02-29 0:37 ` Martin KaFai Lau
2024-02-29 0:40 ` Eduard Zingerman
2024-02-27 20:45 ` [PATCH bpf-next v1 8/8] selftests/bpf: tests for struct_ops autoload/autocreate toggling Eduard Zingerman
2024-02-28 18:36 ` David Vernet
2024-02-28 20:10 ` Eduard Zingerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ca62c2b8-adbb-4cbd-ab93-10a90dbdf2cf@linux.dev \
--to=martin.lau@linux.dev \
--cc=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=kernel-team@fb.com \
--cc=void@manifault.com \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox