Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-03--21-00 (v6.12-rc5-1208-g6418ff4a09be) remotes/brancher/net-next-2024-11-04--00-00 (v6.12-rc5-1210-g6a54f5d72487) ==== BASE DIFF ==== .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- arch/parisc/lib/checksum.c | 13 +- drivers/net/ethernet/cadence/macb_main.c | 23 +- 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/mellanox/mlx5/core/Makefile | 63 ++-- 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 | 6 +- 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/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/ipvlan/ipvlan_core.c | 3 +- drivers/net/vrf.c | 2 +- include/net/checksum.h | 6 + lib/checksum.c | 11 +- net/core/filter.c | 39 +- 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 ----------- .../tc-testing/tc-tests/infra/qdiscs.json | 98 +++++ 111 files changed, 1577 insertions(+), 1394 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.X6Q95DS9hP b/tmp/tmp.r7uF1HFXUL index 72fbd22b9f8c..6214b69c6e16 100644 --- a/tmp/tmp.X6Q95DS9hP +++ b/tmp/tmp.r7uF1HFXUL @@ -2,7 +2,6 @@ Revert "configs/debug: make sure PROVE_RCU_LIST=y takes effect" 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: stmmac: Add glue layer for T-HEAD TH1520 SoC dt-bindings: net: Add T-HEAD dwmac support tools: ynl-gen: de-kdocify enums with no doc for entries @@ -28,25 +27,15 @@ mISDN: Fix typos r8169: improve initialization of RSS registers on RTL8125/RTL8126 dt-bindings: net: snps,dwmac: add support for Arria10 net: stmmac: add support for dwmac 3.72a -bnxt_en: ethtool: Fix ip[4|6] ntuple rule verification +net: hisilicon: hns3: use ethtool string helpers +net: hisilicon: hns: use ethtool string helpers net: ena: simplify some pointer addition net: ena: remove devm from ethtool net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case -dt-bindings: net: snps,dwmac: Fix "snps,kbbe" type openvswitch: Pass on secpath details for internal port rx. -eth: fbnic: Add support to write TCE TCAM entries net: phy: respect cached advertising when re-enabling EEE Fix u32's systematic failure to free IDR entries for hnodes. -selftests/tc-testing: add tests for qdisc_tree_reduce_backlog netfilter: netlink: Report extack policy errors for batched ops -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 octeon_ep_vf: add checks to fix NULL pointer dereferences octeon_ep: add checks to fix NULL pointer dereferences octeon_ep: Add checks to fix double free crashes. @@ -59,52 +48,11 @@ net: sparx5: add new VCAP constants to match data net: sparx5: replace SPX5_PORTS with n_ports net: sparx5: expose some sparx5 VCAP symbols ipv6: ip6_fib: fix possible null-pointer-dereference in ipv6_route_native_seq_show -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 -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: net: really check for bg process completion ipv6: release nexthop on device removal -net: ipv6: fix inconsistent indentation in ipv6_gro_receive -net: hisilicon: use ethtool string helpers -net: mellanox: use ethtool string helpers -net: bnx2x: use ethtool string helpers -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 mlx5: only schedule EQ comp tasklet if necessary -netlink: specs: Enhance tsinfo netlink attributes and add a tsconfig set command -net: ethtool: Add support for tsconfig command to get/set hwtstamp config -net: ethtool: tsinfo: Add support for reading tsinfo for a specific hwtstamp provider -net: ptp: Move ptp_clock_index() to builtin symbol -net: macb: Convert to netdev_ptp_clock_register -net: netdevsim: ptp_mock: Convert to netdev_ptp_clock_register -net: Add the possibility to support a selected hwtstamp in netdevice -ptp: Add phc source and helpers to register specific PTP clock or get information -net: Make net_hwtstamp_validate accessible -net: Make dev_get_hwtstamp_phylib accessible -vrf: Prepare vrf_process_v4_outbound() to future .flowi4_tos conversion. chcr_ktls: fix a possible null-pointer dereference in chcr_ktls_dev_add() -ipvlan: Prepare ipvlan_process_v4_outbound() to future .flowi4_tos conversion. net: tcp: replace the document for "lsndtime" in tcp_sock -sunrpc: fix one UAF issue caused by sunrpc kernel tcp socket -net: macb: avoid redundant lookup for "mdio" child node in MDIO setup -net: enetc: prevent VF from configuring preemptiable TCs -net: xilinx: axienet: Check if Tx queue enabled -net: xilinx: axienet: Enqueue Tx packets in dql before dmaengine starts net: ip: make ip_route_use_hint() return drop reasons net: ip: make ip_mkroute_input/__mkroute_input return drop reasons net: ip: make ip_route_input() return drop reasons