Skip to content

Commit 18a7e21

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Paolo Abeni: "Including fixes from netfilter. Current release - regressions: - mlx5: fix pre-2.40 binutils assembler error Current release - new code bugs: - net: psp: don't assume reply skbs will have a socket - eth: fbnic: fix missing programming of the default descriptor Previous releases - regressions: - page_pool: fix PP_MAGIC_MASK to avoid crashing on some 32-bit arches - tcp: - take care of zero tp->window_clamp in tcp_set_rcvlowat() - don't call reqsk_fastopen_remove() in tcp_conn_request() - eth: - ice: release xa entry on adapter allocation failure - usb: asix: hold PM usage ref to avoid PM/MDIO + RTNL deadlock Previous releases - always broken: - netfilter: validate objref and objrefmap expressions - sctp: fix a null dereference in sctp_disposition sctp_sf_do_5_1D_ce() - eth: - mlx4: prevent potential use after free in mlx4_en_do_uc_filter() - mlx5: prevent tunnel mode conflicts between FDB and NIC IPsec tables - ocelot: fix use-after-free caused by cyclic delayed work Misc: - add support for MediaTek PCIe 5G HP DRMR-H01" * tag 'net-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (38 commits) net: airoha: Fix loopback mode configuration for GDM2 port selftests: drv-net: pp_alloc_fail: add necessary optoins to config selftests: drv-net: pp_alloc_fail: lower traffic expectations selftests: drv-net: fix linter warnings in pp_alloc_fail eth: fbnic: fix reporting of alloc_failed qstats selftests: drv-net: xdp: add test for interface level qstats selftests: drv-net: xdp: rename netnl to ethnl eth: fbnic: fix saving stats from XDP_TX rings on close eth: fbnic: fix accounting of XDP packets eth: fbnic: fix missing programming of the default descriptor selftests: netfilter: query conntrack state to check for port clash resolution selftests: netfilter: nft_fib.sh: fix spurious test failures bridge: br_vlan_fill_forward_path_pvid: use br_vlan_group_rcu() netfilter: nft_objref: validate objref and objrefmap expressions net: pse-pd: tps23881: Fix current measurement scaling net/mlx5: fix pre-2.40 binutils assembler error net/mlx5e: Do not fail PSP init on missing caps net/mlx5e: Prevent tunnel reformat when tunnel mode not allowed net/mlx5: Prevent tunnel mode conflicts between FDB and NIC IPsec tables net: usb: asix: hold PM usage ref to avoid PM/MDIO + RTNL deadlock ...
2 parents 9361cac + fea8cdf commit 18a7e21

Some content is hidden

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

77 files changed

+1113
-596
lines changed

‎drivers/net/ethernet/airoha/airoha_eth.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,9 @@ static void airhoha_set_gdm2_loopback(struct airoha_gdm_port *port)
17101710
airoha_fe_wr(eth, REG_GDM_RXCHN_EN(2), 0xffff);
17111711
airoha_fe_rmw(eth, REG_GDM_LPBK_CFG(2),
17121712
LPBK_CHAN_MASK | LPBK_MODE_MASK | LPBK_EN_MASK,
1713-
FIELD_PREP(LPBK_CHAN_MASK, chan) | LPBK_EN_MASK);
1713+
FIELD_PREP(LPBK_CHAN_MASK, chan) |
1714+
LBK_GAP_MODE_MASK | LBK_LEN_MODE_MASK |
1715+
LBK_CHAN_MODE_MASK | LPBK_EN_MASK);
17141716
airoha_fe_rmw(eth, REG_GDM_LEN_CFG(2),
17151717
GDM_SHORT_LEN_MASK | GDM_LONG_LEN_MASK,
17161718
FIELD_PREP(GDM_SHORT_LEN_MASK, 60) |

‎drivers/net/ethernet/airoha/airoha_regs.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@
151151
#define LPBK_LEN_MASK GENMASK(23, 10)
152152
#define LPBK_CHAN_MASK GENMASK(8, 4)
153153
#define LPBK_MODE_MASK GENMASK(3, 1)
154+
#define LBK_GAP_MODE_MASK BIT(3)
155+
#define LBK_LEN_MODE_MASK BIT(2)
156+
#define LBK_CHAN_MODE_MASK BIT(1)
154157
#define LPBK_EN_MASK BIT(0)
155158

156159
#define REG_GDM_TXCHN_EN(_n) (GDM_BASE(_n) + 0x24)

‎drivers/net/ethernet/freescale/fsl_pq_mdio.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,12 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
479479
"missing 'reg' property in node %pOF\n",
480480
tbi);
481481
err = -EBUSY;
482+
of_node_put(tbi);
482483
goto error;
483484
}
484485
set_tbipa(*prop, pdev,
485486
data->get_tbipa, priv->map, &res);
487+
of_node_put(tbi);
486488
}
487489
}
488490

‎drivers/net/ethernet/intel/ice/ice_adapter.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,21 @@ struct ice_adapter *ice_adapter_get(struct pci_dev *pdev)
9999

100100
index = ice_adapter_xa_index(pdev);
101101
scoped_guard(mutex, &ice_adapters_mutex) {
102-
err = xa_insert(&ice_adapters, index, NULL, GFP_KERNEL);
103-
if (err == -EBUSY) {
104-
adapter = xa_load(&ice_adapters, index);
102+
adapter = xa_load(&ice_adapters, index);
103+
if (adapter) {
105104
refcount_inc(&adapter->refcount);
106105
WARN_ON_ONCE(adapter->index != ice_adapter_index(pdev));
107106
return adapter;
108107
}
108+
err = xa_reserve(&ice_adapters, index, GFP_KERNEL);
109109
if (err)
110110
return ERR_PTR(err);
111111

112112
adapter = ice_adapter_new(pdev);
113-
if (!adapter)
113+
if (!adapter) {
114+
xa_release(&ice_adapters, index);
114115
return ERR_PTR(-ENOMEM);
116+
}
115117
xa_store(&ice_adapters, index, adapter, GFP_KERNEL);
116118
}
117119
return adapter;

‎drivers/net/ethernet/mellanox/mlx4/en_netdev.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,9 +1180,9 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
11801180
mlx4_unregister_mac(mdev->dev, priv->port, mac);
11811181

11821182
hlist_del_rcu(&entry->hlist);
1183-
kfree_rcu(entry, rcu);
11841183
en_dbg(DRV, priv, "Removed MAC %pM on port:%d\n",
11851184
entry->mac, priv->port);
1185+
kfree_rcu(entry, rcu);
11861186
++removed;
11871187
}
11881188
}

‎drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,7 @@ static int mlx5e_xfrm_add_state(struct net_device *dev,
772772
struct netlink_ext_ack *extack)
773773
{
774774
struct mlx5e_ipsec_sa_entry *sa_entry = NULL;
775+
bool allow_tunnel_mode = false;
775776
struct mlx5e_ipsec *ipsec;
776777
struct mlx5e_priv *priv;
777778
gfp_t gfp;
@@ -803,6 +804,20 @@ static int mlx5e_xfrm_add_state(struct net_device *dev,
803804
goto err_xfrm;
804805
}
805806

807+
if (mlx5_eswitch_block_mode(priv->mdev))
808+
goto unblock_ipsec;
809+
810+
if (x->props.mode == XFRM_MODE_TUNNEL &&
811+
x->xso.type == XFRM_DEV_OFFLOAD_PACKET) {
812+
allow_tunnel_mode = mlx5e_ipsec_fs_tunnel_allowed(sa_entry);
813+
if (!allow_tunnel_mode) {
814+
NL_SET_ERR_MSG_MOD(extack,
815+
"Packet offload tunnel mode is disabled due to encap settings");
816+
err = -EINVAL;
817+
goto unblock_mode;
818+
}
819+
}
820+
806821
/* check esn */
807822
if (x->props.flags & XFRM_STATE_ESN)
808823
mlx5e_ipsec_update_esn_state(sa_entry);
@@ -817,7 +832,7 @@ static int mlx5e_xfrm_add_state(struct net_device *dev,
817832

818833
err = mlx5_ipsec_create_work(sa_entry);
819834
if (err)
820-
goto unblock_ipsec;
835+
goto unblock_encap;
821836

822837
err = mlx5e_ipsec_create_dwork(sa_entry);
823838
if (err)
@@ -832,14 +847,6 @@ static int mlx5e_xfrm_add_state(struct net_device *dev,
832847
if (err)
833848
goto err_hw_ctx;
834849

835-
if (x->props.mode == XFRM_MODE_TUNNEL &&
836-
x->xso.type == XFRM_DEV_OFFLOAD_PACKET &&
837-
!mlx5e_ipsec_fs_tunnel_enabled(sa_entry)) {
838-
NL_SET_ERR_MSG_MOD(extack, "Packet offload tunnel mode is disabled due to encap settings");
839-
err = -EINVAL;
840-
goto err_add_rule;
841-
}
842-
843850
/* We use *_bh() variant because xfrm_timer_handler(), which runs
844851
* in softirq context, can reach our state delete logic and we need
845852
* xa_erase_bh() there.
@@ -855,8 +862,7 @@ static int mlx5e_xfrm_add_state(struct net_device *dev,
855862
queue_delayed_work(ipsec->wq, &sa_entry->dwork->dwork,
856863
MLX5_IPSEC_RESCHED);
857864

858-
if (x->xso.type == XFRM_DEV_OFFLOAD_PACKET &&
859-
x->props.mode == XFRM_MODE_TUNNEL) {
865+
if (allow_tunnel_mode) {
860866
xa_lock_bh(&ipsec->sadb);
861867
__xa_set_mark(&ipsec->sadb, sa_entry->ipsec_obj_id,
862868
MLX5E_IPSEC_TUNNEL_SA);
@@ -865,6 +871,11 @@ static int mlx5e_xfrm_add_state(struct net_device *dev,
865871

866872
out:
867873
x->xso.offload_handle = (unsigned long)sa_entry;
874+
if (allow_tunnel_mode)
875+
mlx5_eswitch_unblock_encap(priv->mdev);
876+
877+
mlx5_eswitch_unblock_mode(priv->mdev);
878+
868879
return 0;
869880

870881
err_add_rule:
@@ -877,6 +888,11 @@ static int mlx5e_xfrm_add_state(struct net_device *dev,
877888
if (sa_entry->work)
878889
kfree(sa_entry->work->data);
879890
kfree(sa_entry->work);
891+
unblock_encap:
892+
if (allow_tunnel_mode)
893+
mlx5_eswitch_unblock_encap(priv->mdev);
894+
unblock_mode:
895+
mlx5_eswitch_unblock_mode(priv->mdev);
880896
unblock_ipsec:
881897
mlx5_eswitch_unblock_ipsec(priv->mdev);
882898
err_xfrm:

‎drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ void mlx5e_accel_ipsec_fs_del_rule(struct mlx5e_ipsec_sa_entry *sa_entry);
319319
int mlx5e_accel_ipsec_fs_add_pol(struct mlx5e_ipsec_pol_entry *pol_entry);
320320
void mlx5e_accel_ipsec_fs_del_pol(struct mlx5e_ipsec_pol_entry *pol_entry);
321321
void mlx5e_accel_ipsec_fs_modify(struct mlx5e_ipsec_sa_entry *sa_entry);
322-
bool mlx5e_ipsec_fs_tunnel_enabled(struct mlx5e_ipsec_sa_entry *sa_entry);
322+
bool mlx5e_ipsec_fs_tunnel_allowed(struct mlx5e_ipsec_sa_entry *sa_entry);
323323

324324
int mlx5_ipsec_create_sa_ctx(struct mlx5e_ipsec_sa_entry *sa_entry);
325325
void mlx5_ipsec_free_sa_ctx(struct mlx5e_ipsec_sa_entry *sa_entry);

‎drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,9 @@ static int rx_create(struct mlx5_core_dev *mdev, struct mlx5e_ipsec *ipsec,
10691069

10701070
/* Create FT */
10711071
if (mlx5_ipsec_device_caps(mdev) & MLX5_IPSEC_CAP_TUNNEL)
1072-
rx->allow_tunnel_mode = mlx5_eswitch_block_encap(mdev);
1072+
rx->allow_tunnel_mode =
1073+
mlx5_eswitch_block_encap(mdev, rx == ipsec->rx_esw);
1074+
10731075
if (rx->allow_tunnel_mode)
10741076
flags = MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;
10751077
ft = ipsec_ft_create(attr.ns, attr.sa_level, attr.prio, 1, 2, flags);
@@ -1310,7 +1312,9 @@ static int tx_create(struct mlx5e_ipsec *ipsec, struct mlx5e_ipsec_tx *tx,
13101312
goto err_status_rule;
13111313

13121314
if (mlx5_ipsec_device_caps(mdev) & MLX5_IPSEC_CAP_TUNNEL)
1313-
tx->allow_tunnel_mode = mlx5_eswitch_block_encap(mdev);
1315+
tx->allow_tunnel_mode =
1316+
mlx5_eswitch_block_encap(mdev, tx == ipsec->tx_esw);
1317+
13141318
if (tx->allow_tunnel_mode)
13151319
flags = MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;
13161320
ft = ipsec_ft_create(tx->ns, attr.sa_level, attr.prio, 1, 4, flags);
@@ -2846,18 +2850,24 @@ void mlx5e_accel_ipsec_fs_modify(struct mlx5e_ipsec_sa_entry *sa_entry)
28462850
memcpy(sa_entry, &sa_entry_shadow, sizeof(*sa_entry));
28472851
}
28482852

2849-
bool mlx5e_ipsec_fs_tunnel_enabled(struct mlx5e_ipsec_sa_entry *sa_entry)
2853+
bool mlx5e_ipsec_fs_tunnel_allowed(struct mlx5e_ipsec_sa_entry *sa_entry)
28502854
{
2851-
struct mlx5_accel_esp_xfrm_attrs *attrs = &sa_entry->attrs;
2852-
struct mlx5e_ipsec_rx *rx;
2853-
struct mlx5e_ipsec_tx *tx;
2855+
struct mlx5e_ipsec *ipsec = sa_entry->ipsec;
2856+
struct xfrm_state *x = sa_entry->x;
2857+
bool from_fdb;
28542858

2855-
rx = ipsec_rx(sa_entry->ipsec, attrs->addrs.family, attrs->type);
2856-
tx = ipsec_tx(sa_entry->ipsec, attrs->type);
2857-
if (sa_entry->attrs.dir == XFRM_DEV_OFFLOAD_OUT)
2858-
return tx->allow_tunnel_mode;
2859+
if (x->xso.dir == XFRM_DEV_OFFLOAD_OUT) {
2860+
struct mlx5e_ipsec_tx *tx = ipsec_tx(ipsec, x->xso.type);
2861+
2862+
from_fdb = (tx == ipsec->tx_esw);
2863+
} else {
2864+
struct mlx5e_ipsec_rx *rx = ipsec_rx(ipsec, x->props.family,
2865+
x->xso.type);
2866+
2867+
from_fdb = (rx == ipsec->rx_esw);
2868+
}
28592869

2860-
return rx->allow_tunnel_mode;
2870+
return mlx5_eswitch_block_encap(ipsec->mdev, from_fdb);
28612871
}
28622872

28632873
void mlx5e_ipsec_handle_mpv_event(int event, struct mlx5e_priv *slave_priv,

‎drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -893,27 +893,27 @@ int mlx5e_psp_init(struct mlx5e_priv *priv)
893893

894894
if (!mlx5_is_psp_device(mdev)) {
895895
mlx5_core_dbg(mdev, "PSP offload not supported\n");
896-
return -EOPNOTSUPP;
896+
return 0;
897897
}
898898

899899
if (!MLX5_CAP_ETH(mdev, swp)) {
900900
mlx5_core_dbg(mdev, "SWP not supported\n");
901-
return -EOPNOTSUPP;
901+
return 0;
902902
}
903903

904904
if (!MLX5_CAP_ETH(mdev, swp_csum)) {
905905
mlx5_core_dbg(mdev, "SWP checksum not supported\n");
906-
return -EOPNOTSUPP;
906+
return 0;
907907
}
908908

909909
if (!MLX5_CAP_ETH(mdev, swp_csum_l4_partial)) {
910910
mlx5_core_dbg(mdev, "SWP L4 partial checksum not supported\n");
911-
return -EOPNOTSUPP;
911+
return 0;
912912
}
913913

914914
if (!MLX5_CAP_ETH(mdev, swp_lso)) {
915915
mlx5_core_dbg(mdev, "PSP LSO not supported\n");
916-
return -EOPNOTSUPP;
916+
return 0;
917917
}
918918

919919
psp = kzalloc(sizeof(*psp), GFP_KERNEL);

‎drivers/net/ethernet/mellanox/mlx5/core/eswitch.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ void mlx5_eswitch_offloads_single_fdb_del_one(struct mlx5_eswitch *master_esw,
879879
struct mlx5_eswitch *slave_esw);
880880
int mlx5_eswitch_reload_ib_reps(struct mlx5_eswitch *esw);
881881

882-
bool mlx5_eswitch_block_encap(struct mlx5_core_dev *dev);
882+
bool mlx5_eswitch_block_encap(struct mlx5_core_dev *dev, bool from_fdb);
883883
void mlx5_eswitch_unblock_encap(struct mlx5_core_dev *dev);
884884

885885
int mlx5_eswitch_block_mode(struct mlx5_core_dev *dev);
@@ -974,7 +974,8 @@ mlx5_eswitch_reload_ib_reps(struct mlx5_eswitch *esw)
974974
return 0;
975975
}
976976

977-
static inline bool mlx5_eswitch_block_encap(struct mlx5_core_dev *dev)
977+
static inline bool
978+
mlx5_eswitch_block_encap(struct mlx5_core_dev *dev, bool from_fdb)
978979
{
979980
return true;
980981
}

0 commit comments

Comments
 (0)