Skip to content

Commit edb9b8f

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from bpf, can and netfilter. Current release - regressions: - phy: fix null-deref in phy_attach_direct - mac802154: fix possible double free upon parsing error Previous releases - regressions: - bpf: preserve reg parent/live fields when copying range info, prevent mis-verification of programs as safe - ip6: fix GRE tunnels not generating IPv6 link local addresses - phy: dp83822: fix null-deref on DP83825/DP83826 devices - sctp: do not check hb_timer.expires when resetting hb_timer - eth: mtk_sock: fix SGMII configuration after phylink conversion Previous releases - always broken: - eth: xdp: execute xdp_do_flush() before napi_complete_done() - skb: do not mix page pool and page referenced frags in GRO - bpf: - fix a possible task gone issue with bpf_send_signal[_thread]() - fix an off-by-one bug in bpf_mem_cache_idx() to select the right cache - add missing btf_put to register_btf_id_dtor_kfuncs - sockmap: fon't let sock_map_{close,destroy,unhash} call itself - gso: fix null-deref in skb_segment_list() - mctp: purge receive queues on sk destruction - fix UaF caused by accept on already connected socket in exotic socket families - tls: don't treat list head as an entry in tls_is_tx_ready() - netfilter: br_netfilter: disable sabotage_in hook after first suppression - wwan: t7xx: fix runtime PM implementation Misc: - MAINTAINERS: spring cleanup of networking maintainers" * tag 'net-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (65 commits) mtk_sgmii: enable PCS polling to allow SFP work net: mediatek: sgmii: fix duplex configuration net: mediatek: sgmii: ensure the SGMII PHY is powered down on configuration MAINTAINERS: update SCTP maintainers MAINTAINERS: ipv6: retire Hideaki Yoshifuji mailmap: add John Crispin's entry MAINTAINERS: bonding: move Veaceslav Falico to CREDITS net: openvswitch: fix flow memory leak in ovs_flow_cmd_new net: ethernet: mtk_eth_soc: disable hardware DSA untagging for second MAC virtio-net: Keep stop() to follow mirror sequence of open() selftests: net: udpgso_bench_tx: Cater for pending datagrams zerocopy benchmarking selftests: net: udpgso_bench: Fix racing bug between the rx/tx programs selftests: net: udpgso_bench_rx/tx: Stop when wrong CLI args are provided selftests: net: udpgso_bench_rx: Fix 'used uninitialized' compiler warning can: mcp251xfd: mcp251xfd_ring_set_ringparam(): assign missing tx_obj_num_coalesce_irq can: isotp: split tx timer into transmission and timeout can: isotp: handle wait_event_interruptible() return values can: raw: fix CAN FD frame transmissions over CAN XL devices can: j1939: fix errant WARN_ON_ONCE in j1939_session_deactivate hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap() ...
2 parents e7368fd + 9983a2c commit edb9b8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+599
-272
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ Jisheng Zhang <[email protected]> <[email protected]>
214214
Jisheng Zhang <[email protected]> <[email protected]>
215215
Johan Hovold <[email protected]> <[email protected]>
216216
Johan Hovold <[email protected]> <[email protected]>
217+
John Crispin <[email protected]> <[email protected]>
217218
John Paul Adrian Glaubitz <[email protected]>
218219
John Stultz <[email protected]>
219220
Jordan Crouse <[email protected]> <[email protected]>

‎CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author)
11731173
D: APM driver (early port)
11741174
D: DRM drivers (author of several)
11751175

1176+
N: Veaceslav Falico
1177+
E: [email protected]
1178+
D: Co-maintainer and co-author of the network bonding driver.
1179+
11761180
N: János Farkas
11771181
E: [email protected]
11781182
D: romfs, various (mostly networking) fixes
@@ -4179,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu
41794183
S: 16 Baliqiao Nanjie, Beijing 101100
41804184
S: People's Repulic of China
41814185

4186+
N: Vlad Yasevich
4187+
E: [email protected]
4188+
D: SCTP protocol maintainer.
4189+
41824190
N: Aviad Yehezkel
41834191
E: [email protected]
41844192
D: Kernel TLS implementation and offload support.

‎Documentation/networking/device_drivers/ethernet/intel/ice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ NAPI
819819
----
820820
This driver supports NAPI (Rx polling mode).
821821
For more information on NAPI, see
822-
https://www.linuxfoundation.org/collaborate/workgroups/networking/napi
822+
https://wiki.linuxfoundation.org/networking/napi
823823

824824

825825
MACVLAN

‎MAINTAINERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3771,7 +3771,6 @@ F: net/bluetooth/
37713771

37723772
BONDING DRIVER
37733773
M: Jay Vosburgh <[email protected]>
3774-
M: Veaceslav Falico <[email protected]>
37753774
M: Andy Gospodarek <[email protected]>
37763775
L: [email protected]
37773776
S: Supported
@@ -14609,7 +14608,6 @@ F: tools/testing/selftests/net/ipsec.c
1460914608

1461014609
NETWORKING [IPv4/IPv6]
1461114610
M: "David S. Miller" <[email protected]>
14612-
M: Hideaki YOSHIFUJI <[email protected]>
1461314611
M: David Ahern <[email protected]>
1461414612
L: [email protected]
1461514613
S: Maintained
@@ -18692,9 +18690,9 @@ F: drivers/target/
1869218690
F: include/target/
1869318691

1869418692
SCTP PROTOCOL
18695-
M: Vlad Yasevich <[email protected]>
1869618693
M: Neil Horman <[email protected]>
1869718694
M: Marcelo Ricardo Leitner <[email protected]>
18695+
M: Xin Long <[email protected]>
1869818696
L: [email protected]
1869918697
S: Maintained
1870018698
W: http://lksctp.sourceforge.net

‎drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ mcp251xfd_ring_set_ringparam(struct net_device *ndev,
4848
priv->rx_obj_num = layout.cur_rx;
4949
priv->rx_obj_num_coalesce_irq = layout.rx_coalesce;
5050
priv->tx->obj_num = layout.cur_tx;
51+
priv->tx_obj_num_coalesce_irq = layout.tx_coalesce;
5152

5253
return 0;
5354
}

‎drivers/net/dsa/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ config NET_DSA_LANTIQ_GSWIP
3535
the xrx200 / VR9 SoC.
3636

3737
config NET_DSA_MT7530
38-
tristate "MediaTek MT753x and MT7621 Ethernet switch support"
38+
tristate "MediaTek MT7530 and MT7531 Ethernet switch support"
3939
select NET_DSA_TAG_MTK
4040
select MEDIATEK_GE_PHY
4141
help
42-
This enables support for the MediaTek MT7530, MT7531, and MT7621
43-
Ethernet switch chips.
42+
This enables support for the MediaTek MT7530 and MT7531 Ethernet
43+
switch chips. Multi-chip module MT7530 in MT7621AT, MT7621DAT,
44+
MT7621ST and MT7623AI SoCs is supported.
4445

4546
config NET_DSA_MV88E6060
4647
tristate "Marvell 88E6060 ethernet switch chip support"

‎drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2410,16 +2410,16 @@ static int dpaa_eth_poll(struct napi_struct *napi, int budget)
24102410

24112411
cleaned = qman_p_poll_dqrr(np->p, budget);
24122412

2413+
if (np->xdp_act & XDP_REDIRECT)
2414+
xdp_do_flush();
2415+
24132416
if (cleaned < budget) {
24142417
napi_complete_done(napi, cleaned);
24152418
qman_p_irqsource_add(np->p, QM_PIRQ_DQRI);
24162419
} else if (np->down) {
24172420
qman_p_irqsource_add(np->p, QM_PIRQ_DQRI);
24182421
}
24192422

2420-
if (np->xdp_act & XDP_REDIRECT)
2421-
xdp_do_flush();
2422-
24232423
return cleaned;
24242424
}
24252425

‎drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,10 +1993,15 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)
19931993
if (rx_cleaned >= budget ||
19941994
txconf_cleaned >= DPAA2_ETH_TXCONF_PER_NAPI) {
19951995
work_done = budget;
1996+
if (ch->xdp.res & XDP_REDIRECT)
1997+
xdp_do_flush();
19961998
goto out;
19971999
}
19982000
} while (store_cleaned);
19992001

2002+
if (ch->xdp.res & XDP_REDIRECT)
2003+
xdp_do_flush();
2004+
20002005
/* Update NET DIM with the values for this CDAN */
20012006
dpaa2_io_update_net_dim(ch->dpio, ch->stats.frames_per_cdan,
20022007
ch->stats.bytes_per_cdan);
@@ -2032,9 +2037,7 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)
20322037
txc_fq->dq_bytes = 0;
20332038
}
20342039

2035-
if (ch->xdp.res & XDP_REDIRECT)
2036-
xdp_do_flush_map();
2037-
else if (rx_cleaned && ch->xdp.res & XDP_TX)
2040+
if (rx_cleaned && ch->xdp.res & XDP_TX)
20382041
dpaa2_eth_xdp_tx_flush(priv, ch, &priv->fq[flowid]);
20392042

20402043
return work_done;

‎drivers/net/ethernet/freescale/fman/fman_memac.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,9 @@ static struct phylink_pcs *memac_pcs_create(struct device_node *mac_node,
10551055
return ERR_PTR(-EPROBE_DEFER);
10561056

10571057
pcs = lynx_pcs_create(mdiodev);
1058+
if (!pcs)
1059+
mdio_device_free(mdiodev);
1060+
10581061
return pcs;
10591062
}
10601063

‎drivers/net/ethernet/intel/ice/ice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ void ice_set_ethtool_repr_ops(struct net_device *netdev);
880880
void ice_set_ethtool_safe_mode_ops(struct net_device *netdev);
881881
u16 ice_get_avail_txq_count(struct ice_pf *pf);
882882
u16 ice_get_avail_rxq_count(struct ice_pf *pf);
883-
int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx);
883+
int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked);
884884
void ice_update_vsi_stats(struct ice_vsi *vsi);
885885
void ice_update_pf_stats(struct ice_pf *pf);
886886
void

0 commit comments

Comments
 (0)