Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-09-11--03-03 (v6.11-rc6-1432-g2cf54f9b0cc7) remotes/brancher/net-next-2024-09-11--06-03 (v6.11-rc6-1440-g31fa1b086bb3) ==== BASE DIFF ==== .../ethernet/mellanox/mlx5/kconfig.rst | 3 + drivers/net/ethernet/intel/ice/Makefile | 2 + drivers/net/ethernet/intel/ice/devlink/devlink.c | 46 + drivers/net/ethernet/intel/ice/devlink/devlink.h | 1 + .../net/ethernet/intel/ice/devlink/devlink_port.c | 506 ++++ .../net/ethernet/intel/ice/devlink/devlink_port.h | 46 + drivers/net/ethernet/intel/ice/ice.h | 19 +- drivers/net/ethernet/intel/ice/ice_base.c | 5 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 1 + drivers/net/ethernet/intel/ice/ice_eswitch.c | 111 +- drivers/net/ethernet/intel/ice/ice_eswitch.h | 22 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 +- drivers/net/ethernet/intel/ice/ice_lib.c | 65 +- drivers/net/ethernet/intel/ice/ice_lib.h | 3 + drivers/net/ethernet/intel/ice/ice_main.c | 66 +- drivers/net/ethernet/intel/ice/ice_repr.c | 211 +- drivers/net/ethernet/intel/ice/ice_repr.h | 22 +- drivers/net/ethernet/intel/ice/ice_sf_eth.c | 329 +++ drivers/net/ethernet/intel/ice/ice_sf_eth.h | 33 + .../net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c | 21 + .../net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h | 13 + drivers/net/ethernet/intel/ice/ice_sriov.c | 4 +- drivers/net/ethernet/intel/ice/ice_switch.c | 4 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- drivers/net/ethernet/intel/ice/ice_type.h | 1 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 4 +- drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c | 4 + drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 17 +- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 10 + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 21 + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 10 + .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 51 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 8 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/qos.c | 7 + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 12 +- .../mellanox/mlx5/core/steering/hws/Makefile | 2 + .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 954 +++++++ .../mlx5/core/steering/hws/mlx5hws_action.c | 2604 ++++++++++++++++++++ .../mlx5/core/steering/hws/mlx5hws_action.h | 307 +++ .../mlx5/core/steering/hws/mlx5hws_buddy.c | 149 ++ .../mlx5/core/steering/hws/mlx5hws_buddy.h | 21 + .../mellanox/mlx5/core/steering/hws/mlx5hws_bwc.c | 997 ++++++++ .../mellanox/mlx5/core/steering/hws/mlx5hws_bwc.h | 73 + .../mlx5/core/steering/hws/mlx5hws_bwc_complex.c | 86 + .../mlx5/core/steering/hws/mlx5hws_bwc_complex.h | 29 + .../mellanox/mlx5/core/steering/hws/mlx5hws_cmd.c | 1300 ++++++++++ .../mellanox/mlx5/core/steering/hws/mlx5hws_cmd.h | 361 +++ .../mlx5/core/steering/hws/mlx5hws_context.c | 260 ++ .../mlx5/core/steering/hws/mlx5hws_context.h | 64 + .../mlx5/core/steering/hws/mlx5hws_debug.c | 480 ++++ .../mlx5/core/steering/hws/mlx5hws_debug.h | 40 + .../mlx5/core/steering/hws/mlx5hws_definer.c | 2146 ++++++++++++++++ .../mlx5/core/steering/hws/mlx5hws_definer.h | 834 +++++++ .../mlx5/core/steering/hws/mlx5hws_internal.h | 59 + .../mlx5/core/steering/hws/mlx5hws_matcher.c | 1216 +++++++++ .../mlx5/core/steering/hws/mlx5hws_matcher.h | 107 + .../mlx5/core/steering/hws/mlx5hws_pat_arg.c | 579 +++++ .../mlx5/core/steering/hws/mlx5hws_pat_arg.h | 101 + .../mellanox/mlx5/core/steering/hws/mlx5hws_pool.c | 640 +++++ .../mellanox/mlx5/core/steering/hws/mlx5hws_pool.h | 151 ++ .../mellanox/mlx5/core/steering/hws/mlx5hws_prm.h | 514 ++++ .../mellanox/mlx5/core/steering/hws/mlx5hws_rule.c | 780 ++++++ .../mellanox/mlx5/core/steering/hws/mlx5hws_rule.h | 84 + .../mellanox/mlx5/core/steering/hws/mlx5hws_send.c | 1209 +++++++++ .../mellanox/mlx5/core/steering/hws/mlx5hws_send.h | 270 ++ .../mlx5/core/steering/hws/mlx5hws_table.c | 493 ++++ .../mlx5/core/steering/hws/mlx5hws_table.h | 68 + .../mlx5/core/steering/hws/mlx5hws_vport.c | 86 + .../mlx5/core/steering/hws/mlx5hws_vport.h | 13 + include/linux/mlx5/mlx5_ifc.h | 199 +- include/linux/mlx5/qp.h | 1 + 74 files changed, 18762 insertions(+), 209 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.a8SiuHVbSW b/tmp/tmp.pQtXdQd01a index 6b6756fcce50..191abc90c16d 100644 --- a/tmp/tmp.a8SiuHVbSW +++ b/tmp/tmp.pQtXdQd01a @@ -2,6 +2,10 @@ tc_action dbg profile patch selftests/bpf: Fix a btf_dump selftest failure forwarding: set timeout to 3 hours +selftests/net: packetdrill: import tcp/slow_start +selftests/net: packetdrill: import tcp/zerocopy +selftests/net: packetdrill: run in netns and expand config +net: gianfar: fix NVMEM mac address bareudp: Pull inner IP header on xmit. bareudp: Pull inner IP header in bareudp_udp_encap_recv(). gve: adopt page pool for DQ RDA mode @@ -43,36 +47,9 @@ idpf: refactor Tx completion routines netdevice: add netdev_tx_reset_subqueue() shorthand idpf: convert to libeth Tx buffer completion libeth: add Tx buffer completion helpers -igb: Always call igb_xdp_ring_update_tail() under Tx lock -ice: fix VSI lists confusion when adding VLANs -ice: stop calling pci_disable_device() as we use pcim -ice: fix accounting for filters shared by multiple VSIs -ice: Fix lldp packets dropping after changing the number of channels mptcp: disable active MPTCP in case of blackhole mptcp: fallback to TCP after SYN+MPC drops mptcp: export mptcp_subflow_early_fallback() -net/mlx5: Fix bridge mode operations when there are no VFs -net/mlx5: Verify support for scheduling element and TSAR type -net/mlx5: Add missing masks and QoS bit masks for scheduling elements -net/mlx5: Explicitly set scheduling element and TSAR type -net/mlx5e: Add missing link mode to ptys2ext_ethtool_map -net/mlx5e: Add missing link modes to ptys2ethtool_map -net/mlx5: Update the list of the PCI supported devices -net/mlx5: HWS, added API and enabled HWS support -net/mlx5: HWS, added send engine and context handling -net/mlx5: HWS, added debug dump and internal headers -net/mlx5: HWS, added backward-compatible API handling -net/mlx5: HWS, added memory management handling -net/mlx5: HWS, added vport handling -net/mlx5: HWS, added modify header pattern and args handling -net/mlx5: HWS, added FW commands handling -net/mlx5: HWS, added matchers functionality -net/mlx5: HWS, added definers handling -net/mlx5: HWS, added rules handling -net/mlx5: HWS, added tables handling -net/mlx5: HWS, added actions handling -net/mlx5: Added missing definitions in preparation for HW Steering -net/mlx5: Added missing mlx5_ifc definition for HW Steering net: seeq: Fix use after free vulnerability in ether3 Driver Due to Race Condition net: phy: microchip_t1: Cable Diagnostics for lan887x net: ena: Extend customer metrics reporting support @@ -104,21 +81,6 @@ net: tunnel: add skb_vlan_inet_prepare_reason() helper net: tunnel: add pskb_inet_may_pull_reason() helper net: skb: add pskb_network_may_pull_reason() helper selftests: net: ioam: add tunsrc support -ice: subfunction activation and base devlink ops -ice: basic support for VLAN in subfunctions -ice: support subfunction devlink Tx topology -ice: implement netdevice ops for SF representor -ice: check if SF is ready in ethtool ops -ice: don't set target VSI for subfunction -ice: create port representor for SF -ice: make representor code generic -ice: implement netdev for subfunction -ice: base subfunction aux driver -ice: allocate devlink for subfunction -ice: treat subfunction VSI the same as PF VSI -ice: add basic devlink subfunctions support -ice: export ice ndo_ops functions -ice: add new VSI type for subfunctions net: lan743x: Add support to ethtool phylink get and set settings net: lan743x: Migrate phylib to phylink net: lan743x: Create separate Link Speed Duplex state function