Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.1-rc5

Cross-merge BPF and other fixes after downstream PR.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/bpf.h
index 1b28cacc30756820e60e101d73018754cf5a854b,cd191c5fdb0a5ee954939f61577d6c5cbc7828c4..1df67a59cd9728895d4eb859a0eaddbbcd1b47cb
--- 1/include/linux/bpf.h
--- 2/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@@ -2921,12 -2914,16 +2921,18 @@@ int bpf_check_uarg_tail_zero(bpfptr_t u
                             size_t actual_size);
  
  /* verify correctness of eBPF program */
 -int bpf_check(struct bpf_prog **fp, union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size);
 +struct bpf_log_attr;
 +int bpf_check(struct bpf_prog **fp, union bpf_attr *attr, bpfptr_t uattr,
 +            struct bpf_log_attr *attr_log);
  
  #ifndef CONFIG_BPF_JIT_ALWAYS_ON
- void bpf_patch_call_args(struct bpf_insn *insn, u32 stack_depth);
+ int bpf_patch_call_args(struct bpf_insn *insn, u32 stack_depth);
+ s32 bpf_call_args_imm(s16 idx);
+ #else
+ static inline s32 bpf_call_args_imm(s16 idx)
+ {
+       return 0;
+ }
  #endif
  
  struct btf *bpf_get_btf_vmlinux(void);

diff --cc include/linux/bpf_verifier.h
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc kernel/bpf/core.c
Simple merge

diff --cc kernel/bpf/fixups.c
Simple merge

diff --cc kernel/bpf/helpers.c
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc tools/testing/selftests/bpf/prog_tests/verifier.c
Simple merge