Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-15--12-00 (v6.12-rc2-773-g5ea956890b9a) remotes/brancher/net-next-2024-10-15--15-00 (v6.12-rc2-772-ge1be23f463c7) ==== BASE DIFF ==== Documentation/netlink/specs/rt_link.yaml | 15 + MAINTAINERS | 2 +- drivers/net/ethernet/freescale/gianfar.c | 7 +- drivers/net/netkit.c | 91 ++-- include/net/xdp_sock_drv.h | 14 +- include/net/xsk_buff_pool.h | 23 +- include/uapi/linux/batadv_packet.h | 29 +- include/uapi/linux/if_link.h | 15 + net/batman-adv/bat_iv_ogm.c | 4 +- net/batman-adv/bridge_loop_avoidance.c | 8 +- net/batman-adv/main.h | 2 +- net/batman-adv/translation-table.c | 96 +--- net/core/filter.c | 17 +- net/xdp/xsk.c | 38 +- net/xdp/xsk_buff_pool.c | 54 +- net/xdp/xsk_queue.h | 2 +- tools/include/uapi/linux/if_link.h | 553 ++++++++++++++++++++- tools/testing/selftests/bpf/network_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 121 +++++ .../selftests/bpf/prog_tests/netns_cookie.c | 29 +- tools/testing/selftests/bpf/prog_tests/tc_netkit.c | 94 +++- .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 44 +- tools/testing/selftests/bpf/progs/mptcp_bpf.h | 42 ++ tools/testing/selftests/bpf/progs/mptcp_subflow.c | 128 +++++ .../selftests/bpf/progs/netns_cookie_prog.c | 10 + tools/testing/selftests/bpf/progs/test_tc_link.c | 12 + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 7 +- 27 files changed, 1235 insertions(+), 223 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.EKlpQCfrPT b/tmp/tmp.PcU28kUxFO index d8addfd36eb4..8c60106c006e 100644 --- a/tmp/tmp.EKlpQCfrPT +++ b/tmp/tmp.PcU28kUxFO @@ -2,6 +2,9 @@ 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: bcmasp: fix potential memory leak in bcmasp_xmit() +net: wwan: fix global oob in wwan_rtnl_policy +net: pse-pd: Fix out of bound for loop netdevsim: macsec: pad u64 to correct length in logs xfrm: Convert __xfrm4_dst_lookup() to dscp_t. xfrm: Convert the ->dst_lookup() callback to dscp_t. @@ -19,11 +22,6 @@ mptcp: pm: fix UaF read in mptcp_pm_nl_rm_addr_or_subflow net: vxlan: replace VXLAN_INVALID_HDR with VNI_NOT_FOUND net: ethernet: mtk_eth_soc: fix memory corruption during fq dma init net: airoha: Fix typo in REG_CDM2_FWD_CFG configuration -batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback -batman-adv: Use string choice helper to print booleans -batman-adv: Add flex array to struct batadv_tvlv_tt_data -batman-adv: Start new development cycle -i40e: fix "Error I40E_AQ_RC_ENOSPC adding RX filters on VF" issue mlxsw: spectrum_router: fix xa_store() error checking fsl/fman: Fix refcount handling of fman-related devices fsl/fman: Save device references taken in mac_probe() @@ -31,7 +29,6 @@ net: phy: realtek: merge the drivers for internal NBase-T PHY's net: wwan: t7xx: add PM_AUTOSUSPEND_MS_BY_DW5933E for Dell DW5933e igb: Fix styling in enable/disable SR-IOV tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink(). -Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next net/mlx5: fs, rename modify header struct member action net/mlx5: fs, rename packet reformat struct member action net/mlx5: Only create VEPA flow table when in VEPA mode @@ -87,9 +84,6 @@ ip6mr: Lock RCU before ip6mr_get_table() call in ip6mr_compat_ioctl() ip6mr: Lock RCU before ip6mr_get_table() call in ip6mr_ioctl() ip6mr: Lock RCU before ip6mr_get_table() call in ip6mr_vif_seq_start() net: systemport: avoid build warnings due to unused I/O helpers -net: bcmasp: fix potential memory leak in bcmasp_xmit() -net: systemport: fix potential memory leak in bcm_sysport_xmit() -be2net: fix potential memory leak in be_xmit() net: ethernet: rtsn: fix potential memory leak in rtsn_start_xmit() net: xilinx: axienet: fix potential memory leak in axienet_start_xmit() selftests: mptcp: join: test for prohibited MPC to port-based endp @@ -105,7 +99,6 @@ macsec: Fix use-after-free while sending the offloading packet net: txgbe: Pass string literal as format argument of alloc_workqueue() net: dsa: microchip: copy string using strscpy net: stmmac: enable MAC after MTL configuring -net: phy: Refactor mediatek-ge-soc.c for clarity and correctness virtio_net: rx remove premapped failover code virtio_net: enable premapped mode for merge and small by default virtio_net: big mode skip the unmap check @@ -146,28 +139,3 @@ net: hns3: fix missing features due to dev->features configuration too early net: hns3: fixed reset failure issues caused by the incorrect reset type net: hns3: add sync command to sync io-pgtable net: hns3: default enable tx bounce buffer when smmu enabled -net: gianfar: Use __be64 * to store pointers to big endian values -xsk: Use xsk_buff_pool directly for cq functions -xsk: Wrap duplicated code to function -xsk: Carry a copy of xdp_zc_max_segs within xsk_buff_pool -xsk: Get rid of xdp_buff_xsk::orig_addr -xsk: s/free_list_node/list_node/ -xsk: Get rid of xdp_buff_xsk::xskb_list_node -Merge branch 'selftests/bpf: add coverage for xdp_features in test_progs' -selftests/bpf: check program redirect in xdp_cpumap_attach -selftests/bpf: make xdp_cpumap_attach keep redirect prog attached -selftests/bpf: fix bpf_map_redirect call for cpu map test -selftests/bpf: add tcx netns cookie tests -bpf: add get_netns_cookie helper to tc programs -selftests/bpf: add missing header include for htons -Merge branch 'netkit: Add option for scrubbing skb meta data' -selftests/bpf: Extend netkit tests to validate skb meta data -tools: Sync if_link.h uapi tooling header -netkit: Add add netkit scrub support to rt_link.yaml -netkit: Simplify netkit mode over to use NLA_POLICY_MAX -netkit: Add option for scrubbing skb meta data -bpf: Remove unused macro -Merge branch 'selftests/bpf: new MPTCP subflow subtest' -selftests/bpf: Add mptcp subflow subtest -selftests/bpf: Add getsockopt to inspect mptcp subflow -selftests/bpf: Add mptcp subflow example