bpf: Support aggregate return values up to 16 bytes

[kernel-patches-daemon-bpf-rc]

Pull request for series with
subject: bpf: Support aggregate return values up to 16 bytes
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1140357

[kernel-patches-daemon-bpf-rc]

Upstream branch: bfa3d89
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1140357
version: 2

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: bpf: Factor check_global_ret_scalar_reg() out of the global return check
Using index info to reconstruct a base tree...
M	kernel/bpf/verifier.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/bpf/verifier.c
CONFLICT (content): Merge conflict in kernel/bpf/verifier.c
Patch failed at 0001 bpf: Factor check_global_ret_scalar_reg() out of the global return check'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc kernel/bpf/verifier.c
index 7fb88e1cd7c4,05a8f9907c3f..000000000000
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -16977,8 -16748,12 +16973,17 @@@ static int check_global_ret_scalar_reg(
  	if (err)
  		return err;
  
++<<<<<<< HEAD
 +	if (is_pointer_value(env, BPF_REG_0)) {
 +		verbose(env, "R%d leaks addr as return value\n", BPF_REG_0);
++=======
+ 	/* Pointers to arena are safe to pass between subprograms. */
+ 	if (is_arena_reg(env, regno))
+ 		return 0;
+ 
+ 	if (is_pointer_value(env, regno)) {
+ 		verbose(env, "R%d leaks addr as return value\n", regno);
++>>>>>>> bpf: Factor check_global_ret_scalar_reg() out of the global return check
  		return -EACCES;
  	}