Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d29f349 authored by Bodong Wang's avatar Bodong Wang Committed by Doug Ledford
Browse files

IB/mlx5: Properly adjust rate limit on QP state transitions 



- Add MODIFY_QP_EX CMD to extend modify_qp.
- Rate limit will be updated in the following state transactions: RTR2RTS,
  RTS2RTS. The limit will be removed when SQ is in RST and ERR state.

Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Reviewed-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 189aba99

drivers/infiniband/hw/mlx5/main.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -3105,7 +3105,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	dev->ib_dev.uverbs_ex_cmd_mask =

	dev->ib_dev.uverbs_ex_cmd_mask =

		(1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE)	|

		(1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE)	|

		(1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ)	|

		(1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ)	|

		(1ull << IB_USER_VERBS_EX_CMD_CREATE_QP);

		(1ull << IB_USER_VERBS_EX_CMD_CREATE_QP)	|

		(1ull << IB_USER_VERBS_EX_CMD_MODIFY_QP);





	dev->ib_dev.query_device	= mlx5_ib_query_device;

	dev->ib_dev.query_device	= mlx5_ib_query_device;

	dev->ib_dev.query_port		= mlx5_ib_query_port;

	dev->ib_dev.query_port		= mlx5_ib_query_port;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -389,6 +389,7 @@ struct mlx5_ib_qp { 
	struct list_head	qps_list;

	struct list_head	qps_list;

	struct list_head	cq_recv_list;

	struct list_head	cq_recv_list;

	struct list_head	cq_send_list;

	struct list_head	cq_send_list;

	u32			rate_limit;

};

};





struct mlx5_ib_cq_buf {

struct mlx5_ib_cq_buf {

drivers/infiniband/hw/mlx5/qp.c

+66 −8
Original line number Original line Diff line number Diff line
@@ -78,12 +78,14 @@ struct mlx5_wqe_eth_pad { 




enum raw_qp_set_mask_map {

enum raw_qp_set_mask_map {

	MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID		= 1UL << 0,

	MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID		= 1UL << 0,

	MLX5_RAW_QP_RATE_LIMIT			= 1UL << 1,

};

};





struct mlx5_modify_raw_qp_param {

struct mlx5_modify_raw_qp_param {

	u16 operation;

	u16 operation;





	u32 set_mask; /* raw_qp_set_mask_map */

	u32 set_mask; /* raw_qp_set_mask_map */

	u32 rate_limit;

	u8 rq_q_ctr_id;

	u8 rq_q_ctr_id;

};

};
@@ -2470,8 +2472,14 @@ static int modify_raw_packet_qp_rq(struct mlx5_ib_dev *dev, 
}

}





static int modify_raw_packet_qp_sq(struct mlx5_core_dev *dev,

static int modify_raw_packet_qp_sq(struct mlx5_core_dev *dev,

				   struct mlx5_ib_sq *sq, int new_state)

				   struct mlx5_ib_sq *sq,

				   int new_state,

				   const struct mlx5_modify_raw_qp_param *raw_qp_param)

{

{

	struct mlx5_ib_qp *ibqp = sq->base.container_mibqp;

	u32 old_rate = ibqp->rate_limit;

	u32 new_rate = old_rate;

	u16 rl_index = 0;

	void *in;

	void *in;

	void *sqc;

	void *sqc;

	int inlen;

	int inlen;
@@ -2487,10 +2495,44 @@ static int modify_raw_packet_qp_sq(struct mlx5_core_dev *dev, 
	sqc = MLX5_ADDR_OF(modify_sq_in, in, ctx);

	sqc = MLX5_ADDR_OF(modify_sq_in, in, ctx);

	MLX5_SET(sqc, sqc, state, new_state);

	MLX5_SET(sqc, sqc, state, new_state);





	if (raw_qp_param->set_mask & MLX5_RAW_QP_RATE_LIMIT) {

		if (new_state != MLX5_SQC_STATE_RDY)

			pr_warn("%s: Rate limit can only be changed when SQ is moving to RDY\n",

				__func__);

		else

			new_rate = raw_qp_param->rate_limit;

	}



	if (old_rate != new_rate) {

		if (new_rate) {

			err = mlx5_rl_add_rate(dev, new_rate, &rl_index);

			if (err) {

				pr_err("Failed configuring rate %u: %d\n",

				       new_rate, err);

				goto out;

			}

		}



		MLX5_SET64(modify_sq_in, in, modify_bitmask, 1);

		MLX5_SET(sqc, sqc, packet_pacing_rate_limit_index, rl_index);

	}



	err = mlx5_core_modify_sq(dev, sq->base.mqp.qpn, in, inlen);

	err = mlx5_core_modify_sq(dev, sq->base.mqp.qpn, in, inlen);

	if (err)

	if (err) {

		/* Remove new rate from table if failed */

		if (new_rate &&

		    old_rate != new_rate)

			mlx5_rl_remove_rate(dev, new_rate);

		goto out;

		goto out;

	}



	/* Only remove the old rate after new rate was set */

	if ((old_rate &&

	    (old_rate != new_rate)) ||

	    (new_state != MLX5_SQC_STATE_RDY))

		mlx5_rl_remove_rate(dev, old_rate);





	ibqp->rate_limit = new_rate;

	sq->state = new_state;

	sq->state = new_state;





out:

out:
@@ -2505,6 +2547,8 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;

	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;

	struct mlx5_ib_rq *rq = &raw_packet_qp->rq;

	struct mlx5_ib_rq *rq = &raw_packet_qp->rq;

	struct mlx5_ib_sq *sq = &raw_packet_qp->sq;

	struct mlx5_ib_sq *sq = &raw_packet_qp->sq;

	int modify_rq = !!qp->rq.wqe_cnt;

	int modify_sq = !!qp->sq.wqe_cnt;

	int rq_state;

	int rq_state;

	int sq_state;

	int sq_state;

	int err;

	int err;
@@ -2522,10 +2566,18 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
		rq_state = MLX5_RQC_STATE_RST;

		rq_state = MLX5_RQC_STATE_RST;

		sq_state = MLX5_SQC_STATE_RST;

		sq_state = MLX5_SQC_STATE_RST;

		break;

		break;

	case MLX5_CMD_OP_INIT2INIT_QP:

	case MLX5_CMD_OP_INIT2RTR_QP:

	case MLX5_CMD_OP_RTR2RTS_QP:

	case MLX5_CMD_OP_RTR2RTS_QP:

	case MLX5_CMD_OP_RTS2RTS_QP:

	case MLX5_CMD_OP_RTS2RTS_QP:

		if (raw_qp_param->set_mask ==

		    MLX5_RAW_QP_RATE_LIMIT) {

			modify_rq = 0;

			sq_state = sq->state;

		} else {

			return raw_qp_param->set_mask ? -EINVAL : 0;

		}

		break;

	case MLX5_CMD_OP_INIT2INIT_QP:

	case MLX5_CMD_OP_INIT2RTR_QP:

		if (raw_qp_param->set_mask)

		if (raw_qp_param->set_mask)

			return -EINVAL;

			return -EINVAL;

		else

		else
@@ -2535,13 +2587,13 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
		return -EINVAL;

		return -EINVAL;

	}

	}





	if (qp->rq.wqe_cnt) {

	if (modify_rq) {

		err =  modify_raw_packet_qp_rq(dev, rq, rq_state, raw_qp_param);

		err =  modify_raw_packet_qp_rq(dev, rq, rq_state, raw_qp_param);

		if (err)

		if (err)

			return err;

			return err;

	}

	}





	if (qp->sq.wqe_cnt) {

	if (modify_sq) {

		if (tx_affinity) {

		if (tx_affinity) {

			err = modify_raw_packet_tx_affinity(dev->mdev, sq,

			err = modify_raw_packet_tx_affinity(dev->mdev, sq,

							    tx_affinity);

							    tx_affinity);
@@ -2549,7 +2601,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
				return err;

				return err;

		}

		}





		return modify_raw_packet_qp_sq(dev->mdev, sq, sq_state);

		return modify_raw_packet_qp_sq(dev->mdev, sq, sq_state, raw_qp_param);

	}

	}





	return 0;

	return 0;
@@ -2804,6 +2856,12 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, 
			raw_qp_param.rq_q_ctr_id = mibport->q_cnt_id;

			raw_qp_param.rq_q_ctr_id = mibport->q_cnt_id;

			raw_qp_param.set_mask |= MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID;

			raw_qp_param.set_mask |= MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID;

		}

		}



		if (attr_mask & IB_QP_RATE_LIMIT) {

			raw_qp_param.rate_limit = attr->rate_limit;

			raw_qp_param.set_mask |= MLX5_RAW_QP_RATE_LIMIT;

		}



		err = modify_raw_packet_qp(dev, qp, &raw_qp_param, tx_affinity);

		err = modify_raw_packet_qp(dev, qp, &raw_qp_param, tx_affinity);

	} else {

	} else {

		err = mlx5_core_qp_modify(dev->mdev, op, optpar, context,

		err = mlx5_core_qp_modify(dev->mdev, op, optpar, context,