Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-09-13--03-00 (v6.11-rc7-1539-g73666fd72ba3) remotes/brancher/net-next-2024-09-13--06-00 (v6.11-rc7-1553-gd497f92723a3) ==== BASE DIFF ==== .../device_drivers/ethernet/amazon/ena.rst | 5 + .../ethernet/mellanox/mlx5/counters.rst | 16 + drivers/net/bareudp.c | 26 +- drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 72 ++ drivers/net/ethernet/amazon/ena/ena_com.c | 173 ++++- drivers/net/ethernet/amazon/ena/ena_com.h | 68 ++ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 163 ++++- drivers/net/ethernet/amazon/ena/ena_netdev.c | 27 +- drivers/net/ethernet/amazon/ena/ena_netdev.h | 2 +- drivers/net/ethernet/apple/bmac.c | 3 +- drivers/net/ethernet/freescale/enetc/enetc.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 7 +- .../mellanox/mlx5/core/diag/fs_tracepoint.h | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 25 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 6 + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 4 + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 62 +- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 8 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 315 +++++++-- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 22 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 95 ++- drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 92 ++- .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 756 ++++++++++----------- .../mlx5/core/steering/hws/mlx5hws_matcher.c | 2 +- .../mellanox/mlx5/core/steering/hws/mlx5hws_rule.c | 8 +- .../mlx5/core/steering/hws/mlx5hws_table.c | 2 +- .../net/ethernet/netronome/nfp/nfp_net_common.c | 5 +- drivers/net/netkit.c | 1 + include/linux/mlx5/device.h | 1 + include/linux/mlx5/fs.h | 3 + include/linux/mlx5/mlx5_ifc.h | 11 +- include/net/netdev_rx_queue.h | 2 - include/trace/events/tcp.h | 12 +- include/uapi/linux/libc-compat.h | 36 - kernel/bpf/btf.c | 3 + kernel/bpf/cpumap.c | 6 +- kernel/bpf/verifier.c | 36 +- net/caif/chnl_net.c | 2 - net/core/filter.c | 3 +- net/core/skmsg.c | 2 +- net/core/sock_map.c | 1 + net/ipv4/tcp_bpf.c | 4 +- net/xdp/xsk_buff_pool.c | 10 +- net/xdp/xsk_queue.h | 5 - .../selftests/bpf/bpf_testmod/bpf_testmod-events.h | 6 + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 2 + tools/testing/selftests/bpf/prog_tests/dynptr.c | 37 +- .../selftests/bpf/prog_tests/tp_btf_nullable.c | 14 + tools/testing/selftests/bpf/progs/dynptr_fail.c | 25 + tools/testing/selftests/bpf/progs/dynptr_success.c | 23 + .../selftests/bpf/progs/test_tp_btf_nullable.c | 24 + tools/testing/selftests/bpf/xskxceiver.c | 43 +- tools/testing/selftests/bpf/xskxceiver.h | 1 - tools/testing/selftests/net/packetdrill/Makefile | 1 + tools/testing/selftests/net/packetdrill/config | 6 + .../selftests/net/packetdrill/ksft_runner.sh | 4 +- .../selftests/net/packetdrill/set_sysctls.py | 38 ++ .../tcp_slow_start_slow-start-ack-per-1pkt.pkt | 56 ++ ...low_start_slow-start-ack-per-2pkt-send-5pkt.pkt | 33 + ...low_start_slow-start-ack-per-2pkt-send-6pkt.pkt | 34 + .../tcp_slow_start_slow-start-ack-per-2pkt.pkt | 42 ++ .../tcp_slow_start_slow-start-ack-per-4pkt.pkt | 35 + .../tcp_slow_start_slow-start-after-idle.pkt | 39 ++ .../tcp_slow_start_slow-start-after-win-update.pkt | 50 ++ ..._start_slow-start-app-limited-9-packets-out.pkt | 38 ++ .../tcp_slow_start_slow-start-app-limited.pkt | 36 + .../tcp_slow_start_slow-start-fq-ack-per-2pkt.pkt | 63 ++ .../net/packetdrill/tcp_zerocopy_basic.pkt | 55 ++ .../net/packetdrill/tcp_zerocopy_batch.pkt | 41 ++ .../net/packetdrill/tcp_zerocopy_client.pkt | 30 + .../net/packetdrill/tcp_zerocopy_closed.pkt | 44 ++ .../net/packetdrill/tcp_zerocopy_epoll_edge.pkt | 61 ++ .../packetdrill/tcp_zerocopy_epoll_exclusive.pkt | 63 ++ .../net/packetdrill/tcp_zerocopy_epoll_oneshot.pkt | 66 ++ .../packetdrill/tcp_zerocopy_fastopen-client.pkt | 56 ++ .../packetdrill/tcp_zerocopy_fastopen-server.pkt | 44 ++ .../net/packetdrill/tcp_zerocopy_maxfrags.pkt | 118 ++++ .../net/packetdrill/tcp_zerocopy_small.pkt | 57 ++ 81 files changed, 2684 insertions(+), 722 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.4xUgEjvQgI b/tmp/tmp.9GtYCohNUy index 3a01f602ac70..222bbeb7b1e8 100644 --- a/tmp/tmp.4xUgEjvQgI +++ b/tmp/tmp.9GtYCohNUy @@ -2,18 +2,17 @@ tc_action dbg profile patch selftests/bpf: Fix a btf_dump selftest failure forwarding: set timeout to 3 hours +net: sched: cls_api: improve the error message for ID allocation failure Merge tag 'for-net-next-2024-09-12' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next usbnet: ipheth: prevent OoB reads of NDP16 fbnic: Set napi irq value after calling netif_napi_add net: enetc: Replace ifdef with IS_ENABLED octeontx2-af: debugfs: Add Channel info to RPM map octeontx2-af: Knobs for NPC default rule counters -tg3: Link IRQs to NAPI instances netkit: Assign missing bpf_net_context net/smc: remove useless macros in smc_close.h net:ipv4:ip_route_input_slow: Change behaviour of routing decision when IP router alert option is present net: tipc: avoid possible garbage value -memory-provider: fix compilation issue without SYSFS rtase: Fix error code in rtase_init_board() net: bonding: do not set force_primary if reselect is set to failure octeontx2-pf: Export common APIs @@ -31,29 +30,11 @@ net: hibmcge: Add interrupt supported in this module net: hibmcge: Add mdio and hardware configuration supported in this module net: hibmcge: Add read/write registers supported through the bar space net: hibmcge: Add pci table supported in this module -netlink: optimize the NMLSG_OK macro -net: stmmac: Fix zero-division error when disabling tc cbs enic: Report some per queue statistics in ethtool enic: Report per queue statistics in netdev qstats enic: Collect per queue statistics enic: Use macro instead of static const variables for array sizes smc: use RCU version of lower netdev searching -net/mlx5e: Match cleanup order in mlx5e_free_rq in reverse of mlx5e_alloc_rq -net/mlx5e: SHAMPO, Add no-split ethtool counters for header/data split -net/mlx5: Add NOT_READY command return status -net/mlx5: Allow users to configure affinity for SFs -net/mlx5: Skip HotPlug check on sync reset using hot reset -net/mlx5: Add support for sync reset using hot reset -net/mlx5: Add device cap for supporting hot reset in sync reset flow -net/mlx5: fs, add support for no append at software level -net/mlx5: fs, separate action and destination into distinct struct -net/mlx5: fs, remove unused member -net/mlx5: fs, move hardware fte deletion function reset -net/mlx5: fs, make get_root_namespace API function -net/mlx5: fs, move steering common function to fs_cmd.h -net/mlx5: HWS, fixed error flow return values of some functions -net/mlx5: HWS, updated API functions comments to kernel doc -net: ks8851: use %*ph to print small buffer net: tn40xx: register swnode and connect it to the mdiobus net: tn40xx: enable driver to support TN4010 cards with AQR105 PHY net: phy: aquantia: search for firmware-name in fwnode @@ -64,18 +45,12 @@ Documentation: networking: Fix missing PSE documentation issue net: dsa: lan9303: avoid dsa_switch_shutdown() net: ethernet: ag71xx: Remove dead code r8169: disable ALDPS per default for RTL8125 -net: ethtool: phy: Clear the netdev context pointer for DUMP requests selftests: fib_rule_tests: Add DSCP selector connect tests selftests: fib_rule_tests: Add DSCP selector match tests net: fib_rules: Enable DSCP selector usage ipv6: fib_rules: Add DSCP selector support ipv4: fib_rules: Add DSCP selector support net: fib_rules: Add DSCP selector attribute -nfp: Use IRQF_NO_AUTOEN flag in request_irq() -net: enetc: Use IRQF_NO_AUTOEN flag in request_irq() -net: apple: bmac: Use IRQF_NO_AUTOEN flag in request_irq() -bareudp: Pull inner IP header on xmit. -bareudp: Pull inner IP header in bareudp_udp_encap_recv(). bpf: selftests: send packet to devmap redirect XDP bpf: devmap: provide rxq after redirect net: ti: icssg-prueth: Add multicast filtering support in HSR mode @@ -83,8 +58,6 @@ net: ti: icssg-prueth: Enable HSR Tx duplication, Tx Tag and Rx Tag offload net: ti: icssg-prueth: Add support for HSR frame forward offload net: ti: icssg-prueth: Stop hardcoding def_inc net: ti: icss-iep: Move icss_iep structure -net: caif: remove unused name -uapi: libc-compat: remove ipx leftovers tcp: check skb is non-NULL in tcp_rto_delta_us() net: sockmap: avoid race between sock_map_destroy() and sk_psock_put() net: netconsole: fix wrong warning @@ -107,13 +80,6 @@ net: ethtool: Enhance error messages sent to user space net: ethtool: Add support for writing firmware blocks using EPL payload net: ethtool: Add new parameters and a function to support EPL selftests: net: ioam: add tunsrc support -Merge branch 'selftests-net-packetdrill-netns-and-two-imports' -selftests/net: packetdrill: import tcp/slow_start -selftests/net: packetdrill: import tcp/zerocopy -selftests/net: packetdrill: run in netns and expand config -Merge branch 'ena-driver-metrics-changes' -net: ena: Extend customer metrics reporting support -net: ena: Add ENA Express metrics support Bluetooth: btintel_pcie: Allocate memory for driver private data Bluetooth: btusb: Fix not handling ZPL/short-transfer Bluetooth: btusb: Add 2 USB HW IDs for MT7925 (0xe118/e)