Commit ce787547 authored by Christy Lee's avatar Christy Lee Committed by Andrii Nakryiko
Browse files

selftests/bpf: Change bpf_prog_attach_xattr() to bpf_prog_attach_opts() 



bpf_prog_attach_opts() is being deprecated and renamed to
bpf_prog_attach_xattr(). Change all selftests/bpf's uage to the new name.

Signed-off-by: default avatarChristy Lee <christylee@fb.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220107184604.3668544-3-christylee@fb.com
parent d6c9c24e

tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c

+6 −6
Original line number Diff line number Diff line
@@ -194,14 +194,14 @@ void serial_test_cgroup_attach_multi(void) 


	attach_opts.flags = BPF_F_ALLOW_OVERRIDE | BPF_F_REPLACE;

	attach_opts.replace_prog_fd = allow_prog[0];

	if (CHECK(!bpf_prog_attach_xattr(allow_prog[6], cg1,

	if (CHECK(!bpf_prog_attach_opts(allow_prog[6], cg1,

					 BPF_CGROUP_INET_EGRESS, &attach_opts),

		  "fail_prog_replace_override", "unexpected success\n"))

		goto err;

	CHECK_FAIL(errno != EINVAL);



	attach_opts.flags = BPF_F_REPLACE;

	if (CHECK(!bpf_prog_attach_xattr(allow_prog[6], cg1,

	if (CHECK(!bpf_prog_attach_opts(allow_prog[6], cg1,

					 BPF_CGROUP_INET_EGRESS, &attach_opts),

		  "fail_prog_replace_no_multi", "unexpected success\n"))

		goto err;
@@ -209,7 +209,7 @@ void serial_test_cgroup_attach_multi(void) 


	attach_opts.flags = BPF_F_ALLOW_MULTI | BPF_F_REPLACE;

	attach_opts.replace_prog_fd = -1;

	if (CHECK(!bpf_prog_attach_xattr(allow_prog[6], cg1,

	if (CHECK(!bpf_prog_attach_opts(allow_prog[6], cg1,

					 BPF_CGROUP_INET_EGRESS, &attach_opts),

		  "fail_prog_replace_bad_fd", "unexpected success\n"))

		goto err;
@@ -217,7 +217,7 @@ void serial_test_cgroup_attach_multi(void) 


	/* replacing a program that is not attached to cgroup should fail  */

	attach_opts.replace_prog_fd = allow_prog[3];

	if (CHECK(!bpf_prog_attach_xattr(allow_prog[6], cg1,

	if (CHECK(!bpf_prog_attach_opts(allow_prog[6], cg1,

					 BPF_CGROUP_INET_EGRESS, &attach_opts),

		  "fail_prog_replace_no_ent", "unexpected success\n"))

		goto err;
@@ -225,14 +225,14 @@ void serial_test_cgroup_attach_multi(void) 


	/* replace 1st from the top program */

	attach_opts.replace_prog_fd = allow_prog[0];

	if (CHECK(bpf_prog_attach_xattr(allow_prog[6], cg1,

	if (CHECK(bpf_prog_attach_opts(allow_prog[6], cg1,

					BPF_CGROUP_INET_EGRESS, &attach_opts),

		  "prog_replace", "errno=%d\n", errno))

		goto err;



	/* replace program with itself */

	attach_opts.replace_prog_fd = allow_prog[6];

	if (CHECK(bpf_prog_attach_xattr(allow_prog[6], cg1,

	if (CHECK(bpf_prog_attach_opts(allow_prog[6], cg1,

					BPF_CGROUP_INET_EGRESS, &attach_opts),

		  "prog_replace", "errno=%d\n", errno))

		goto err;