Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

include/linux/filter.h
kernel/bpf/core.c
  66e13b615a0c ("bpf: verifier: prevent userspace memory access")
  d503a04f8bc0 ("bpf: Add support for certain atomics in bpf_arena to x86 JIT")
https://lore.kernel.org/all/20240429114939.210328b0@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/net/bpf_jit_32.c
Simple merge

diff --cc arch/arm64/net/bpf_jit_comp.c
Simple merge

diff --cc arch/riscv/net/bpf_jit_comp64.c
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/vxlan/vxlan_core.c
Simple merge

diff --cc fs/ntfs3/ntfs_fs.h
Simple merge

diff --cc fs/ntfs3/super.c
Simple merge

diff --cc include/linux/filter.h
index 7a27f19bf44d08839460105714ab93e044225b26,219ee7a76874439e9a2ecda7a402a7a9e741e0be..d5fea03cb6e615a02922b90407d2d2ca861d50e6
--- 1/include/linux/filter.h
--- 2/include/linux/filter.h
+++ b/include/linux/filter.h
@@@ -1000,7 -963,7 +1000,8 @@@ bool bpf_jit_supports_far_kfunc_call(vo
  bool bpf_jit_supports_exceptions(void);
  bool bpf_jit_supports_ptr_xchg(void);
  bool bpf_jit_supports_arena(void);
 +bool bpf_jit_supports_insn(struct bpf_insn *insn, bool in_arena);
+ u64 bpf_arch_uaddress_limit(void);
  void arch_bpf_stack_walk(bool (*consume_fn)(void *cookie, u64 ip, u64 sp, u64 bp), void *cookie);
  bool bpf_helper_changes_pkt_data(void *func);
  

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

diff --cc kernel/bpf/core.c
index 95c7fd093e556b8ce7913528d6c52cb900e45ed0,1ea5ce5bb59933ac4449567c52f1981c8df8a139..192f67dd1f251289a8cc786d615d066e475a7379
--- 1/kernel/bpf/core.c
--- 2/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@@ -2965,11 -2942,15 +2965,20 @@@ bool __weak bpf_jit_supports_arena(void
        return false;
  }
  
 +bool __weak bpf_jit_supports_insn(struct bpf_insn *insn, bool in_arena)
 +{
 +      return false;
 +}
 +
+ u64 __weak bpf_arch_uaddress_limit(void)
+ {
+ #if defined(CONFIG_64BIT) && defined(CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE)
+       return TASK_SIZE;
+ #else
+       return 0;
+ #endif
+ }
+ 
  /* Return TRUE if the JIT backend satisfies the following two conditions:
   * 1) JIT backend supports atomic_xchg() on pointer-sized words.
   * 2) Under the specific arch, the implementation of xchg() is the same

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

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/gro.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

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