Commit 665f29de authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Jakub Kicinski
Browse files

net/mlx5e: Remove unused fields from datapath structs 



No need to keep max_sq_wqebbs in mlx5e_txqsq and mlx5e_xdpsq, as it's
only used when allocating the queues. Removing an extra field reduces
the struct size.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f060ccc2

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

+0 −2
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ struct mlx5e_txqsq { 
	struct work_struct         recover_work;

	struct mlx5e_ptpsq        *ptpsq;

	cqe_ts_to_ns               ptp_cyc2time;

	u16                        max_sq_wqebbs;

} ____cacheline_aligned_in_smp;



struct mlx5e_dma_info {
@@ -582,7 +581,6 @@ struct mlx5e_xdpsq { 
	/* control path */

	struct mlx5_wq_ctrl        wq_ctrl;

	struct mlx5e_channel      *channel;

	u16                        max_sq_wqebbs;

} ____cacheline_aligned_in_smp;



struct mlx5e_ktls_resync_resp;

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

+5 −5
Original line number Diff line number Diff line
@@ -1155,9 +1155,9 @@ static int mlx5e_alloc_xdpsq(struct mlx5e_channel *c, 
		is_redirect ?

			&c->priv->channel_stats[c->ix]->xdpsq :

			&c->priv->channel_stats[c->ix]->rq_xdpsq;

	sq->max_sq_wqebbs = mlx5e_get_max_sq_wqebbs(mdev);

	sq->stop_room = MLX5E_STOP_ROOM(sq->max_sq_wqebbs);

	sq->max_sq_mpw_wqebbs = mlx5e_get_sw_max_sq_mpw_wqebbs(sq->max_sq_wqebbs);

	sq->stop_room = MLX5E_STOP_ROOM(mlx5e_get_max_sq_wqebbs(mdev));

	sq->max_sq_mpw_wqebbs =

		mlx5e_get_sw_max_sq_mpw_wqebbs(mlx5e_get_max_sq_wqebbs(mdev));



	param->wq.db_numa_node = cpu_to_node(c->cpu);

	err = mlx5_wq_cyc_create(mdev, &param->wq, sqc_wq, wq, &sq->wq_ctrl);
@@ -1318,8 +1318,8 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c, 
	sq->uar_map   = mdev->mlx5e_res.hw_objs.bfreg.map;

	sq->min_inline_mode = params->tx_min_inline_mode;

	sq->hw_mtu    = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	sq->max_sq_wqebbs = mlx5e_get_max_sq_wqebbs(mdev);

	sq->max_sq_mpw_wqebbs = mlx5e_get_sw_max_sq_mpw_wqebbs(sq->max_sq_wqebbs);

	sq->max_sq_mpw_wqebbs =

		mlx5e_get_sw_max_sq_mpw_wqebbs(mlx5e_get_max_sq_wqebbs(mdev));

	INIT_WORK(&sq->recover_work, mlx5e_tx_err_cqe_work);

	if (!MLX5_CAP_ETH(mdev, wqe_vlan_insert))

		set_bit(MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE, &sq->state);