Skip to content

Commit facc969

Browse files
Saeed Mahameeddavem330
Saeed Mahameed
authored and
davem330
committed
net/mlx5e: Fix HW MTU settings
Previously we configured HW MTU to be netdev->mtu, actually we need to configure netdev->mtu + (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN). Also, query MTU can not fail, hence make the relevant helper a void functionm, add mlx5e_set_dev_port_mtu, helper function to handle MTU setting. Signed-off-by: Saeed Mahameed <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7ec0bb2 commit facc969

File tree

5 files changed

+55
-61
lines changed

5 files changed

+55
-61
lines changed

‎drivers/infiniband/hw/mlx5/main.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,15 +446,11 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port,
446446
if (err)
447447
goto out;
448448

449-
err = mlx5_query_port_max_mtu(mdev, &max_mtu, port);
450-
if (err)
451-
goto out;
449+
mlx5_query_port_max_mtu(mdev, &max_mtu, port);
452450

453451
props->max_mtu = mlx5_mtu_to_ib_mtu(max_mtu);
454452

455-
err = mlx5_query_port_oper_mtu(mdev, &oper_mtu, port);
456-
if (err)
457-
goto out;
453+
mlx5_query_port_oper_mtu(mdev, &oper_mtu, port);
458454

459455
props->active_mtu = mlx5_mtu_to_ib_mtu(oper_mtu);
460456

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
#define MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_PKTS 0x20
5858
#define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES 0x80
5959
#define MLX5E_PARAMS_DEFAULT_RX_HASH_LOG_TBL_SZ 0x7
60-
#define MLX5E_PARAMS_MIN_MTU 46
6160

6261
#define MLX5E_TX_CQ_POLL_BUDGET 128
6362
#define MLX5E_UPDATE_STATS_INTERVAL 200 /* msecs */

‎drivers/net/ethernet/mellanox/mlx5/core/en_main.c

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ static void mlx5e_send_nop(struct mlx5e_sq *sq)
277277
mlx5e_tx_notify_hw(sq, wqe);
278278
}
279279

280+
#define MLX5E_HW2SW_MTU(hwmtu) (hwmtu - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN))
281+
#define MLX5E_SW2HW_MTU(swmtu) (swmtu + (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN))
282+
280283
static int mlx5e_create_rq(struct mlx5e_channel *c,
281284
struct mlx5e_rq_param *param,
282285
struct mlx5e_rq *rq)
@@ -305,7 +308,7 @@ static int mlx5e_create_rq(struct mlx5e_channel *c,
305308
}
306309

307310
rq->wqe_sz = (priv->params.lro_en) ? priv->params.lro_wqe_sz :
308-
priv->netdev->mtu + ETH_HLEN + VLAN_HLEN;
311+
MLX5E_SW2HW_MTU(priv->netdev->mtu);
309312

310313
for (i = 0; i < wq_sz; i++) {
311314
struct mlx5e_rx_wqe *wqe = mlx5_wq_ll_get_wqe(&rq->wq, i);
@@ -1367,11 +1370,30 @@ static void mlx5e_close_tirs(struct mlx5e_priv *priv)
13671370
mlx5e_close_tir(priv, i);
13681371
}
13691372

1370-
int mlx5e_open_locked(struct net_device *netdev)
1373+
static int mlx5e_set_dev_port_mtu(struct net_device *netdev)
13711374
{
13721375
struct mlx5e_priv *priv = netdev_priv(netdev);
13731376
struct mlx5_core_dev *mdev = priv->mdev;
1374-
int actual_mtu;
1377+
int hw_mtu;
1378+
int err;
1379+
1380+
err = mlx5_set_port_mtu(mdev, MLX5E_SW2HW_MTU(netdev->mtu), 1);
1381+
if (err)
1382+
return err;
1383+
1384+
mlx5_query_port_oper_mtu(mdev, &hw_mtu, 1);
1385+
1386+
if (MLX5E_HW2SW_MTU(hw_mtu) != netdev->mtu)
1387+
netdev_warn(netdev, "%s: Port MTU %d is different than netdev mtu %d\n",
1388+
__func__, MLX5E_HW2SW_MTU(hw_mtu), netdev->mtu);
1389+
1390+
netdev->mtu = MLX5E_HW2SW_MTU(hw_mtu);
1391+
return 0;
1392+
}
1393+
1394+
int mlx5e_open_locked(struct net_device *netdev)
1395+
{
1396+
struct mlx5e_priv *priv = netdev_priv(netdev);
13751397
int num_txqs;
13761398
int err;
13771399

@@ -1380,25 +1402,9 @@ int mlx5e_open_locked(struct net_device *netdev)
13801402
netif_set_real_num_tx_queues(netdev, num_txqs);
13811403
netif_set_real_num_rx_queues(netdev, priv->params.num_channels);
13821404

1383-
err = mlx5_set_port_mtu(mdev, netdev->mtu);
1384-
if (err) {
1385-
netdev_err(netdev, "%s: mlx5_set_port_mtu failed %d\n",
1386-
__func__, err);
1405+
err = mlx5e_set_dev_port_mtu(netdev);
1406+
if (err)
13871407
return err;
1388-
}
1389-
1390-
err = mlx5_query_port_oper_mtu(mdev, &actual_mtu, 1);
1391-
if (err) {
1392-
netdev_err(netdev, "%s: mlx5_query_port_oper_mtu failed %d\n",
1393-
__func__, err);
1394-
return err;
1395-
}
1396-
1397-
if (actual_mtu != netdev->mtu)
1398-
netdev_warn(netdev, "%s: Failed to set MTU to %d\n",
1399-
__func__, netdev->mtu);
1400-
1401-
netdev->mtu = actual_mtu;
14021408

14031409
err = mlx5e_open_tises(priv);
14041410
if (err) {
@@ -1613,15 +1619,14 @@ static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)
16131619
struct mlx5e_priv *priv = netdev_priv(netdev);
16141620
struct mlx5_core_dev *mdev = priv->mdev;
16151621
int max_mtu;
1616-
int err = 0;
1622+
int err;
16171623

1618-
err = mlx5_query_port_max_mtu(mdev, &max_mtu, 1);
1619-
if (err)
1620-
return err;
1624+
mlx5_query_port_max_mtu(mdev, &max_mtu, 1);
16211625

1622-
if (new_mtu > max_mtu || new_mtu < MLX5E_PARAMS_MIN_MTU) {
1623-
netdev_err(netdev, "%s: Bad MTU size, mtu must be [%d-%d]\n",
1624-
__func__, MLX5E_PARAMS_MIN_MTU, max_mtu);
1626+
if (new_mtu > max_mtu) {
1627+
netdev_err(netdev,
1628+
"%s: Bad MTU (%d) > (%d) Max\n",
1629+
__func__, new_mtu, max_mtu);
16251630
return -EINVAL;
16261631
}
16271632

‎drivers/net/ethernet/mellanox/mlx5/core/port.c

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -248,59 +248,53 @@ int mlx5_query_port_status(struct mlx5_core_dev *dev, u8 *status)
248248
return err;
249249
}
250250

251-
static int mlx5_query_port_mtu(struct mlx5_core_dev *dev,
252-
int *admin_mtu, int *max_mtu, int *oper_mtu,
253-
u8 local_port)
251+
static void mlx5_query_port_mtu(struct mlx5_core_dev *dev, int *admin_mtu,
252+
int *max_mtu, int *oper_mtu, u8 port)
254253
{
255254
u32 in[MLX5_ST_SZ_DW(pmtu_reg)];
256255
u32 out[MLX5_ST_SZ_DW(pmtu_reg)];
257-
int err;
258256

259257
memset(in, 0, sizeof(in));
260258

261-
MLX5_SET(pmtu_reg, in, local_port, local_port);
259+
MLX5_SET(pmtu_reg, in, local_port, port);
262260

263-
err = mlx5_core_access_reg(dev, in, sizeof(in), out,
264-
sizeof(out), MLX5_REG_PMTU, 0, 0);
265-
if (err)
266-
return err;
261+
mlx5_core_access_reg(dev, in, sizeof(in), out,
262+
sizeof(out), MLX5_REG_PMTU, 0, 0);
267263

268264
if (max_mtu)
269265
*max_mtu = MLX5_GET(pmtu_reg, out, max_mtu);
270266
if (oper_mtu)
271267
*oper_mtu = MLX5_GET(pmtu_reg, out, oper_mtu);
272268
if (admin_mtu)
273269
*admin_mtu = MLX5_GET(pmtu_reg, out, admin_mtu);
274-
275-
return 0;
276270
}
277271

278-
int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu)
272+
int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu, u8 port)
279273
{
280274
u32 in[MLX5_ST_SZ_DW(pmtu_reg)];
281275
u32 out[MLX5_ST_SZ_DW(pmtu_reg)];
282276

283277
memset(in, 0, sizeof(in));
284278

285279
MLX5_SET(pmtu_reg, in, admin_mtu, mtu);
286-
MLX5_SET(pmtu_reg, in, local_port, 1);
280+
MLX5_SET(pmtu_reg, in, local_port, port);
287281

288-
return mlx5_core_access_reg(dev, in, sizeof(in), out, sizeof(out),
289-
MLX5_REG_PMTU, 0, 1);
282+
return mlx5_core_access_reg(dev, in, sizeof(in), out,
283+
sizeof(out), MLX5_REG_PMTU, 0, 1);
290284
}
291285
EXPORT_SYMBOL_GPL(mlx5_set_port_mtu);
292286

293-
int mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, int *max_mtu,
294-
u8 local_port)
287+
void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, int *max_mtu,
288+
u8 port)
295289
{
296-
return mlx5_query_port_mtu(dev, NULL, max_mtu, NULL, local_port);
290+
mlx5_query_port_mtu(dev, NULL, max_mtu, NULL, port);
297291
}
298292
EXPORT_SYMBOL_GPL(mlx5_query_port_max_mtu);
299293

300-
int mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, int *oper_mtu,
301-
u8 local_port)
294+
void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, int *oper_mtu,
295+
u8 port)
302296
{
303-
return mlx5_query_port_mtu(dev, NULL, NULL, oper_mtu, local_port);
297+
mlx5_query_port_mtu(dev, NULL, NULL, oper_mtu, port);
304298
}
305299
EXPORT_SYMBOL_GPL(mlx5_query_port_oper_mtu);
306300

‎include/linux/mlx5/driver.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -756,11 +756,11 @@ int mlx5_set_port_status(struct mlx5_core_dev *dev,
756756
enum mlx5_port_status status);
757757
int mlx5_query_port_status(struct mlx5_core_dev *dev, u8 *status);
758758

759-
int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu);
760-
int mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, int *max_mtu,
761-
u8 local_port);
762-
int mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, int *oper_mtu,
763-
u8 local_port);
759+
int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu, u8 port);
760+
void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, int *max_mtu, u8 port);
761+
void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, int *oper_mtu,
762+
u8 port);
763+
764764
int mlx5_query_port_vl_hw_cap(struct mlx5_core_dev *dev,
765765
u8 *vl_hw_cap, u8 local_port);
766766

0 commit comments

Comments
 (0)