libbpf: further struct_ops fixes and improvements

[kernel-patches-daemon-bpf]

Pull request for series with
subject: libbpf: further struct_ops fixes and improvements
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=850977

[kernel-patches-daemon-bpf]

Upstream branch: 329a672
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=850977
version: 1

[kernel-patches-daemon-bpf]

Upstream branch: 75b0fbf
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=850977
version: 1

[kernel-patches-daemon-bpf]

Upstream branch: 93d1c2d
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=850977
version: 1

[kernel-patches-daemon-bpf]

Upstream branch: 7e2c7a3
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=850977
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=850977
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: libbpf: remove unnecessary struct_ops prog validity check
Using index info to reconstruct a base tree...
M	tools/lib/bpf/libbpf.c
Falling back to patching base and 3-way merge...
Auto-merging tools/lib/bpf/libbpf.c
No changes -- Patch already applied.
Applying: libbpf: handle yet another corner case of nulling out struct_ops program
Using index info to reconstruct a base tree...
M	tools/lib/bpf/libbpf.c
Falling back to patching base and 3-way merge...
Auto-merging tools/lib/bpf/libbpf.c
No changes -- Patch already applied.
Applying: selftests/bpf: add another struct_ops callback use case test
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
Patch failed at 0003 selftests/bpf: add another struct_ops callback use case test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: '.git/rebase-apply/patch:85: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
index 29e183a80f49,f3c61ebad323..000000000000
--- a/tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
@@@ -5,7 -5,6 +5,10 @@@
  
  #include "struct_ops_module.skel.h"
  #include "struct_ops_nulled_out_cb.skel.h"
++<<<<<<< HEAD
 +#include "struct_ops_forgotten_cb.skel.h"
++=======
++>>>>>>> selftests/bpf: add another struct_ops callback use case test
  
  static void check_map_info(struct bpf_map_info *info)
  {
@@@ -200,59 -199,15 +203,67 @@@ cleanup
  	struct_ops_nulled_out_cb__destroy(skel);
  }
  
++<<<<<<< HEAD
 +/* validate that libbpf generates reasonable error message if struct_ops is
 + * not referenced in any struct_ops map
 + */
 +static void test_struct_ops_forgotten_cb(void)
 +{
 +	struct struct_ops_forgotten_cb *skel;
 +	char *log;
 +	int err;
 +
 +	skel = struct_ops_forgotten_cb__open();
 +	if (!ASSERT_OK_PTR(skel, "skel_open"))
 +		return;
 +
 +	start_libbpf_log_capture();
 +
 +	err = struct_ops_forgotten_cb__load(skel);
 +	if (!ASSERT_ERR(err, "skel_load"))
 +		goto cleanup;
 +
 +	log = stop_libbpf_log_capture();
 +	ASSERT_HAS_SUBSTR(log,
 +			  "prog 'test_1_forgotten': SEC(\"struct_ops\") program isn't referenced anywhere, did you forget to use it?",
 +			  "libbpf_log");
 +	free(log);
 +
 +	struct_ops_forgotten_cb__destroy(skel);
 +
 +	/* now let's programmatically use it, we should be fine now */
 +	skel = struct_ops_forgotten_cb__open();
 +	if (!ASSERT_OK_PTR(skel, "skel_open"))
 +		return;
 +
 +	skel->struct_ops.ops->test_1 = skel->progs.test_1_forgotten; /* not anymore */
 +
 +	err = struct_ops_forgotten_cb__load(skel);
 +	if (!ASSERT_OK(err, "skel_load"))
 +		goto cleanup;
 +
 +cleanup:
 +	struct_ops_forgotten_cb__destroy(skel);
 +}
 +
++=======
++>>>>>>> selftests/bpf: add another struct_ops callback use case test
  void serial_test_struct_ops_module(void)
  {
 -	if (test__start_subtest("test_struct_ops_load"))
 +	if (test__start_subtest("struct_ops_load"))
  		test_struct_ops_load();
 -	if (test__start_subtest("test_struct_ops_not_zeroed"))
 +	if (test__start_subtest("struct_ops_not_zeroed"))
  		test_struct_ops_not_zeroed();
 -	if (test__start_subtest("test_struct_ops_incompatible"))
 +	if (test__start_subtest("struct_ops_incompatible"))
  		test_struct_ops_incompatible();
++<<<<<<< HEAD
 +	if (test__start_subtest("struct_ops_null_out_cb"))
 +		test_struct_ops_nulled_out_cb();
 +	if (test__start_subtest("struct_ops_forgotten_cb"))
 +		test_struct_ops_forgotten_cb();
++=======
+ 	if (test__start_subtest("test_struct_ops_null_out_cb"))
+ 		test_struct_ops_nulled_out_cb();
++>>>>>>> selftests/bpf: add another struct_ops callback use case test
  }
  

[kernel-patches-daemon-bpf]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=850977 irrelevant now. Closing PR.