Skip to contentSkip to conversation

IB/mlx5: Fix rdma counter binding for RAW QP

PATCH Applied Leon Romanovsky 1 participant 2 messages Oct 9, 2023 – Oct 15, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IB/mlx5: Fix rdma counter binding for RAW QP

From: Patrisious Haddad <[email protected]>

Previously when we had a RAW QP, we bound a counter to it when it moved to INIT state, using the counter context inside RQC.

But when we try to modify that counter later in RTS state we used modify QP which tries to change the counter inside QPC instead of RQC.

Now we correctly modify the counter set_id inside of RQC instead of QPC for the RAW QP.

Fixes d14133dd4161 ("IB/mlx5: Support set qp counter")
---
 drivers/infiniband/hw/mlx5/qp.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
drivers/infiniband/hw/mlx5/qp.c +27 -0
index c047c5d66737..83727bde54f5 100644
@@ -4047,6 +4047,30 @@ static unsigned int get_tx_affinity(struct ib_qp *qp,
 	return tx_affinity;
 }
 
+static int __mlx5_ib_qp_set_raw_qp_counter(struct mlx5_ib_qp *qp, u32 set_id,
+					   struct mlx5_core_dev *mdev)
+{
+	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;
+	struct mlx5_ib_rq *rq = &raw_packet_qp->rq;
+	u32 in[MLX5_ST_SZ_DW(modify_rq_in)] = {};
+	void *rqc;
+
+	if (!qp->rq.wqe_cnt)
+		return 0;
+
+	MLX5_SET(modify_rq_in, in, rq_state, rq->state);
+	MLX5_SET(modify_rq_in, in, uid, to_mpd(qp->ibqp.pd)->uid);
+
+	rqc = MLX5_ADDR_OF(modify_rq_in, in, ctx);
+	MLX5_SET(rqc, rqc, state, MLX5_RQC_STATE_RDY);
+
+	MLX5_SET64(modify_rq_in, in, modify_bitmask,
+		   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_RQ_COUNTER_SET_ID);
+	MLX5_SET(rqc, rqc, counter_set_id, set_id);
+
+	return mlx5_core_modify_rq(mdev, rq->base.mqp.qpn, in);
+}
+
 static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 				    struct rdma_counter *counter)
 {
@@ -4062,6 +4086,9 @@ static int __mlx5_ib_qp_set_counter(struct ib_qp *qp,
 	else
 		set_id = mlx5_ib_get_counters_id(dev, mqp->port - 1);
 
+	if (mqp->type == IB_QPT_RAW_PACKET)
+		return __mlx5_ib_qp_set_raw_qp_counter(mqp, set_id, dev->mdev);
+
 	base = &mqp->trans_qp.base;
 	MLX5_SET(rts2rts_qp_in, in, opcode, MLX5_CMD_OP_RTS2RTS_QP);
 	MLX5_SET(rts2rts_qp_in, in, qpn, base->mqp.qpn);
Signature · 1 line
2.41.0
author Applied
#1 lore raw
Quoted 10 lines · Leon Romanovsky

Previously when we had a RAW QP, we bound a counter to it when it moved to INIT state, using the counter context inside RQC.

But when we try to modify that counter later in RTS state we used modify QP which tries to change the counter inside QPC instead of RQC.

Now we correctly modify the counter set_id inside of RQC instead of QPC for the RAW QP.

[...]

Applied, thanks!

[1/1] IB/mlx5: Fix rdma counter binding for RAW QP

      https://git.kernel.org/rdma/rdma/c/c1336bb4aa5e80

Best regards,

Signature · 1 line
Leon Romanovsky <[email protected]>