Commit 4ad40d8e authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by Saeed Mahameed
Browse files

net/mlx5e: Allow SQ outside of channel context 



In order to be able to create an SQ outside of a channel context, remove
sq->channel direct pointer. This requires adding a direct pointer to:
netdevice, priv and mlx5_core in order to support SQs that are part of
mlx5e_channel. Use channel_stats from the corresponding CQ.

Signed-off-by: default avatarEran Ben Elisha <eranbe@nvidia.com>
Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 521f31af

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

+3 −1
Original line number Diff line number Diff line
@@ -369,10 +369,12 @@ struct mlx5e_txqsq { 
	unsigned int               hw_mtu;

	struct hwtstamp_config    *tstamp;

	struct mlx5_clock         *clock;

	struct net_device         *netdev;

	struct mlx5_core_dev      *mdev;

	struct mlx5e_priv         *priv;



	/* control path */

	struct mlx5_wq_ctrl        wq_ctrl;

	struct mlx5e_channel      *channel;

	int                        ch_ix;

	int                        txq_ix;

	u32                        rate_limit;

drivers/net/ethernet/mellanox/mlx5/core/en/health.c

+1 −3
Original line number Diff line number Diff line
@@ -157,10 +157,8 @@ void mlx5e_health_channels_update(struct mlx5e_priv *priv) 
						     DEVLINK_HEALTH_REPORTER_STATE_HEALTHY);

}



int mlx5e_health_sq_to_ready(struct mlx5e_channel *channel, u32 sqn)

int mlx5e_health_sq_to_ready(struct mlx5_core_dev *mdev, struct net_device *dev, u32 sqn)

{

	struct mlx5_core_dev *mdev = channel->mdev;

	struct net_device *dev = channel->netdev;

	struct mlx5e_modify_sq_param msp = {};

	int err;

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct mlx5e_err_ctx { 
	void *ctx;

};



int mlx5e_health_sq_to_ready(struct mlx5e_channel *channel, u32 sqn);

int mlx5e_health_sq_to_ready(struct mlx5_core_dev *mdev, struct net_device *dev, u32 sqn);

int mlx5e_health_channel_eq_recover(struct net_device *dev, struct mlx5_eq_comp *eq,

				    struct mlx5e_ch_stats *stats);

int mlx5e_health_recover_channels(struct mlx5e_priv *priv);

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int mlx5e_rx_reporter_err_icosq_cqe_recover(void *ctx) 


	/* At this point, both the rq and the icosq are disabled */



	err = mlx5e_health_sq_to_ready(icosq->channel, icosq->sqn);

	err = mlx5e_health_sq_to_ready(mdev, dev, icosq->sqn);

	if (err)

		goto out;

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

+10 −10
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ static int mlx5e_wait_for_sq_flush(struct mlx5e_txqsq *sq) 
		msleep(20);

	}



	netdev_err(sq->channel->netdev,

	netdev_err(sq->netdev,

		   "Wait for SQ 0x%x flush timeout (sq cc = 0x%x, sq pc = 0x%x)\n",

		   sq->sqn, sq->cc, sq->pc);
@@ -41,8 +41,8 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx) 
	int err;



	sq = ctx;

	mdev = sq->channel->mdev;

	dev = sq->channel->netdev;

	mdev = sq->mdev;

	dev = sq->netdev;



	if (!test_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state))

		return 0;
@@ -68,7 +68,7 @@ static int mlx5e_tx_reporter_err_cqe_recover(void *ctx) 
	 * pending WQEs. SQ can safely reset the SQ.

	 */



	err = mlx5e_health_sq_to_ready(sq->channel, sq->sqn);

	err = mlx5e_health_sq_to_ready(mdev, dev, sq->sqn);

	if (err)

		goto out;
@@ -99,8 +99,8 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx) 
	to_ctx = ctx;

	sq = to_ctx->sq;

	eq = sq->cq.mcq.eq;

	priv = sq->channel->priv;

	err = mlx5e_health_channel_eq_recover(sq->channel->netdev, eq, sq->channel->stats);

	priv = sq->priv;

	err = mlx5e_health_channel_eq_recover(sq->netdev, eq, sq->cq.ch_stats);

	if (!err) {

		to_ctx->status = 0; /* this sq recovered */

		return err;
@@ -144,8 +144,8 @@ static int 
mlx5e_tx_reporter_build_diagnose_output(struct devlink_fmsg *fmsg,

					struct mlx5e_txqsq *sq, int tc)

{

	struct mlx5e_priv *priv = sq->channel->priv;

	bool stopped = netif_xmit_stopped(sq->txq);

	struct mlx5e_priv *priv = sq->priv;

	u8 state;

	int err;
@@ -396,8 +396,8 @@ static int mlx5e_tx_reporter_dump(struct devlink_health_reporter *reporter, 


void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq)

{

	struct mlx5e_priv *priv = sq->channel->priv;

	char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];

	struct mlx5e_priv *priv = sq->priv;

	struct mlx5e_err_ctx err_ctx = {};



	err_ctx.ctx = sq;
@@ -410,9 +410,9 @@ void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq) 


int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq)

{

	struct mlx5e_priv *priv = sq->channel->priv;

	char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];

	struct mlx5e_tx_timeout_ctx to_ctx = {};

	struct mlx5e_priv *priv = sq->priv;

	struct mlx5e_err_ctx err_ctx = {};



	to_ctx.sq = sq;
@@ -421,7 +421,7 @@ int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq) 
	err_ctx.dump = mlx5e_tx_reporter_dump_sq;

	snprintf(err_str, sizeof(err_str),

		 "TX timeout on queue: %d, SQ: 0x%x, CQ: 0x%x, SQ Cons: 0x%x SQ Prod: 0x%x, usecs since last trans: %u",

		 sq->channel->ix, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc,

		 sq->ch_ix, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc,

		 jiffies_to_usecs(jiffies - sq->txq->trans_start));



	mlx5e_health_report(priv, priv->tx_reporter, err_str, &err_ctx);