Add port counter support for raw packet QP
Subsystems (2)
cover Add port counter support for raw packet QP
RDMA Counters weren't updated due to raw packet QPs' traffic since the port counter-id was not associated with the QP. FW support is required for this feature, without this support raw packet QP counters will not count. A minor re-factor to the modify raw packet QP function was needed to pass the q-counter-id to modify RQ command function.
Available in the "topic/raw_qp_ctr_supp" topic branch of this git repo:git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git
Or for browsing:
https://git.kernel.org/cgit/linux/kernel/git/leon/linux-rdma.git/log/?h=topic/raw_qp_ctr_supp
Thanks,
Alex & Leon
Alex Vesker (2):
IB/mlx5: Refactor raw packet QP modify function IB/mlx5: Add port counter support for raw packet QP
drivers/infiniband/hw/mlx5/qp.c | 68 +++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 16 deletions(-)
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1472376353-632-1-git-send-email-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
PATCH 1/2 IB/mlx5: Refactor raw packet QP modify function
From: Alex Vesker <valex-VPRAkNaXOzVWk0Htik3J/[email protected]>
Added a struct for modifying raw QP, this will allow modifying multiple parameters in raw packet QP RQ and can also be used for SQ in the future.
--- drivers/infiniband/hw/mlx5/qp.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +20 -8
@@ -77,6 +77,10 @@ struct mlx5_wqe_eth_pad {u8 rsvd0[16 ]; }; +struct mlx5_modify_raw_qp_param { +u16 operation; +}; +static void get_cqs (enum ib_qp_type qp_type,struct ib_cq *ib_send_cq,struct ib_cq *ib_recv_cq,struct mlx5_ib_cq **send_cq,struct mlx5_ib_cq **recv_cq);
@@ -1862,7 +1866,7 @@ static void get_cqs(enum ib_qp_type qp_type, }static int modify_raw_packet_qp (struct mlx5_ib_dev *dev,struct mlx5_ib_qp *qp, -u16 operation); +const struct mlx5_modify_raw_qp_param *raw_qp_param);static void destroy_qp_common (struct mlx5_ib_dev *dev,struct mlx5_ib_qp *qp) {
@@ -1887,8 +1891,11 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp)MLX5_CMD_OP_2RST_QP ,0 , NULL, &base->mqp); }else { - err =modify_raw_packet_qp (dev, qp, -MLX5_CMD_OP_2RST_QP ); +struct mlx5_modify_raw_qp_param raw_qp_param = { + .operation =MLX5_CMD_OP_2RST_QP + }; + + err =modify_raw_packet_qp (dev, qp, &raw_qp_param); }if (err) mlx5_ib_warn(dev, "mlx5_ib: modify QP 0x%06x to RESET failed\n",
@@ -2421,7 +2428,7 @@ out: }static int modify_raw_packet_qp (struct mlx5_ib_dev *dev,struct mlx5_ib_qp *qp, -u16 operation) +const struct mlx5_modify_raw_qp_param *raw_qp_param) {struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;struct mlx5_ib_rq *rq = &raw_packet_qp->rq;
@@ -2430,7 +2437,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,int sq_state;int err; -switch (operation) { +switch (raw_qp_param->operation) {case MLX5_CMD_OP_RST2INIT_QP : rq_state =MLX5_RQC_STATE_RDY ; sq_state =MLX5_SQC_STATE_RDY ;
@@ -2689,11 +2696,16 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, optpar =ib_mask_to_mlx5_opt (attr_mask); optpar &= opt_mask[mlx5_cur][mlx5_new][mlx5_st]; -if (qp->ibqp.qp_type ==IB_QPT_RAW_PACKET ) - err =modify_raw_packet_qp (dev, qp, op); -else +if (qp->ibqp.qp_type ==IB_QPT_RAW_PACKET ) { +struct mlx5_modify_raw_qp_param raw_qp_param = {}; + + raw_qp_param.operation = op; + err =modify_raw_packet_qp (dev, qp, &raw_qp_param); + }else { err =mlx5_core_qp_modify (dev->mdev, op, optpar, context, &base->mqp); + } +if (err) goto out;
Signature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/2 IB/mlx5: Add port counter support for raw packet QP
In reply to a message not in the archiveFrom: Alex Vesker <valex-VPRAkNaXOzVWk0Htik3J/[email protected]>
Counters weren't updated due to raw packet QPs' traffic since the counter-id was not associated with the QP. Added support for associating the q-counter-id with the raw packet QP. The attachment is done only when changing RQ raw packet QP state from RST to INIT in modify-RQ command. FW support is required for the above, without this support raw packet QP counters will not count.
--- drivers/infiniband/hw/mlx5/qp.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +32 -8
@@ -77,8 +77,15 @@ struct mlx5_wqe_eth_pad {u8 rsvd0[16 ]; }; +enum raw_qp_set_mask_map { +MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID =1UL <<0 , +}; +struct mlx5_modify_raw_qp_param {u16 operation; + +u32 set_mask;/* raw_qp_set_mask_map */ +u8 rq_q_ctr_id; }; static void get_cqs(enum ib_qp_type qp_type,
@@ -2369,8 +2376,9 @@ static int ib_mask_to_mlx5_opt(int ib_mask)return result; } -static int modify_raw_packet_qp_rq (struct mlx5_core_dev *dev, -struct mlx5_ib_rq *rq,int new_state) +static int modify_raw_packet_qp_rq (struct mlx5_ib_dev *dev, +struct mlx5_ib_rq *rq,int new_state, +const struct mlx5_modify_raw_qp_param *raw_qp_param) {void *in;void *rqc;
@@ -2387,7 +2395,17 @@ static int modify_raw_packet_qp_rq(struct mlx5_core_dev *dev, rqc =MLX5_ADDR_OF (modify_rq_in, in, ctx);MLX5_SET (rqc, rqc, state, new_state); - err =mlx5_core_modify_rq (dev, rq->base.mqp.qpn, in, inlen); +if (raw_qp_param->set_mask &MLX5_RAW_QP_MOD_SET_RQ_Q_CTR_ID ) { +if (MLX5_CAP_GEN (dev->mdev, modify_rq_counter_set_id)) { +MLX5_SET64 (modify_rq_in, in, modify_bitmask, +MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_MODIFY_RQ_COUNTER_SET_ID ); +MLX5_SET (rqc, rqc, counter_set_id, raw_qp_param->rq_q_ctr_id); + }else +pr_info_once ("%s: RAW PACKET QP counters are not supported on current FW\n" , + dev->ib_dev.name); + } + + err =mlx5_core_modify_rq (dev->mdev, rq->base.mqp.qpn, in, inlen);if (err) goto out;
@@ -2454,15 +2472,17 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,case MLX5_CMD_OP_INIT2RTR_QP :case MLX5_CMD_OP_RTR2RTS_QP :case MLX5_CMD_OP_RTS2RTS_QP : -/* Nothing to do here... */ -return 0 ; +if (raw_qp_param->set_mask) +return -EINVAL ; +else +return 0 ;default :WARN_ON (1 );return -EINVAL ; }if (qp->rq.wqe_cnt) { - err =modify_raw_packet_qp_rq (dev->mdev, rq, rq_state); + err =modify_raw_packet_qp_rq (dev, rq, rq_state, raw_qp_param);if (err)return err; }
@@ -2520,6 +2540,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,struct mlx5_ib_cq *send_cq, *recv_cq;struct mlx5_qp_context *context;struct mlx5_ib_pd *pd; +struct mlx5_ib_port *mibport =NULL ;enum mlx5_qp_state mlx5_cur, mlx5_new;enum mlx5_qp_optpar optpar;int sqd_event;
@@ -2660,8 +2681,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,if (cur_state ==IB_QPS_RESET && new_state ==IB_QPS_INIT ) {u8 port_num = (attr_mask &IB_QP_PORT ? attr->port_num : qp->port) -1 ; -struct mlx5_ib_port *mibport = &dev->port[port_num]; - + mibport = &dev->port[port_num]; context->qp_counter_set_usr_page |=cpu_to_be32 ((u32)(mibport->q_cnt_id) <<24 ); }
@@ -2700,6 +2720,10 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,struct mlx5_modify_raw_qp_param raw_qp_param = {}; raw_qp_param.operation = op; +if (cur_state ==IB_QPS_RESET && new_state ==IB_QPS_INIT ) { + 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 ; + } err =modify_raw_packet_qp (dev, qp, &raw_qp_param); }else { err = mlx5_core_qp_modify(dev->mdev, op, optpar, context,
Signature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Leon Romanovsky
RDMA Counters weren't updated due to raw packet QPs' traffic since the port counter-id was not associated with the QP. FW support is required for this feature, without this support raw packet QP counters will not count. A minor re-factor to the modify raw packet QP function was needed to pass the q-counter-id to modify RQ command function.
Quoted 5 lines
Available in the "topic/raw_qp_ctr_supp" topic branch of this git repo:
git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.gitOr for browsing:
https://git.kernel.org/cgit/linux/kernel/git/leon/linux-rdma.git/log/?h=topic/raw_qp_ctr_supp
Series applied, thanks.
Signature · 2 lines
Doug Ledford <[email protected]> GPG Key ID: 0E572FDD