Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-20--03-00 (v6.13-rc3-752-g3e20b6999152) remotes/brancher/net-next-2024-12-20--06-00 (v6.13-rc3-754-geb2aa9989a7f) ==== BASE DIFF ==== Documentation/networking/index.rst | 1 + Documentation/networking/netmem.rst | 79 +++++++++ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 30 +--- drivers/net/ethernet/intel/ice/ice_xsk.c | 32 +--- drivers/net/ethernet/mediatek/airoha_eth.c | 33 +++- drivers/net/ethernet/sfc/io.h | 24 --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 - .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 39 ----- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 - drivers/net/ethernet/ti/cpsw.c | 3 +- drivers/net/ethernet/ti/cpsw_ethtool.c | 12 -- drivers/net/ethernet/ti/cpsw_new.c | 3 +- drivers/net/ethernet/ti/cpsw_priv.h | 1 - drivers/net/phy/phy_device.c | 16 ++ include/linux/phy.h | 1 + include/linux/skbuff.h | 16 +- include/net/page_pool/helpers.h | 9 ++ include/net/route.h | 14 -- include/net/xdp.h | 98 +++++++++++- include/net/xdp_sock_drv.h | 18 ++- net/core/xdp.c | 178 +++++++++++++++++++++ net/ipv4/ip_gre.c | 17 +- net/unix/Kconfig | 4 +- tools/testing/selftests/drivers/net/hw/ncdevmem.c | 3 - 24 files changed, 455 insertions(+), 183 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.URgnzkq4qQ b/tmp/tmp.ngvt9wN6an index 47f7d1d57286..0e0c9a62d7c9 100644 --- a/tmp/tmp.URgnzkq4qQ +++ b/tmp/tmp.ngvt9wN6an @@ -3,6 +3,19 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +net: renesas: rswitch: request ts interrupt at port open +net: renesas: rswitch: use per-port irq handlers +net/smc: fix data error when recvmsg with MSG_PEEK flag +eth: fbnic: support ring channel set while up +eth: fbnic: support ring channel get and set while down +eth: fbnic: centralize the queue count and NAPI<>queue setting +eth: fbnic: add IRQ reuse support +eth: fbnic: store NAPIs in an array instead of the list +eth: fbnic: let user control the RSS hash fields +eth: fbnic: support setting RSS configuration +eth: fbnic: don't reset the secondary RSS indir table +eth: fbnic: support querying RSS config +eth: fbnic: reorder ethtool code selftests: drv-net: assume stats refresh is 0 if no ethtool -c support sfc: Use netdev refcount tracking in struct efx_async_filter_insertion net: bridge: add skb drop reasons to the most common drop points @@ -12,14 +25,9 @@ selftests: net: local_termination: require mausezahn inetpeer: avoid false sharing in inet_peer_xrlim_allow() devlink: Improve the port attributes description net: Fix netns for ip_tunnel_init_flow() -net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user ports on 6393X -net: dsa: mv88e6xxx: Never force link on in-band managed MACs -net: dsa: mv88e6xxx: Give chips more time to activate their PPUs -net: dsa: mv88e6xxx: Improve I/O related error logging netlink: specs: mptcp: fix missing doc netlink: specs: mptcp: clearly mention attributes netlink: specs: mptcp: add missing 'server-side' attr -net: mdio_bus: change the bus name to mdio qlcnic: use const 'struct bin_attribute' callbacks vsock/test: Add test for MSG_ZEROCOPY completion memory leak vsock/test: Add test for sk_error_queue memory leak @@ -28,7 +36,6 @@ vsock/test: Adapt send_byte()/recv_byte() to handle MSG_ZEROCOPY vsock/test: Add README blurb about kmemleak usage vsock/test: Introduce option to select tests vsock/test: Use NSEC_PER_SEC -r8169: add support for RTL8125BP rev.b netrom: check buffer length before accessing it net: fix memory leak in tcp_conn_request() net: enetc: add UDP segmentation offload support @@ -40,13 +47,6 @@ netdev-genl: avoid empty messages in napi get net: page_pool: add page_pool_put_page_nosync() net: stmmac: restructure the error path of stmmac_probe_config_dt() eth: fbnic: fix csr boundary for RPM RAM section -unroll: add generic loop unroll helpers -xsk: add helper to get &xdp_desc's DMA and meta pointer in one go -xsk: add generic XSk &xdp_buff -> skb conversion -xsk: make xsk_buff_add_frag() really add the frag via __xdp_buff_add_frag() -xdp: add generic xdp_build_skb_from_buff() -xdp: add generic xdp_buff_add_frag() -page_pool: add page_pool_dev_alloc_netmem() selftests: net: Add a VLAN bridge binding selftest selftests: net: lib: Add a couple autodefer helpers net: bridge: Handle changes in VLAN_FLAG_BRIDGE_BINDING @@ -56,29 +56,15 @@ net: hisilicon: hns: Remove reset helpers net: hisilicon: hns: Remove unused hns_rcb_start net: hisilicon: hns: Remove unused hns_dsaf_roce_reset udp: Deal with race between UDP socket address change and rehash -af_unix: Add a prompt to CONFIG_AF_UNIX_OOB -sfc: remove efx_writed_page_locked -selftests: net: remove redundant ncdevmem print gve: fix XDP allocation path in edge cases gve: process XSK TX descriptors as part of RX NAPI gve: guard XSK operations on the existence of queues gve: guard XDP xmit NDO on existence of xdp queues gve: clean XDP queues in gve_tx_stop_ring_gqi -gre: Drop ip_route_output_gre(). -octeon_ep_vf: remove firmware stats fetch in ndo_get_stats64 -octeon_ep_vf: fix race conditions in ndo_get_stats64 -octeon_ep: remove firmware stats fetch in ndo_get_stats64 -octeon_ep: fix race conditions in ndo_get_stats64 -net: stmmac: Drop useless code related to ethtool rx-copybreak net: dsa: microchip: Do not execute PTP driver code for unsupported switches vsprintf: simplify number handling -net: Document netmem driver support net/mlx5: use do_aux_work for PHC overflow checks net: dwmac-imx: add imx93 clock input support in RMII mode -ARM: dts: ti/omap: remove eee-broken properties -net: ethernet: ti: cpsw: disable PHY EEE advertisement -net: phy: add phy_disable_eee -net: airoha: Fix error path in airoha_probe() l2tp: Use inet_sk_init_flowi4() in l2tp_ip_sendmsg(). ipv4: Use inet_sk_init_flowi4() in __ip_queue_xmit(). ipv4: Use inet_sk_init_flowi4() in inet_csk_rebuild_route().