Commit 521f31af authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5e: Allow RQ outside of channel context 



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

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

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

+2 −1
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ struct mlx5e_rq { 
		u8             map_dir;   /* dma map direction */

	} buff;



	struct mlx5e_channel  *channel;

	struct device         *pdev;

	struct net_device     *netdev;

	struct mlx5e_rq_stats *stats;
@@ -604,6 +603,8 @@ struct mlx5e_rq { 
	struct mlx5e_page_cache page_cache;

	struct hwtstamp_config *tstamp;

	struct mlx5_clock      *clock;

	struct mlx5e_icosq    *icosq;

	struct mlx5e_priv     *priv;



	mlx5e_fp_handle_rx_cqe handle_rx_cqe;

	mlx5e_fp_post_rx_wqes  post_wqes;

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

+5 −4
Original line number Diff line number Diff line
@@ -205,21 +205,22 @@ int mlx5e_health_recover_channels(struct mlx5e_priv *priv) 
	return err;

}



int mlx5e_health_channel_eq_recover(struct mlx5_eq_comp *eq, struct mlx5e_channel *channel)

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

				    struct mlx5e_ch_stats *stats)

{

	u32 eqe_count;



	netdev_err(channel->netdev, "EQ 0x%x: Cons = 0x%x, irqn = 0x%x\n",

	netdev_err(dev, "EQ 0x%x: Cons = 0x%x, irqn = 0x%x\n",

		   eq->core.eqn, eq->core.cons_index, eq->core.irqn);



	eqe_count = mlx5_eq_poll_irq_disabled(eq);

	if (!eqe_count)

		return -EIO;



	netdev_err(channel->netdev, "Recovered %d eqes on EQ 0x%x\n",

	netdev_err(dev, "Recovered %d eqes on EQ 0x%x\n",

		   eqe_count, eq->core.eqn);



	channel->stats->eq_rearm++;

	stats->eq_rearm++;

	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ struct mlx5e_err_ctx { 
};



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

int mlx5e_health_channel_eq_recover(struct mlx5_eq_comp *eq, struct mlx5e_channel *channel);

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);

int mlx5e_health_report(struct mlx5e_priv *priv,

			struct devlink_health_reporter *reporter, char *err_str,

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

+27 −23
Original line number Diff line number Diff line
@@ -146,17 +146,16 @@ static int mlx5e_rx_reporter_err_rq_cqe_recover(void *ctx) 


static int mlx5e_rx_reporter_timeout_recover(void *ctx)

{

	struct mlx5e_icosq *icosq;

	struct mlx5_eq_comp *eq;

	struct mlx5e_rq *rq;

	int err;



	rq = ctx;

	icosq = &rq->channel->icosq;

	eq = rq->cq.mcq.eq;

	err = mlx5e_health_channel_eq_recover(eq, rq->channel);

	if (err)

		clear_bit(MLX5E_SQ_STATE_ENABLED, &icosq->state);



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

	if (err && rq->icosq)

		clear_bit(MLX5E_SQ_STATE_ENABLED, &rq->icosq->state);



	return err;

}
@@ -233,21 +232,13 @@ static int mlx5e_reporter_icosq_diagnose(struct mlx5e_icosq *icosq, u8 hw_state, 
static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,

						   struct devlink_fmsg *fmsg)

{

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

	struct mlx5e_icosq *icosq;

	u8 icosq_hw_state;

	u16 wqe_counter;

	int wqes_sz;

	u8 hw_state;

	u16 wq_head;

	int err;



	icosq = &rq->channel->icosq;

	err = mlx5e_query_rq_state(priv->mdev, rq->rqn, &hw_state);

	if (err)

		return err;



	err = mlx5_core_query_sq_state(priv->mdev, icosq->sqn, &icosq_hw_state);

	err = mlx5e_query_rq_state(rq->mdev, rq->rqn, &hw_state);

	if (err)

		return err;
@@ -259,7 +250,7 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, 
	if (err)

		return err;



	err = devlink_fmsg_u32_pair_put(fmsg, "channel ix", rq->channel->ix);

	err = devlink_fmsg_u32_pair_put(fmsg, "channel ix", rq->ix);

	if (err)

		return err;
@@ -295,9 +286,18 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, 
	if (err)

		return err;



	if (rq->icosq) {

		struct mlx5e_icosq *icosq = rq->icosq;

		u8 icosq_hw_state;



		err = mlx5_core_query_sq_state(rq->mdev, icosq->sqn, &icosq_hw_state);

		if (err)

			return err;



		err = mlx5e_reporter_icosq_diagnose(icosq, icosq_hw_state, fmsg);

		if (err)

			return err;

	}



	err = devlink_fmsg_obj_nest_end(fmsg);

	if (err)
@@ -557,25 +557,29 @@ static int mlx5e_rx_reporter_dump(struct devlink_health_reporter *reporter, 


void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq)

{

	struct mlx5e_icosq *icosq = &rq->channel->icosq;

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

	char icosq_str[MLX5E_REPORTER_PER_Q_MAX_LEN] = {};

	char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];

	struct mlx5e_icosq *icosq = rq->icosq;

	struct mlx5e_priv *priv = rq->priv;

	struct mlx5e_err_ctx err_ctx = {};



	err_ctx.ctx = rq;

	err_ctx.recover = mlx5e_rx_reporter_timeout_recover;

	err_ctx.dump = mlx5e_rx_reporter_dump_rq;



	if (icosq)

		snprintf(icosq_str, sizeof(icosq_str), "ICOSQ: 0x%x, ", icosq->sqn);

	snprintf(err_str, sizeof(err_str),

		 "RX timeout on channel: %d, ICOSQ: 0x%x RQ: 0x%x, CQ: 0x%x",

		 icosq->channel->ix, icosq->sqn, rq->rqn, rq->cq.mcq.cqn);

		 "RX timeout on channel: %d, %sRQ: 0x%x, CQ: 0x%x",

		 rq->ix, icosq_str, rq->rqn, rq->cq.mcq.cqn);



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

}



void mlx5e_reporter_rq_cqe_err(struct mlx5e_rq *rq)

{

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

	char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];

	struct mlx5e_priv *priv = rq->priv;

	struct mlx5e_err_ctx err_ctx = {};



	err_ctx.ctx = rq;

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int mlx5e_tx_reporter_timeout_recover(void *ctx) 
	sq = to_ctx->sq;

	eq = sq->cq.mcq.eq;

	priv = sq->channel->priv;

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

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

	if (!err) {

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

		return err;