From: Alexei Starovoitov <ast@kernel.org>
Date: Mon, 25 May 2026 13:33:15 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.1-rc5
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=eb19eead368bb0f0ef06a4125d03ed661cd23d36;p=thirdparty%2Flinux.git

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>
---

eb19eead368bb0f0ef06a4125d03ed661cd23d36
diff --cc include/linux/bpf.h
index 1b28cacc30756,cd191c5fdb0a5..1df67a59cd972
--- a/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);