linux-next: manual merge of the bpf-next tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

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

between commit:

  4b27480dcaa7 ("bpf/selftests: convert xdp_link test to ASSERT_* macros")

from Linus' tree and commit:

  544356524dd6 ("selftests/bpf: switch to new libbpf XDP APIs")

from the bpf-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/bpf/prog_tests/xdp_link.c
index b2b357f8c74c,0c5e4ea8eaae..000000000000
--- a/tools/testing/selftests/bpf/prog_tests/xdp_link.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_link.c
@@@ -8,9 -8,9 +8,9 @@@
  
  void serial_test_xdp_link(void)
  {
- 	DECLARE_LIBBPF_OPTS(bpf_xdp_set_link_opts, opts, .old_fd = -1);
 -	__u32 duration = 0, id1, id2, id0 = 0, prog_fd1, prog_fd2, err;
  	struct test_xdp_link *skel1 = NULL, *skel2 = NULL;
 +	__u32 id1, id2, id0 = 0, prog_fd1, prog_fd2;
+ 	LIBBPF_OPTS(bpf_xdp_attach_opts, opts);
  	struct bpf_link_info link_info;
  	struct bpf_prog_info prog_info;
  	struct bpf_link *link;
@@@ -41,14 -40,14 +41,14 @@@
  	id2 = prog_info.id;
  
  	/* set initial prog attachment */
- 	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, prog_fd1, XDP_FLAGS_REPLACE, &opts);
+ 	err = bpf_xdp_attach(IFINDEX_LO, prog_fd1, XDP_FLAGS_REPLACE, &opts);
 -	if (CHECK(err, "fd_attach", "initial prog attach failed: %d\n", err))
 +	if (!ASSERT_OK(err, "fd_attach"))
  		goto cleanup;
  
  	/* validate prog ID */
- 	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);
+ 	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);
 -	CHECK(err || id0 != id1, "id1_check",
 -	      "loaded prog id %u != id1 %u, err %d", id0, id1, err);
 +	if (!ASSERT_OK(err, "id1_check_err") || !ASSERT_EQ(id0, id1, "id1_check_val"))
 +		goto cleanup;
  
  	/* BPF link is not allowed to replace prog attachment */
  	link = bpf_program__attach_xdp(skel1->progs.xdp_handler, IFINDEX_LO);
@@@ -61,9 -60,9 +61,9 @@@
  	}
  
  	/* detach BPF program */
- 	opts.old_fd = prog_fd1;
- 	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, -1, XDP_FLAGS_REPLACE, &opts);
+ 	opts.old_prog_fd = prog_fd1;
+ 	err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_REPLACE, &opts);
 -	if (CHECK(err, "prog_detach", "failed %d\n", err))
 +	if (!ASSERT_OK(err, "prog_detach"))
  		goto cleanup;
  
  	/* now BPF link should attach successfully */
@@@ -73,24 -72,25 +73,24 @@@
  	skel1->links.xdp_handler = link;
  
  	/* validate prog ID */
- 	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);
+ 	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);
 -	if (CHECK(err || id0 != id1, "id1_check",
 -		  "loaded prog id %u != id1 %u, err %d", id0, id1, err))
 +	if (!ASSERT_OK(err, "id1_check_err") || !ASSERT_EQ(id0, id1, "id1_check_val"))
  		goto cleanup;
  
  	/* BPF prog attach is not allowed to replace BPF link */
- 	opts.old_fd = prog_fd1;
- 	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, prog_fd2, XDP_FLAGS_REPLACE, &opts);
+ 	opts.old_prog_fd = prog_fd1;
+ 	err = bpf_xdp_attach(IFINDEX_LO, prog_fd2, XDP_FLAGS_REPLACE, &opts);
 -	if (CHECK(!err, "prog_attach_fail", "unexpected success\n"))
 +	if (!ASSERT_ERR(err, "prog_attach_fail"))
  		goto cleanup;
  
  	/* Can't force-update when BPF link is active */
- 	err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd2, 0);
+ 	err = bpf_xdp_attach(IFINDEX_LO, prog_fd2, 0, NULL);
 -	if (CHECK(!err, "prog_update_fail", "unexpected success\n"))
 +	if (!ASSERT_ERR(err, "prog_update_fail"))
  		goto cleanup;
  
  	/* Can't force-detach when BPF link is active */
- 	err = bpf_set_link_xdp_fd(IFINDEX_LO, -1, 0);
+ 	err = bpf_xdp_detach(IFINDEX_LO, 0, NULL);
 -	if (CHECK(!err, "prog_detach_fail", "unexpected success\n"))
 +	if (!ASSERT_ERR(err, "prog_detach_fail"))
  		goto cleanup;
  
  	/* BPF link is not allowed to replace another BPF link */
@@@ -109,8 -109,9 +109,8 @@@
  		goto cleanup;
  	skel2->links.xdp_handler = link;
  
- 	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);
+ 	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);
 -	if (CHECK(err || id0 != id2, "id2_check",
 -		  "loaded prog id %u != id2 %u, err %d", id0, id1, err))
 +	if (!ASSERT_OK(err, "id2_check_err") || !ASSERT_EQ(id0, id2, "id2_check_val"))
  		goto cleanup;
  
  	/* updating program under active BPF link works as expected */

Attachment: pgp4vgOh0t4qQ.pgp
Description: OpenPGP digital signature