libbpf: support custom SEC() handlers

[kernel-patches-bot]

Pull request for series with
subject: libbpf: support custom SEC() handlers
version: 5
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=620564

[kernel-patches-bot]

Master branch: 7df5072
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=620564
version: 5

[kernel-patches-bot]

Master branch: d59e3cb
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=620564
version: 5

[kernel-patches-bot]

Master branch: caec549
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=620564
version: 5

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: libbpf: allow BPF program auto-attach handlers to bail out
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
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Patch failed at 0001 libbpf: allow BPF program auto-attach handlers to bail out
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: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/lib/bpf/libbpf.c
index 43161fdd44bb,1da4a438ba00..000000000000
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@@ -201,6 -201,13 +201,16 @@@ struct reloc_desc 
  	};
  };
  
++<<<<<<< HEAD
++=======
+ typedef int (*libbpf_prog_setup_fn_t)(struct bpf_program *prog, long cookie);
+ typedef int (*libbpf_prog_prepare_load_fn_t)(struct bpf_program *prog,
+ 					     struct bpf_prog_load_opts *opts, long cookie);
+ /* If auto-attach is not supported, callback should return 0 and set link to NULL */
+ typedef int (*libbpf_prog_attach_fn_t)(const struct bpf_program *prog, long cookie,
+ 				       struct bpf_link **link);
+ 
++>>>>>>> libbpf: allow BPF program auto-attach handlers to bail out
  /* stored as sec_def->cookie for all libbpf-supported SEC()s */
  enum sec_def_flags {
  	SEC_NONE = 0,
@@@ -11922,12 -11822,12 +11932,21 @@@ int bpf_object__attach_skeleton(struct 
  
  		/* auto-attaching not supported for this program */
  		if (!prog->sec_def || !prog->sec_def->prog_attach_fn)
++<<<<<<< HEAD
 +			continue;
 +
 +		/* if user already set the link manually, don't attempt auto-attach */
 +		if (*link)
 +			continue;
 +
++=======
+ 			continue;
+ 
+ 		/* if user already set the link manually, don't attempt auto-attach */
+ 		if (*link)
+ 			continue;
+ 
++>>>>>>> libbpf: allow BPF program auto-attach handlers to bail out
  		err = prog->sec_def->prog_attach_fn(prog, prog->sec_def->cookie, link);
  		if (err) {
  			pr_warn("prog '%s': failed to auto-attach: %d\n",

[kernel-patches-bot]

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