Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf...

Daniel Borkmann says:

====================
pull-request: bpf-next 2024-10-31

We've added 13 non-merge commits during the last 16 day(s) which contain
a total of 16 files changed, 710 insertions(+), 668 deletions(-).

The main changes are:

1) Optimize and homogenize bpf_csum_diff helper for all archs and also
   add a batch of new BPF selftests for it, from Puranjay Mohan.

2) Rewrite and migrate the test_tcp_check_syncookie.sh BPF selftest
   into test_progs so that it can be run in BPF CI, from Alexis Lothoré.

3) Two BPF sockmap selftest fixes, from Zijian Zhang.

4) Small XDP synproxy BPF selftest cleanup to remove IP_DF check,
   from Vincent Li.

* tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next:
  selftests/bpf: Add a selftest for bpf_csum_diff()
  selftests/bpf: Don't mask result of bpf_csum_diff() in test_verifier
  bpf: bpf_csum_diff: Optimize and homogenize for all archs
  net: checksum: Move from32to16() to generic header
  selftests/bpf: remove xdp_synproxy IP_DF check
  selftests/bpf: remove test_tcp_check_syncookie
  selftests/bpf: test MSS value returned with bpf_tcp_gen_syncookie
  selftests/bpf: add ipv4 and dual ipv4/ipv6 support in btf_skc_cls_ingress
  selftests/bpf: get rid of global vars in btf_skc_cls_ingress
  selftests/bpf: add missing ns cleanups in btf_skc_cls_ingress
  selftests/bpf: factorize conn and syncookies tests in a single runner
  selftests/bpf: Fix txmsg_redir of test_txmsg_pull in test_sockmap
  selftests/bpf: Fix msg_verify_data in test_sockmap

====================

Link: https://patch.msgid.link/20241031221543.108853-1-daniel@iogearbox.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

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

diff --cc tools/testing/selftests/bpf/Makefile
index 75016962f79563d65138ec10e669a81858106ec4,46924f406d06f397ca391050ef85b46c9e612352..9ec53c858d8de83087f00be0c5ac217ffab90b0e
--- 1/tools/testing/selftests/bpf/Makefile
--- 2/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -154,11 -153,9 +153,23 @@@ TEST_PROGS_EXTENDED := with_addr.sh 
  
  # Compile but not part of 'make run_tests'
  TEST_GEN_PROGS_EXTENDED = \
-       flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \
-       test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \
-       xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \
-       xdp_features bpf_test_no_cfi.ko bpf_test_modorder_x.ko \
-       bpf_test_modorder_y.ko
 -      flow_dissector_load test_flow_dissector test_lirc_mode2_user xdping \
 -      test_cpp runqslower bench bpf_testmod.ko xskxceiver xdp_redirect_multi \
 -      xdp_synproxy veristat xdp_hw_metadata xdp_features bpf_test_no_cfi.ko
++      bench \
++      bpf_testmod.ko \
++      bpf_test_modorder_x.ko \
++      bpf_test_modorder_y.ko \
++      bpf_test_no_cfi.ko \
++      flow_dissector_load \
++      runqslower \
++      test_cpp \
++      test_flow_dissector \
++      test_lirc_mode2_user \
++      veristat \
++      xdp_features \
++      xdp_hw_metadata \
++      xdp_redirect_multi \
++      xdp_synproxy \
++      xdping \
++      xskxceiver
  
  TEST_GEN_FILES += liburandom_read.so urandom_read sign-file uprobe_multi