Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-04--12-00 (v6.12-rc5-1239-geebaff093fac) remotes/brancher/net-next-2024-11-04--15-00 (v6.12-rc5-1257-g886ac6a05b1b) ==== BASE DIFF ==== CREDITS | 4 + .../devicetree/bindings/net/fsl,enetc-mdio.yaml | 11 +- .../devicetree/bindings/net/fsl,enetc.yaml | 28 +- .../devicetree/bindings/net/nxp,netc-blk-ctrl.yaml | 104 +++ .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- .../devicetree/bindings/net/xlnx,axi-ethernet.yaml | 2 +- Documentation/netlink/specs/dpll.yaml | 41 ++ Documentation/networking/net_dim.rst | 2 +- MAINTAINERS | 8 +- arch/parisc/lib/checksum.c | 13 +- drivers/dpll/dpll_netlink.c | 24 + drivers/net/dsa/b53/b53_common.c | 3 +- drivers/net/dsa/bcm_sf2.c | 4 +- drivers/net/dsa/bcm_sf2.h | 4 +- drivers/net/dsa/bcm_sf2_cfp.c | 22 +- drivers/net/dsa/dsa_loop.c | 3 +- drivers/net/dsa/hirschmann/hellcreek.c | 8 +- drivers/net/dsa/microchip/ksz_common.c | 6 +- drivers/net/dsa/mt7530.c | 49 ++ drivers/net/dsa/mt7530.h | 12 + drivers/net/dsa/mv88e6xxx/chip.c | 57 +- drivers/net/dsa/mv88e6xxx/chip.h | 6 +- drivers/net/dsa/mv88e6xxx/serdes.c | 14 +- drivers/net/dsa/mv88e6xxx/serdes.h | 8 +- drivers/net/dsa/rzn1_a5psw.c | 6 +- drivers/net/dsa/sja1105/sja1105_ethtool.c | 7 +- drivers/net/dsa/xrs700x/xrs700x.c | 6 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 121 ++-- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 23 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +- .../net/ethernet/freescale/dpaa/dpaa_eth_trace.h | 2 +- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 40 +- .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 15 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 9 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 2 +- .../freescale/dpaa2/dpaa2-switch-ethtool.c | 9 +- drivers/net/ethernet/freescale/enetc/Kconfig | 40 ++ drivers/net/ethernet/freescale/enetc/Makefile | 9 + drivers/net/ethernet/freescale/enetc/enetc.c | 271 +++++--- drivers/net/ethernet/freescale/enetc/enetc.h | 30 +- drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 155 +++++ drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 756 +++++++++++++++++++++ .../net/ethernet/freescale/enetc/enetc_ethtool.c | 70 +- drivers/net/ethernet/freescale/enetc/enetc_hw.h | 53 +- .../net/ethernet/freescale/enetc/enetc_pci_mdio.c | 31 + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 331 +-------- drivers/net/ethernet/freescale/enetc/enetc_pf.h | 21 + .../net/ethernet/freescale/enetc/enetc_pf_common.c | 336 +++++++++ .../net/ethernet/freescale/enetc/enetc_pf_common.h | 19 + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_vf.c | 15 +- .../net/ethernet/freescale/enetc/netc_blk_ctrl.c | 445 ++++++++++++ drivers/net/ethernet/freescale/fman/fman.c | 1 - drivers/net/ethernet/freescale/fman/fman.h | 3 + drivers/net/ethernet/freescale/fman/mac.c | 5 + drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 +- drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 21 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- drivers/net/ethernet/ibm/emac/mal.c | 88 +-- drivers/net/ethernet/ibm/emac/rgmii.c | 49 +- drivers/net/ethernet/ibm/emac/tah.c | 49 +- drivers/net/ethernet/ibm/emac/zmii.c | 49 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 4 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 2 +- drivers/net/ethernet/mediatek/airoha_eth.c | 102 +-- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/Makefile | 63 +- drivers/net/ethernet/mellanox/mlx5/core/dpll.c | 81 +++ drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 73 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 16 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h | 4 +- .../steering/hws/{mlx5hws_action.c => action.c} | 2 +- .../steering/hws/{mlx5hws_action.h => action.h} | 6 +- .../core/steering/hws/{mlx5hws_buddy.c => buddy.c} | 4 +- .../core/steering/hws/{mlx5hws_buddy.h => buddy.h} | 6 +- .../core/steering/hws/{mlx5hws_bwc.c => bwc.c} | 2 +- .../core/steering/hws/{mlx5hws_bwc.h => bwc.h} | 6 +- .../hws/{mlx5hws_bwc_complex.c => bwc_complex.c} | 2 +- .../hws/{mlx5hws_bwc_complex.h => bwc_complex.h} | 6 +- .../core/steering/hws/{mlx5hws_cmd.c => cmd.c} | 2 +- .../core/steering/hws/{mlx5hws_cmd.h => cmd.h} | 6 +- .../steering/hws/{mlx5hws_context.c => context.c} | 2 +- .../steering/hws/{mlx5hws_context.h => context.h} | 6 +- .../core/steering/hws/{mlx5hws_debug.c => debug.c} | 2 +- .../core/steering/hws/{mlx5hws_debug.h => debug.h} | 6 +- .../steering/hws/{mlx5hws_definer.c => definer.c} | 2 +- .../steering/hws/{mlx5hws_definer.h => definer.h} | 6 +- .../hws/{mlx5hws_internal.h => internal.h} | 36 +- .../steering/hws/{mlx5hws_matcher.c => matcher.c} | 2 +- .../steering/hws/{mlx5hws_matcher.h => matcher.h} | 6 +- .../steering/hws/{mlx5hws_pat_arg.c => pat_arg.c} | 2 +- .../steering/hws/{mlx5hws_pat_arg.h => pat_arg.h} | 0 .../core/steering/hws/{mlx5hws_pool.c => pool.c} | 4 +- .../core/steering/hws/{mlx5hws_pool.h => pool.h} | 0 .../core/steering/hws/{mlx5hws_prm.h => prm.h} | 0 .../core/steering/hws/{mlx5hws_rule.c => rule.c} | 2 +- .../core/steering/hws/{mlx5hws_rule.h => rule.h} | 0 .../core/steering/hws/{mlx5hws_send.c => send.c} | 2 +- .../core/steering/hws/{mlx5hws_send.h => send.h} | 0 .../core/steering/hws/{mlx5hws_table.c => table.c} | 2 +- .../core/steering/hws/{mlx5hws_table.h => table.h} | 0 .../core/steering/hws/{mlx5hws_vport.c => vport.c} | 2 +- .../core/steering/hws/{mlx5hws_vport.h => vport.h} | 0 .../mlx5/core/steering/{ => sws}/dr_action.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/dr_arg.c | 0 .../mlx5/core/steering/{ => sws}/dr_buddy.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/dr_cmd.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/dr_dbg.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/dr_dbg.h | 0 .../mlx5/core/steering/{ => sws}/dr_definer.c | 0 .../mlx5/core/steering/{ => sws}/dr_domain.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/dr_fw.c | 0 .../mlx5/core/steering/{ => sws}/dr_icm_pool.c | 0 .../mlx5/core/steering/{ => sws}/dr_matcher.c | 0 .../mlx5/core/steering/{ => sws}/dr_ptrn.c | 0 .../mlx5/core/steering/{ => sws}/dr_rule.c | 0 .../mlx5/core/steering/{ => sws}/dr_send.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/dr_ste.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/dr_ste.h | 0 .../mlx5/core/steering/{ => sws}/dr_ste_v0.c | 0 .../mlx5/core/steering/{ => sws}/dr_ste_v1.c | 0 .../mlx5/core/steering/{ => sws}/dr_ste_v1.h | 0 .../mlx5/core/steering/{ => sws}/dr_ste_v2.c | 0 .../mlx5/core/steering/{ => sws}/dr_table.c | 0 .../mlx5/core/steering/{ => sws}/dr_types.h | 0 .../mellanox/mlx5/core/steering/{ => sws}/fs_dr.c | 0 .../mellanox/mlx5/core/steering/{ => sws}/fs_dr.h | 0 .../mlx5/core/steering/{ => sws}/mlx5_ifc_dr.h | 0 .../core/steering/{ => sws}/mlx5_ifc_dr_ste_v1.h | 0 .../mellanox/mlx5/core/steering/{ => sws}/mlx5dr.h | 0 drivers/net/ethernet/netronome/nfp/nfd3/dp.c | 4 +- drivers/net/ethernet/netronome/nfp/nfdk/dp.c | 4 +- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- drivers/net/ethernet/realtek/r8169_phy_config.c | 25 +- drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 - drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 11 +- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 150 ---- drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 26 - drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 6 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 31 +- drivers/net/ethernet/stmicro/stmmac/hwif.c | 7 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 20 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 11 +- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c | 413 +++++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.h | 33 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 165 +---- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 +- drivers/net/fjes/fjes_ethtool.c | 64 +- drivers/net/ipvlan/ipvlan_core.c | 3 +- drivers/net/phy/adin.c | 6 +- drivers/net/phy/icplus.c | 3 +- drivers/net/phy/marvell.c | 12 +- drivers/net/phy/micrel.c | 6 +- drivers/net/phy/mscc/mscc_main.c | 3 +- drivers/net/phy/nxp-c45-tja11xx.c | 6 +- drivers/net/phy/nxp-cbtx.c | 2 +- drivers/net/phy/qcom/qca83xx.c | 6 +- drivers/net/virtio_net.c | 2 +- drivers/net/vrf.c | 2 +- drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c | 2 +- drivers/ptp/ptp_fc3.c | 5 - drivers/ptp/ptp_pch.c | 6 +- drivers/soc/fsl/dpio/dpio-service.c | 2 +- include/linux/compiler_types.h | 6 + include/linux/dim.h | 5 +- include/linux/dpll.h | 4 + include/linux/dynamic_queue_limits.h | 2 +- include/linux/ethtool.h | 2 +- include/linux/fsl/netc_global.h | 19 + include/net/checksum.h | 6 + include/net/netlabel.h | 1 + include/net/netlink.h | 1 + include/net/tcp_ao.h | 3 +- include/uapi/linux/dpll.h | 24 + include/uapi/linux/ethtool.h | 33 +- lib/checksum.c | 11 +- lib/dim/dim.c | 3 +- lib/dim/net_dim.c | 10 +- lib/dynamic_queue_limits.c | 2 +- net/core/filter.c | 39 +- net/dsa/user.c | 13 +- net/ethtool/ioctl.c | 2 +- net/ethtool/linkinfo.c | 8 +- net/ethtool/linkmodes.c | 18 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_ao.c | 42 +- net/ipv4/tcp_cong.c | 3 +- net/ipv4/tcp_input.c | 4 +- net/ipv4/tcp_ipv4.c | 3 +- net/ipv6/tcp_ipv6.c | 4 +- net/netlink/af_netlink.c | 6 +- net/sctp/sm_statefuns.c | 2 +- tools/net/ynl/ynl-gen-c.py | 4 +- tools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 24 +- .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 264 ++++--- .../selftests/bpf/prog_tests/test_csum_diff.c | 408 +++++++++++ tools/testing/selftests/bpf/progs/csum_diff_test.c | 42 ++ .../selftests/bpf/progs/test_btf_skc_cls_ingress.c | 82 ++- .../bpf/progs/test_tcp_check_syncookie_kern.c | 167 ----- .../selftests/bpf/progs/verifier_array_access.c | 3 +- .../selftests/bpf/progs/xdp_synproxy_kern.c | 3 +- tools/testing/selftests/bpf/test_sockmap.c | 32 +- .../selftests/bpf/test_tcp_check_syncookie.sh | 85 --- .../selftests/bpf/test_tcp_check_syncookie_user.c | 213 ------ .../testing/selftests/drivers/net/netcons_basic.sh | 33 +- .../selftests/drivers/net/netdevsim/Makefile | 1 + tools/testing/selftests/net/veth.sh | 2 - .../tc-testing/tc-tests/infra/qdiscs.json | 98 +++ 226 files changed, 4540 insertions(+), 2314 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.zl0tsLCVFc b/tmp/tmp.csPXLF5lva index 29158efb8bf1..ecf8175c315b 100644 --- a/tmp/tmp.zl0tsLCVFc +++ b/tmp/tmp.csPXLF5lva @@ -4,6 +4,15 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +selftests: netfilter: nft_queue.sh: fix warnings with socat 1.8.0.0 +selftests: netfilter: run conntrack_dump_flush in netns +ipv6: Use local variable for ifa->flags in inet6_fill_ifaddr +net: arc: rockchip: fix emac mdio node support +net: arc: fix the device for dma_map_single/dma_unmap_single +mptcp: remove unneeded lock when listing scheds +Revert "igb: Disable threaded IRQ for igb_msix_other" +mptcp: use sock_kfree_s instead of kfree +mptcp: no admin perm to list endpoints selftests: net: include lib/sh/*.sh with lib.sh Fix u32's systematic failure to free IDR entries for hnodes. net: wwan: t7xx: Unify documentation column width @@ -95,103 +104,3 @@ mm: page_frag: use initial zero offset for page_frag_alloc_align() mm: move the page fragment allocator from page_alloc into its own file mm: page_frag: add a test module for page_frag net/smc: increase SMC_WR_BUF_CNT -Merge branch 'mx95-netc-support' -MAINTAINERS: update ENETC driver files and maintainers -net: enetc: add preliminary support for i.MX95 ENETC PF -net: enetc: optimize the allocation of tx_bdr -net: enetc: extract enetc_int_vector_init/destroy() from enetc_alloc_msix() -net: enetc: add i.MX95 EMDIO support -net: enetc: remove ERR050089 workaround for i.MX95 -net: enetc: build enetc_pf_common.c as a separate module -net: enetc: extract common ENETC PF parts for LS1028A and i.MX95 platforms -net: enetc: add initial netc-blk-ctrl driver support -dt-bindings: net: add bindings for NETC blocks control -dt-bindings: net: add i.MX95 ENETC support -dt-bindings: net: add compatible string for i.MX95 EMDIO -Merge branch 'mlx5-misc-patches-2024-10-31' -net/mlx5e: do not create xdp_redirect for non-uplink rep -net/mlx5e: move XDP_REDIRECT sq to dynamic allocation -net/mlx5: HWS, renamed the files in accordance with naming convention -net/mlx5: DR, moved all the SWS code into a separate directory -net/mlx5: Rework esw qos domain init and cleanup -selftests/tc-testing: add tests for qdisc_tree_reduce_backlog -Merge branch 'net-stmmac-refactor-fpe-as-a-separate-module' -net: stmmac: xgmac: Enable FPE for tc-mqprio/tc-taprio -net: stmmac: xgmac: Complete FPE support -net: stmmac: xgmac: Rename XGMAC_RQ to XGMAC_FPRQ -net: stmmac: Get the TC number of net_device by netdev_get_num_tc() -net: stmmac: Refactor FPE functions to generic version -net: stmmac: Introduce stmmac_fpe_supported() -net: stmmac: Rework macro definitions for gmac4 and xgmac -net: stmmac: Introduce separate files for FPE implementation -Merge branch 'r8169-align-rtl8125-rtl8126-phy-config-with-vendor-driver' -r8169: align RTL8126 EEE config with vendor driver -r8169: align RTL8125/RTL8126 PHY config with vendor driver -r8169: align RTL8125 EEE config with vendor driver -Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next -Merge branch 'ibm-emac-cleanup-modules-to-use-devm' -net: ibm: emac: mal: move irq maps down -net: ibm: emac: mal: use devm for request_irq -net: ibm: emac: mal: use devm for kzalloc -net: ibm: emac: zmii: devm_platform_get_resource -net: ibm: emac: zmii: use devm for mutex_init -net: ibm: emac: zmii: use devm for kzalloc -net: ibm: emac: rgmii: devm_platform_get_resource -net: ibm: emac: rgmii: use devm for mutex_init -net: ibm: emac: rgmii: use devm for kzalloc -net: ibm: emac: tah: devm_platform_get_resources -net: ibm: emac: tah: use devm for mutex_init -net: ibm: emac: tah: use devm for kzalloc -vrf: Prepare vrf_process_v4_outbound() to future .flowi4_tos conversion. -ipvlan: Prepare ipvlan_process_v4_outbound() to future .flowi4_tos conversion. -net: macb: avoid redundant lookup for "mdio" child node in MDIO setup -dt-bindings: net: snps,dwmac: Fix "snps,kbbe" type -ptp: fc3: remove redundant check on variable ret -net: dsa: mt7530: Add TBF qdisc offload support -dim: pass dim_sample to net_dim() by reference -dim: make dim_calc_stats() inputs const pointers -net/tcp: Add missing lockdep annotations for TCP-AO hlist traversals -Merge branch 'selftest-netconsole-enhance-selftest-to-validate-userdata-transmission' -net: netconsole: selftests: Add userdata validation -net: netconsole: selftests: Change the IP subnet -Merge branch 'simplify-tx-napi-logic-in-airoha_eth-driver' -net: airoha: Simplify Tx napi logic -net: airoha: Read completion queue data in airoha_qdma_tx_napi_poll() -net: bnxt: use ethtool string helpers -net: phy: use ethtool string helpers -Merge branch 'uapi-net-ethtool-avoid-thousands-of-wflex-array-member-not-at-end-warnings' -net: ethtool: Avoid thousands of -Wflex-array-member-not-at-end warnings -UAPI: ethtool: Use __struct_group() in struct ethtool_link_settings -net: dsa: use ethtool string helpers -Merge branch 'add-noinline_for_tracing-and-apply-it-to-tcp_drop_reason' -net: tcp: Add noinline_for_tracing annotation for tcp_drop_reason() -compiler_types: Add noinline_for_tracing annotation -Merge branch 'dpll-expose-clock-quality-level' -net/mlx5: DPLL, Add clock quality level op implementation -dpll: add clock quality level attribute and op -net: fjes: use ethtool string helpers -netlink: Remove the dead code in netlink_proto_init() -selftests/net: Fix ./ns-XXXXXX not cleanup -selftests: netdevsim: add fib_notifications to Makefile -dql: annotate data-races around dql->last_obj_cnt -netlink: add NLA_POLICY_MAX_LEN macro -fsl/fman: Validate cell-index value obtained from Device Tree -netlabel: document doi_remove field of struct netlbl_calipso_ops -ptp_pch: Replace deprecated PCI functions -net: freescale: use ethtool string helpers -tcp: only release congestion control if it has been initialized -selftests/bpf: Add a selftest for bpf_csum_diff() -selftests/bpf: Don't mask result of bpf_csum_diff() in test_verifier -bpf: bpf_csum_diff: Optimize and homogenize for all archs -net: checksum: Move from32to16() to generic header -selftests/bpf: remove xdp_synproxy IP_DF check -Merge branch 'selftests/bpf: integrate test_tcp_check_syncookie.sh into test_progs' -selftests/bpf: remove test_tcp_check_syncookie -selftests/bpf: test MSS value returned with bpf_tcp_gen_syncookie -selftests/bpf: add ipv4 and dual ipv4/ipv6 support in btf_skc_cls_ingress -selftests/bpf: get rid of global vars in btf_skc_cls_ingress -selftests/bpf: add missing ns cleanups in btf_skc_cls_ingress -selftests/bpf: factorize conn and syncookies tests in a single runner -Merge branch 'Two fixes for test_sockmap' -selftests/bpf: Fix txmsg_redir of test_txmsg_pull in test_sockmap -selftests/bpf: Fix msg_verify_data in test_sockmap