Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-09-18--08-00 (v6.17-rc5-1377-gb0361dd583cc) remotes/brancher/net-next-hw-2025-09-18--16-00 (v6.17-rc5-1391-gbbbe639c558e) ==== BASE DIFF ==== Documentation/netlink/specs/psp.yaml | 187 ++++ .../device_drivers/ethernet/meta/fbnic.rst | 19 + Documentation/networking/index.rst | 1 + Documentation/networking/psp.rst | 183 ++++ MAINTAINERS | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 57 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 13 - drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 45 +- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 21 +- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 2 +- drivers/net/ethernet/broadcom/cnic.c | 3 +- .../net/ethernet/cavium/liquidio/request_manager.c | 2 +- .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 11 + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +- drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en/params.c | 4 +- .../mellanox/mlx5/core/en_accel/en_accel.h | 50 +- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en_accel/psp.c | 952 +++++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/en_accel/psp.h | 61 ++ .../mellanox/mlx5/core/en_accel/psp_rxtx.c | 200 +++++ .../mellanox/mlx5/core/en_accel/psp_rxtx.h | 121 +++ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 49 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 10 +- .../net/ethernet/mellanox/mlx5/core/lib/crypto.h | 1 + drivers/net/ethernet/meta/fbnic/fbnic.h | 13 + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 18 + drivers/net/ethernet/meta/fbnic/fbnic_devlink.c | 249 ++++++ drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 241 +++++- drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 47 + drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_fw_log.h | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 1 + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 39 +- drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 57 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 15 +- drivers/net/ethernet/renesas/rswitch_main.c | 4 +- drivers/net/virtio_net.c | 15 +- include/linux/bnxt/hsi.h | 61 ++ include/linux/ethtool.h | 2 + include/linux/ipv6.h | 37 +- include/linux/netdevice.h | 4 + include/linux/skbuff.h | 3 + include/linux/udp.h | 1 + include/net/dropreason-core.h | 6 + include/net/inet_timewait_sock.h | 8 + include/net/ip6_route.h | 8 +- include/net/psp.h | 12 + include/net/psp/functions.h | 210 +++++ include/net/psp/types.h | 184 ++++ include/net/sock.h | 35 +- include/net/udp.h | 6 + include/uapi/linux/psp.h | 66 ++ net/Kconfig | 1 + net/Makefile | 1 + net/core/dev.c | 32 + net/core/gro.c | 2 + net/core/skbuff.c | 4 + net/core/sock.c | 1 - net/devlink/rate.c | 4 +- net/ethtool/common.c | 20 + net/ethtool/common.h | 2 + net/ethtool/ioctl.c | 69 +- net/ethtool/rss.c | 15 +- net/ipv4/af_inet.c | 2 + net/ipv4/inet_timewait_sock.c | 5 + net/ipv4/ip_output.c | 5 +- net/ipv4/tcp.c | 2 + net/ipv4/tcp_ipv4.c | 18 +- net/ipv4/tcp_minisocks.c | 20 + net/ipv4/tcp_output.c | 17 +- net/ipv4/udp.c | 50 +- net/ipv6/af_inet6.c | 2 +- net/ipv6/inet6_connection_sock.c | 2 +- net/ipv6/ip6_output.c | 6 +- net/ipv6/ipv6_sockglue.c | 6 +- net/ipv6/raw.c | 2 +- net/ipv6/route.c | 7 +- net/ipv6/tcp_ipv6.c | 21 +- net/ipv6/udp.c | 8 +- net/psp/Kconfig | 15 + net/psp/Makefile | 5 + net/psp/psp-nl-gen.c | 119 +++ net/psp/psp-nl-gen.h | 39 + net/psp/psp.h | 54 ++ net/psp/psp_main.c | 321 +++++++ net/psp/psp_nl.c | 505 +++++++++++ net/psp/psp_sock.c | 295 +++++++ net/tls/tls.h | 1 + net/tls/tls_strp.c | 14 +- net/tls/tls_sw.c | 3 +- tools/net/ynl/Makefile.deps | 1 + tools/testing/selftests/net/tls.c | 16 + 99 files changed, 4843 insertions(+), 249 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.8tDbrMYwoE b/tmp/tmp.c0hEazNfk5 index c8dbe29335eb..81ec0ee8a555 100644 --- a/tmp/tmp.8tDbrMYwoE +++ b/tmp/tmp.c0hEazNfk5 @@ -15,7 +15,6 @@ nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests r8169: set EEE speed down ratio to 1 net/smc: fix warning in smc_rx_splice() when calling get_page() -net: liquidio: fix overflow in octeon_init_instr_queue() net: stmmac: remove mac_interface net: stmmac: thead: convert to use phy_interface net: stmmac: sun8i: convert to use phy_interface @@ -26,8 +25,6 @@ net: stmmac: ingenic: convert to use phy_interface net: stmmac: imx: convert to use phy_interface net: stmmac: use phy_interface in stmmac_check_pcs_mode() net: stmmac: rework mac_interface and phy_interface documentation -net: clear sk->sk_ino in sk_set_socket(sk, NULL) -Revert "net/mlx5e: Update and set Xon/Xoff upon port speed set" selftests/net: Test tcp port reuse after unbinding a socket tcp: Update bind bucket state on port release net: xilinx: axienet: Fix kernel-doc warning for axienet_free_tx_chain return value @@ -37,66 +34,10 @@ net: tun: Update napi->skb after XDP process net: ethernet: microchip: sparx5: make it selectable for ARCH_LAN969X net: phy: micrel: Add Fast link failure support for lan8842 Merge tag 'mlx5-next-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux -net: virtio_net: add get_rxrings ethtool callback for RX ring queries -net: ethtool: use the new helper in rss_set_prep_indir() -net: ethtool: update set_rxfh_indir to use ethtool_get_rx_ring_count helper -net: ethtool: update set_rxfh to use ethtool_get_rx_ring_count helper -net: ethtool: add get_rx_ring_count callback to optimize RX ring queries -net: ethtool: remove the duplicated handling from ethtool_get_rxrings -net: ethtool: add support for ETHTOOL_GRXRINGS ioctl -net: ethtool: pass the num of RX rings directly to ethtool_copy_validate_indir rtnetlink: specs: Add {head,tail}room to rt-link.yaml rtnetlink: add needed_{head,tail}room attributes net: phy: clear link parameters on admin link down -net: wan: framer: Add version sysfs attribute for the Lantiq PEF2256 framer -octeontx2-pf: Fix use-after-free bugs in otx2_sync_tstamp() -cnic: Fix use-after-free bugs in cnic_delete_task net: ti: am65-cpsw: Update hw timestamping filter for PTPv1 RX packets -bnxt_en: Implement ethtool .set_tunable() for ETHTOOL_PFC_PREVENTION_TOUT -bnxt_en: Implement ethtool .get_tunable() for ETHTOOL_PFC_PREVENTION_TOUT -bnxt_en: Use VLAN_ETH_HLEN when possible -bnxt_en: Support for RoCE resources dynamically shared within VFs. -bnxt_en: Add err_qpc backing store handling -bnxt_en: Add fw log trace support for 5731X/5741X chips -bnxt_en: Improve bnxt_backing_store_cfg_v2() -bnxt_en: Optimize bnxt_sriov_disable() -bnxt_en: Remove unnecessary VF check in bnxt_hwrm_nvm_req() -bnxt_en: Drop redundant if block in bnxt_dl_flash_update() -selftests: tls: test skb copy under mem pressure and OOB -tls: make sure to abort the stream if headers are bogus -eth: fbnic: add OTP health reporter -eth: fbnic: report FW uptime in health diagnose -eth: fbnic: add FW health reporter -eth: fbnic: support FW communication for core dump -eth: fbnic: support allocating FW completions with extra space -eth: fbnic: reprogram TCAMs after FW crash -eth: fbnic: factor out clearing the action TCAM -eth: fbnic: use fw uptime to detect fw crashes -eth: fbnic: make fbnic_fw_log_write() parameter const -net: sfp: remove old sfp_parse_* functions -net: phy: update all PHYs to use sfp_get_module_caps() -net: phylink: use sfp_get_module_caps() -net: sfp: provide sfp_get_module_caps() -net: sfp: convert sfp quirks to modify struct sfp_module_support -net: sfp: pre-parse the module support -net: phy: add phy_interface_copy() -net: renesas: rswitch: simplify rswitch_stop() -udp: use skb_attempt_defer_free() -udp: make busylock per socket -udp: add udp_drops_inc() helper -net: group sk_backlog and sk_receive_queue -udp: update sk_rmem_alloc before busylock acquisition -udp: refine __udp_enqueue_schedule_skb() test -ipv6: reorganise struct ipv6_pinfo -ipv6: np->rxpmtu race annotation -ipv6: make ipv6_pinfo.daddr_cache a boolean -ipv6: make ipv6_pinfo.saddr_cache a boolean -eth: fbnic: support devmem Tx -selftests/net: test ipip packets in gro.sh -net: gro: remove unnecessary df checks -net: gso: restore ids of outer ip headers correctly -net: gro: only merge packets with incrementing or fixed outer ids -net: gro: remove is_ipv6 from napi_gro_cb net/mlx5e: Prevent WQE metadata conflicts between timestamping and offloads net/mlx5: Refactor MACsec WQE metadata shifts net/mlx5: Remove VLAN insertion fields from WQE Ether segment