[PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add

Netdev List
 help / color / mirror / Atom feed

* [PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add_flags() helper
       [not found] <20260910183222.307208-1-toke@redhat.com>
@ 2026-09-10 18:32 ` Toke Høiland-Jørgensen
  2026-09-11  3:18   ` Jiayuan Chen
  0 siblings, 1 reply; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2026-09-10 18:32 UTC (permalink / raw)
  To: Alexei Starovoitov, Daniel Borkmann, David S. Miller,
	Jakub Kicinski, Jesper Dangaard Brouer, John Fastabend,
	Stanislav Fomichev, Andrii Nakryiko, Eduard Zingerman,
	Kumar Kartikeya Dwivedi, Martin KaFai Lau, Song Liu,
	Yonghong Song, Jiri Olsa, Emil Tsalapatis, Ihor Solodrai
  Cc: Toke Høiland-Jørgensen, Shuah Khan, bpf, netdev

Adopt the newly added bpf_program__add_flags() helper everywhere the
selftests non-destructively modifies program flags (which turns out to
be every use of bpf_program__set_flags() in the tests).

Acked-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
 tools/testing/selftests/bpf/prog_tests/attach_probe.c      | 4 +---
 tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c   | 2 +-
 tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 3 +--
 tools/testing/selftests/bpf/prog_tests/xdp_metadata.c      | 4 ++--
 tools/testing/selftests/bpf/test_loader.c                  | 5 ++---
 tools/testing/selftests/bpf/testing_helpers.c              | 4 +---
 tools/testing/selftests/bpf/veristat.c                     | 4 ++--
 tools/testing/selftests/bpf/xdp_hw_metadata.c              | 2 +-
 8 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
index 7dadb90e7b68..41136e1c7752 100644
--- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
+++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
@@ -543,9 +543,7 @@ static void test_kprobe_sleepable(void)
 		return;
 
 	/* sleepable kprobe test case needs flags set before loading */
-	if (!ASSERT_OK(bpf_program__set_flags(
-			       skel->progs.handle_kprobe_sleepable,
-			       bpf_program__flags(skel->progs.handle_kprobe_sleepable) | BPF_F_SLEEPABLE),
+	if (!ASSERT_OK(bpf_program__add_flags(skel->progs.handle_kprobe_sleepable, BPF_F_SLEEPABLE),
 		       "kprobe_sleepable_flags"))
 		goto cleanup;
 
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c b/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
index 652307a1b22e..902a70d5afeb 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
@@ -35,7 +35,7 @@ static int check_load(const char *file, enum bpf_prog_type type)
 	}
 
 	bpf_program__set_type(prog, type);
-	bpf_program__set_flags(prog, bpf_program__flags(prog) | testing_prog_flags());
+	bpf_program__add_flags(prog, testing_prog_flags());
 	bpf_program__set_log_level(prog, 4 | extra_prog_load_log_flags);
 
 	err = bpf_object__load(obj);
diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
index ed3fd0a88dab..651123cd8602 100644
--- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
+++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
@@ -361,8 +361,7 @@ static void test_attach_api_fails(void)
 
 	sl_skel->bss->user_ptr = sl_skel;
 
-	err = bpf_program__set_flags(sl_skel->progs.handle_kprobe_multi_sleepable,
-				     bpf_program__flags(sl_skel->progs.handle_kprobe_multi_sleepable) | BPF_F_SLEEPABLE);
+	err = bpf_program__add_flags(sl_skel->progs.handle_kprobe_multi_sleepable, BPF_F_SLEEPABLE);
 	if (!ASSERT_OK(err, "sleep_skel_set_flags"))
 		goto cleanup;
 
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
index 047dfdc322a2..3ab963458903 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
@@ -408,14 +408,14 @@ void test_xdp_metadata(void)
 
 	prog = bpf_object__find_program_by_name(bpf_obj->obj, "rx");
 	bpf_program__set_ifindex(prog, rx_ifindex);
-	bpf_program__set_flags(prog, bpf_program__flags(prog) | BPF_F_XDP_DEV_BOUND_ONLY);
+	bpf_program__add_flags(prog, BPF_F_XDP_DEV_BOUND_ONLY);
 
 	/* Make sure we can load a dev-bound program that performs
 	 * XDP_REDIRECT into a devmap.
 	 */
 	new_prog = bpf_object__find_program_by_name(bpf_obj->obj, "redirect");
 	bpf_program__set_ifindex(new_prog, rx_ifindex);
-	bpf_program__set_flags(new_prog, bpf_program__flags(new_prog) | BPF_F_XDP_DEV_BOUND_ONLY);
+	bpf_program__add_flags(new_prog, BPF_F_XDP_DEV_BOUND_ONLY);
 
 	if (!ASSERT_OK(xdp_metadata__load(bpf_obj), "load skeleton"))
 		goto out;
diff --git a/tools/testing/selftests/bpf/test_loader.c b/tools/testing/selftests/bpf/test_loader.c
index 794a7dfb0579..28724de06322 100644
--- a/tools/testing/selftests/bpf/test_loader.c
+++ b/tools/testing/selftests/bpf/test_loader.c
@@ -748,7 +748,7 @@ static void prepare_case(struct test_loader *tester,
 			 struct bpf_object *obj,
 			 struct bpf_program *prog)
 {
-	int min_log_level = 0, prog_flags;
+	int min_log_level = 0;
 
 	if (env.verbosity > VERBOSE_NONE)
 		min_log_level = 1;
@@ -766,8 +766,7 @@ static void prepare_case(struct test_loader *tester,
 	else
 		bpf_program__set_log_level(prog, spec->log_level);
 
-	prog_flags = bpf_program__flags(prog);
-	bpf_program__set_flags(prog, prog_flags | spec->prog_flags);
+	bpf_program__add_flags(prog, spec->prog_flags);
 
 	tester->log_buf[0] = '\0';
 }
diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c
index 3f037949e978..d1d60451c5bc 100644
--- a/tools/testing/selftests/bpf/testing_helpers.c
+++ b/tools/testing/selftests/bpf/testing_helpers.c
@@ -292,7 +292,6 @@ int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
 	);
 	struct bpf_object *obj;
 	struct bpf_program *prog;
-	__u32 flags;
 	int err;
 
 	obj = bpf_object__open_file(file, &opts);
@@ -308,8 +307,7 @@ int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
 	if (type != BPF_PROG_TYPE_UNSPEC && bpf_program__type(prog) != type)
 		bpf_program__set_type(prog, type);
 
-	flags = bpf_program__flags(prog) | testing_prog_flags();
-	bpf_program__set_flags(prog, flags);
+	bpf_program__add_flags(prog, testing_prog_flags());
 
 	err = bpf_object__load(obj);
 	if (err)
diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c
index e70741c6b9b7..9cfc9b4b41c1 100644
--- a/tools/testing/selftests/bpf/veristat.c
+++ b/tools/testing/selftests/bpf/veristat.c
@@ -1722,9 +1722,9 @@ static int process_prog(const char *filename, struct bpf_object *obj, struct bpf
 	fixup_obj(obj, prog, base_filename);
 
 	if (env.force_checkpoints)
-		bpf_program__set_flags(prog, bpf_program__flags(prog) | BPF_F_TEST_STATE_FREQ);
+		bpf_program__add_flags(prog, BPF_F_TEST_STATE_FREQ);
 	if (env.force_reg_invariants)
-		bpf_program__set_flags(prog, bpf_program__flags(prog) | BPF_F_TEST_REG_INVARIANTS);
+		bpf_program__add_flags(prog, BPF_F_TEST_REG_INVARIANTS);
 
 	opts.log_buf = buf;
 	opts.log_size = buf_sz;
diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c
index c5501b3fdf48..ab3f5fc56e86 100644
--- a/tools/testing/selftests/bpf/xdp_hw_metadata.c
+++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c
@@ -845,7 +845,7 @@ int main(int argc, char *argv[])
 
 	prog = bpf_object__find_program_by_name(bpf_obj->obj, "rx");
 	bpf_program__set_ifindex(prog, ifindex);
-	bpf_program__set_flags(prog, bpf_program__flags(prog) | BPF_F_XDP_DEV_BOUND_ONLY);
+	bpf_program__add_flags(prog, BPF_F_XDP_DEV_BOUND_ONLY);
 
 	printf("load bpf program...\n");
 	ret = xdp_hw_metadata__load(bpf_obj);
-- 
2.55.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add_flags() helper
  2026-09-10 18:32 ` [PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add_flags() helper Toke Høiland-Jørgensen
@ 2026-09-11  3:18   ` Jiayuan Chen
  2026-09-11  9:53     ` Toke Høiland-Jørgensen
  0 siblings, 1 reply; 5+ messages in thread
From: Jiayuan Chen @ 2026-09-11  3:18 UTC (permalink / raw)
  To: Toke Høiland-Jørgensen, Alexei Starovoitov,
	Daniel Borkmann, David S. Miller, Jakub Kicinski,
	Jesper Dangaard Brouer, John Fastabend, Stanislav Fomichev,
	Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi,
	Martin KaFai Lau, Song Liu, Yonghong Song, Jiri Olsa,
	Emil Tsalapatis, Ihor Solodrai
  Cc: Shuah Khan, bpf, netdev


On 9/11/26 2:32 AM, Toke Høiland-Jørgensen wrote:
> Adopt the newly added bpf_program__add_flags() helper everywhere the
> selftests non-destructively modifies program flags (which turns out to
> be every use of bpf_program__set_flags() in the tests).
>
> Acked-by: Ihor Solodrai <ihor.solodrai@linux.dev>
> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>


Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev>


‌AI pays excessive attention to wording.

maybe just delete whole parenthetical notes‌ "(which turns out ...)"



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add_flags() helper
  2026-09-11  3:18   ` Jiayuan Chen
@ 2026-09-11  9:53     ` Toke Høiland-Jørgensen
  2026-09-11 19:27       ` Andrii Nakryiko
  0 siblings, 1 reply; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2026-09-11  9:53 UTC (permalink / raw)
  To: Jiayuan Chen, Alexei Starovoitov, Daniel Borkmann,
	David S. Miller, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Stanislav Fomichev, Andrii Nakryiko,
	Eduard Zingerman, Kumar Kartikeya Dwivedi, Martin KaFai Lau,
	Song Liu, Yonghong Song, Jiri Olsa, Emil Tsalapatis,
	Ihor Solodrai
  Cc: Shuah Khan, bpf, netdev

Jiayuan Chen <jiayuan.chen@linux.dev> writes:

> On 9/11/26 2:32 AM, Toke Høiland-Jørgensen wrote:
>> Adopt the newly added bpf_program__add_flags() helper everywhere the
>> selftests non-destructively modifies program flags (which turns out to
>> be every use of bpf_program__set_flags() in the tests).
>>
>> Acked-by: Ihor Solodrai <ihor.solodrai@linux.dev>
>> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
>
>
> Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev>
>
>
> ‌AI pays excessive attention to wording.
>
> maybe just delete whole parenthetical notes‌ "(which turns out ...)"

Well, the two instances the bot is complaining about turns out to have
been added after I wrote that commit message; I didn't re-run the 'git
grep' after rebasing for v2, so I didn't notice this.

I'm not sure if those two are candidates for conversion as well, TBH. I
can respin with your suggested change to the commit message, or just
convert those two as well. Or just leave it as-is, I suppose. What do
the maintainers think? :)

-Toke


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add_flags() helper
  2026-09-11  9:53     ` Toke Høiland-Jørgensen
@ 2026-09-11 19:27       ` Andrii Nakryiko
  2026-09-12  8:24         ` Toke Høiland-Jørgensen
  0 siblings, 1 reply; 5+ messages in thread
From: Andrii Nakryiko @ 2026-09-11 19:27 UTC (permalink / raw)
  To: Toke Høiland-Jørgensen
  Cc: Jiayuan Chen, Alexei Starovoitov, Daniel Borkmann,
	David S. Miller, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Stanislav Fomichev, Andrii Nakryiko,
	Eduard Zingerman, Kumar Kartikeya Dwivedi, Martin KaFai Lau,
	Song Liu, Yonghong Song, Jiri Olsa, Emil Tsalapatis,
	Ihor Solodrai, Shuah Khan, bpf, netdev

On Fri, Sep 11, 2026 at 2:53 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
>
> Jiayuan Chen <jiayuan.chen@linux.dev> writes:
>
> > On 9/11/26 2:32 AM, Toke Høiland-Jørgensen wrote:
> >> Adopt the newly added bpf_program__add_flags() helper everywhere the
> >> selftests non-destructively modifies program flags (which turns out to
> >> be every use of bpf_program__set_flags() in the tests).
> >>
> >> Acked-by: Ihor Solodrai <ihor.solodrai@linux.dev>
> >> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
> >
> >
> > Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev>
> >
> >
> > ‌AI pays excessive attention to wording.
> >
> > maybe just delete whole parenthetical notes‌ "(which turns out ...)"
>
> Well, the two instances the bot is complaining about turns out to have
> been added after I wrote that commit message; I didn't re-run the 'git
> grep' after rebasing for v2, so I didn't notice this.
>
> I'm not sure if those two are candidates for conversion as well, TBH. I
> can respin with your suggested change to the commit message, or just
> convert those two as well. Or just leave it as-is, I suppose. What do
> the maintainers think? :)
>

let's replace, you'll need another revision anyways, thanks!

> -Toke
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add_flags() helper
  2026-09-11 19:27       ` Andrii Nakryiko
@ 2026-09-12  8:24         ` Toke Høiland-Jørgensen
  0 siblings, 0 replies; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2026-09-12  8:24 UTC (permalink / raw)
  To: Andrii Nakryiko
  Cc: Jiayuan Chen, Alexei Starovoitov, Daniel Borkmann,
	David S. Miller, Jakub Kicinski, Jesper Dangaard Brouer,
	John Fastabend, Stanislav Fomichev, Andrii Nakryiko,
	Eduard Zingerman, Kumar Kartikeya Dwivedi, Martin KaFai Lau,
	Song Liu, Yonghong Song, Jiri Olsa, Emil Tsalapatis,
	Ihor Solodrai, Shuah Khan, bpf, netdev

Andrii Nakryiko <andrii.nakryiko@gmail.com> writes:

> On Fri, Sep 11, 2026 at 2:53 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
>>
>> Jiayuan Chen <jiayuan.chen@linux.dev> writes:
>>
>> > On 9/11/26 2:32 AM, Toke Høiland-Jørgensen wrote:
>> >> Adopt the newly added bpf_program__add_flags() helper everywhere the
>> >> selftests non-destructively modifies program flags (which turns out to
>> >> be every use of bpf_program__set_flags() in the tests).
>> >>
>> >> Acked-by: Ihor Solodrai <ihor.solodrai@linux.dev>
>> >> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
>> >
>> >
>> > Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev>
>> >
>> >
>> > ‌AI pays excessive attention to wording.
>> >
>> > maybe just delete whole parenthetical notes‌ "(which turns out ...)"
>>
>> Well, the two instances the bot is complaining about turns out to have
>> been added after I wrote that commit message; I didn't re-run the 'git
>> grep' after rebasing for v2, so I didn't notice this.
>>
>> I'm not sure if those two are candidates for conversion as well, TBH. I
>> can respin with your suggested change to the commit message, or just
>> convert those two as well. Or just leave it as-is, I suppose. What do
>> the maintainers think? :)
>>
>
> let's replace, you'll need another revision anyways, thanks!

ACK, will do :)

-Toke


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-09-12  8:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20260910183222.307208-1-toke@redhat.com>
2026-09-10 18:32 ` [PATCH bpf-next v2 3/4] selftests/bpf: Adopt bpf_program__add_flags() helper Toke Høiland-Jørgensen
2026-09-11  3:18   ` Jiayuan Chen
2026-09-11  9:53     ` Toke Høiland-Jørgensen
2026-09-11 19:27       ` Andrii Nakryiko
2026-09-12  8:24         ` Toke Høiland-Jørgensen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox