RDMA/bnxt_re: Stats update
Subsystems (2)
Selvin Xavier
maintainercover RDMA/bnxt_re: Stats update
This series adds some of the missing hw statistics. Also, adds some debug stats maintained by the driver.
Please review an apply.
Thanks,
Selvin
Chandramohan Akula (4):
bnxt_re: Reorganize the resource stats
bnxt_re: Update the hw counters for resource stats
bnxt_re: Expose the missing hw counters
bnxt_re: Update the debug counters for doorbell pacing
drivers/infiniband/hw/bnxt_re/bnxt_re.h | 7 --- drivers/infiniband/hw/bnxt_re/hw_counters.c | 84 +++++++++++++++++++++++++---- drivers/infiniband/hw/bnxt_re/hw_counters.h | 55 +++++++++++++++++++ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 77 +++++++++++++++++++------- drivers/infiniband/hw/bnxt_re/main.c | 17 +++--- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 7 +++ 6 files changed, 203 insertions(+), 44 deletions(-)
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 1/4 bnxt_re: Reorganize the resource stats
From: Chandramohan Akula <[email protected]>
Move the resource stats to a separate stats structure.
--- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 7 ----- drivers/infiniband/hw/bnxt_re/hw_counters.c | 17 ++++++------ drivers/infiniband/hw/bnxt_re/hw_counters.h | 11 ++++++++ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 40 ++++++++++++++--------------- drivers/infiniband/hw/bnxt_re/main.c | 14 +++++----- 5 files changed, 47 insertions(+), 42 deletions(-)
drivers/infiniband/hw/bnxt_re/bnxt_re.h +0 -7
@@ -175,16 +175,9 @@ struct bnxt_re_dev {struct bnxt_qplib_res qplib_res;struct bnxt_qplib_dpi dpi_privileged; -atomic_t qp_count;struct mutex qp_lock;/* protect qp list */ struct list_head qp_list; -atomic_t cq_count; -atomic_t srq_count; -atomic_t mr_count; -atomic_t mw_count; -atomic_t ah_count; -atomic_t pd_count;/* Max of 2 lossless traffic class supported per port */ u16 cosq[2 ];
drivers/infiniband/hw/bnxt_re/hw_counters.c +9 -8
@@ -254,21 +254,22 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, u32 port, int index) {struct bnxt_re_dev *rdev =to_bnxt_re_dev (ibdev, ibdev); -struct ctx_hw_stats *hw_stats =NULL ; +struct bnxt_re_res_cntrs *res_s = &rdev->stats.res;struct bnxt_qplib_roce_stats *err_s =NULL ; +struct ctx_hw_stats *hw_stats =NULL ;int rc =0 ; hw_stats = rdev->qplib_ctx.stats.dma;if (!port || !stats)return -EINVAL ; - stats->value[BNXT_RE_ACTIVE_QP ] =atomic_read (&rdev->qp_count); - stats->value[BNXT_RE_ACTIVE_SRQ ] =atomic_read (&rdev->srq_count); - stats->value[BNXT_RE_ACTIVE_CQ ] =atomic_read (&rdev->cq_count); - stats->value[BNXT_RE_ACTIVE_MR ] =atomic_read (&rdev->mr_count); - stats->value[BNXT_RE_ACTIVE_MW ] =atomic_read (&rdev->mw_count); - stats->value[BNXT_RE_ACTIVE_PD ] =atomic_read (&rdev->pd_count); - stats->value[BNXT_RE_ACTIVE_AH ] =atomic_read (&rdev->ah_count); + stats->value[BNXT_RE_ACTIVE_QP ] =atomic_read (&res_s->qp_count); + stats->value[BNXT_RE_ACTIVE_SRQ ] =atomic_read (&res_s->srq_count); + stats->value[BNXT_RE_ACTIVE_CQ ] =atomic_read (&res_s->cq_count); + stats->value[BNXT_RE_ACTIVE_MR ] =atomic_read (&res_s->mr_count); + stats->value[BNXT_RE_ACTIVE_MW ] =atomic_read (&res_s->mw_count); + stats->value[BNXT_RE_ACTIVE_PD ] =atomic_read (&res_s->pd_count); + stats->value[BNXT_RE_ACTIVE_AH ] =atomic_read (&res_s->ah_count);if (hw_stats) { stats->value[BNXT_RE_RECOVERABLE_ERRORS] =
drivers/infiniband/hw/bnxt_re/hw_counters.h +11 -0
@@ -113,6 +113,16 @@ enum bnxt_re_hw_stats {#define BNXT_RE_NUM_STD_COUNTERS (BNXT_RE_OUT_OF_SEQ_ERR + 1) +struct bnxt_re_res_cntrs { +atomic_t qp_count; +atomic_t cq_count; +atomic_t srq_count; +atomic_t mr_count; +atomic_t mw_count; +atomic_t ah_count; +atomic_t pd_count; +}; +struct bnxt_re_rstat {struct bnxt_qplib_roce_stats errs;struct bnxt_qplib_ext_stat ext_stat;
@@ -120,6 +130,7 @@ struct bnxt_re_rstat {struct bnxt_re_stats {struct bnxt_re_rstat rstat; +struct bnxt_re_res_cntrs res; }; struct rdma_hw_stats *bnxt_re_ib_alloc_hw_port_stats(struct ib_device *ibdev,
drivers/infiniband/hw/bnxt_re/ib_verbs.c +20 -20
@@ -602,7 +602,7 @@ int bnxt_re_dealloc_pd(struct ib_pd *ib_pd, struct ib_udata *udata)if (!bnxt_qplib_dealloc_pd (&rdev->qplib_res, &rdev->qplib_res.pd_tbl, &pd->qplib_pd)) -atomic_dec (&rdev->pd_count); +atomic_dec (&rdev->stats.res.pd_count); }return 0 ; }
@@ -665,7 +665,7 @@ int bnxt_re_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)if (bnxt_re_create_fence_mr (pd))ibdev_warn (&rdev->ibdev,"Failed to create Fence-MR\n" ); -atomic_inc (&rdev->pd_count); +atomic_inc (&rdev->stats.res.pd_count);return 0 ; dbfail:
@@ -691,7 +691,7 @@ int bnxt_re_destroy_ah(struct ib_ah *ib_ah, u32 flags)else goto fail; } -atomic_dec (&rdev->ah_count); +atomic_dec (&rdev->stats.res.ah_count); fail:return rc; }
@@ -777,7 +777,7 @@ int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_init_attr *init_attr,wmb ();/* make sure cache is updated. */ spin_unlock_irqrestore (&uctx->sh_lock, flag); } -atomic_inc (&rdev->ah_count); +atomic_inc (&rdev->stats.res.ah_count);return 0 ; }
@@ -838,7 +838,7 @@ static int bnxt_re_destroy_gsi_sqp(struct bnxt_re_qp *qp)bnxt_qplib_destroy_ah (&rdev->qplib_res, &gsi_sah->qplib_ah, true); -atomic_dec (&rdev->ah_count); +atomic_dec (&rdev->stats.res.ah_count);bnxt_qplib_clean_qp (&qp->qplib_qp);ibdev_dbg (&rdev->ibdev,"Destroy the shadow QP\n" );
@@ -853,7 +853,7 @@ static int bnxt_re_destroy_gsi_sqp(struct bnxt_re_qp *qp)mutex_lock (&rdev->qp_lock);list_del (&gsi_sqp->list);mutex_unlock (&rdev->qp_lock); -atomic_dec (&rdev->qp_count); +atomic_dec (&rdev->stats.res.qp_count);kfree (rdev->gsi_ctx.sqp_tbl);kfree (gsi_sah);
@@ -900,7 +900,7 @@ int bnxt_re_destroy_qp(struct ib_qp *ib_qp, struct ib_udata *udata)mutex_lock (&rdev->qp_lock);list_del (&qp->list);mutex_unlock (&rdev->qp_lock); -atomic_dec (&rdev->qp_count); +atomic_dec (&rdev->stats.res.qp_count);ib_umem_release (qp->rumem);ib_umem_release (qp->sumem);
@@ -1085,7 +1085,7 @@ static struct bnxt_re_ah *bnxt_re_create_shadow_qp_ah "Failed to allocate HW AH for Shadow QP"); goto fail; } -atomic_inc (&rdev->ah_count); +atomic_inc (&rdev->stats.res.ah_count);return ah;
@@ -1153,7 +1153,7 @@ static struct bnxt_re_qp *bnxt_re_create_shadow_qpINIT_LIST_HEAD (&qp->list);mutex_lock (&rdev->qp_lock);list_add_tail (&qp->list, &rdev->qp_list); -atomic_inc (&rdev->qp_count); +atomic_inc (&rdev->stats.res.qp_count);mutex_unlock (&rdev->qp_lock);return qp; fail:
@@ -1535,7 +1535,7 @@ int bnxt_re_create_qp(struct ib_qp *ib_qp, struct ib_qp_init_attr *qp_init_attr,mutex_lock (&rdev->qp_lock);list_add_tail (&qp->list, &rdev->qp_list);mutex_unlock (&rdev->qp_lock); -atomic_inc (&rdev->qp_count); +atomic_inc (&rdev->stats.res.qp_count);return 0 ; qp_destroy:
@@ -1638,7 +1638,7 @@ int bnxt_re_destroy_srq(struct ib_srq *ib_srq, struct ib_udata *udata) nq = qplib_srq->cq->nq;bnxt_qplib_destroy_srq (&rdev->qplib_res, qplib_srq);ib_umem_release (srq->umem); -atomic_dec (&rdev->srq_count); +atomic_dec (&rdev->stats.res.srq_count);if (nq) nq->budget--;return 0 ;
@@ -1750,7 +1750,7 @@ int bnxt_re_create_srq(struct ib_srq *ib_srq, }if (nq) nq->budget++; -atomic_inc (&rdev->srq_count); +atomic_inc (&rdev->stats.res.srq_count);spin_lock_init (&srq->lock);return 0 ;
@@ -2876,7 +2876,7 @@ int bnxt_re_destroy_cq(struct ib_cq *ib_cq, struct ib_udata *udata)bnxt_qplib_destroy_cq (&rdev->qplib_res, &cq->qplib_cq);ib_umem_release (cq->umem); -atomic_dec (&rdev->cq_count); +atomic_dec (&rdev->stats.res.cq_count); nq->budget--;kfree (cq->cql);return 0 ;
@@ -2960,7 +2960,7 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, cq->cq_period = cq->qplib_cq.period; nq->budget++; -atomic_inc (&rdev->cq_count); +atomic_inc (&rdev->stats.res.cq_count);spin_lock_init (&cq->cq_lock);if (udata) {
@@ -3785,7 +3785,7 @@ struct ib_mr *bnxt_re_get_dma_mr(struct ib_pd *ib_pd, int mr_access_flags)if (mr_access_flags & (IB_ACCESS_REMOTE_WRITE |IB_ACCESS_REMOTE_READ |IB_ACCESS_REMOTE_ATOMIC )) mr->ib_mr.rkey = mr->ib_mr.lkey; -atomic_inc (&rdev->mr_count); +atomic_inc (&rdev->stats.res.mr_count);return &mr->ib_mr;
@@ -3818,7 +3818,7 @@ int bnxt_re_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata)ib_umem_release (mr->ib_umem);kfree (mr); -atomic_dec (&rdev->mr_count); +atomic_dec (&rdev->stats.res.mr_count);return rc; }
@@ -3886,7 +3886,7 @@ struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type type, goto fail_mr; } -atomic_inc (&rdev->mr_count); +atomic_inc (&rdev->stats.res.mr_count);return &mr->ib_mr; fail_mr:
@@ -3922,7 +3922,7 @@ struct ib_mw *bnxt_re_alloc_mw(struct ib_pd *ib_pd, enum ib_mw_type type, } mw->ib_mw.rkey = mw->qplib_mw.rkey; -atomic_inc (&rdev->mw_count); +atomic_inc (&rdev->stats.res.mw_count);return &mw->ib_mw; fail:
@@ -3943,7 +3943,7 @@ int bnxt_re_dealloc_mw(struct ib_mw *ib_mw) }kfree (mw); -atomic_dec (&rdev->mw_count); +atomic_dec (&rdev->stats.res.mw_count);return rc; }
@@ -4010,7 +4010,7 @@ struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *ib_pd, u64 start, u64 length, mr->ib_mr.lkey = mr->qplib_mr.lkey; mr->ib_mr.rkey = mr->qplib_mr.lkey; -atomic_inc (&rdev->mr_count); +atomic_inc (&rdev->stats.res.mr_count);return &mr->ib_mr; free_umem:
drivers/infiniband/hw/bnxt_re/main.c +7 -7
@@ -918,13 +918,13 @@ static struct bnxt_re_dev *bnxt_re_dev_add(struct bnxt_aux_priv *aux_priv, rdev->id = rdev->en_dev->pdev->devfn;INIT_LIST_HEAD (&rdev->qp_list);mutex_init (&rdev->qp_lock); -atomic_set (&rdev->qp_count,0 ); -atomic_set (&rdev->cq_count,0 ); -atomic_set (&rdev->srq_count,0 ); -atomic_set (&rdev->mr_count,0 ); -atomic_set (&rdev->mw_count,0 ); -atomic_set (&rdev->ah_count,0 ); -atomic_set (&rdev->pd_count,0 ); +atomic_set (&rdev->stats.res.qp_count,0 ); +atomic_set (&rdev->stats.res.cq_count,0 ); +atomic_set (&rdev->stats.res.srq_count,0 ); +atomic_set (&rdev->stats.res.mr_count,0 ); +atomic_set (&rdev->stats.res.mw_count,0 ); +atomic_set (&rdev->stats.res.ah_count,0 ); +atomic_set (&rdev->stats.res.pd_count,0 ); rdev->cosq[0 ] =0xFFFF ; rdev->cosq[1 ] =0xFFFF ;
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 2/4 bnxt_re: Update the hw counters for resource stats
In reply to Selvin XavierFrom: Chandramohan Akula <[email protected]>
Report the additional resource counters which enables better debugging. Includes active RC/UD QPs, Watermark of the resources and a count that indicates the resize cq operations after driver load.
--- drivers/infiniband/hw/bnxt_re/hw_counters.c | 24 +++++++++++++ drivers/infiniband/hw/bnxt_re/hw_counters.h | 24 +++++++++++++ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 55 ++++++++++++++++++++++++----- 3 files changed, 94 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/hw_counters.c +24 -0
@@ -61,10 +61,22 @@ static const struct rdma_stat_desc bnxt_re_stat_descs[] = { [BNXT_RE_ACTIVE_PD].name = "active_pds", [BNXT_RE_ACTIVE_AH].name = "active_ahs", [BNXT_RE_ACTIVE_QP].name = "active_qps", + [BNXT_RE_ACTIVE_RC_QP].name = "active_rc_qps", + [BNXT_RE_ACTIVE_UD_QP].name = "active_ud_qps", [BNXT_RE_ACTIVE_SRQ].name = "active_srqs", [BNXT_RE_ACTIVE_CQ].name = "active_cqs", [BNXT_RE_ACTIVE_MR].name = "active_mrs", [BNXT_RE_ACTIVE_MW].name = "active_mws", + [BNXT_RE_WATERMARK_PD].name = "watermark_pds", + [BNXT_RE_WATERMARK_AH].name = "watermark_ahs", + [BNXT_RE_WATERMARK_QP].name = "watermark_qps", + [BNXT_RE_WATERMARK_RC_QP].name = "watermark_rc_qps", + [BNXT_RE_WATERMARK_UD_QP].name = "watermark_ud_qps", + [BNXT_RE_WATERMARK_SRQ].name = "watermark_srqs", + [BNXT_RE_WATERMARK_CQ].name = "watermark_cqs", + [BNXT_RE_WATERMARK_MR].name = "watermark_mrs", + [BNXT_RE_WATERMARK_MW].name = "watermark_mws", + [BNXT_RE_RESIZE_CQ_CNT].name = "resize_cq_cnt", [BNXT_RE_RX_PKTS].name = "rx_pkts", [BNXT_RE_RX_BYTES].name = "rx_bytes", [BNXT_RE_TX_PKTS].name = "tx_pkts",
@@ -264,12 +276,24 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,return -EINVAL ; stats->value[BNXT_RE_ACTIVE_QP ] =atomic_read (&res_s->qp_count); + stats->value[BNXT_RE_ACTIVE_RC_QP ] =atomic_read (&res_s->rc_qp_count); + stats->value[BNXT_RE_ACTIVE_UD_QP ] =atomic_read (&res_s->ud_qp_count); stats->value[BNXT_RE_ACTIVE_SRQ ] =atomic_read (&res_s->srq_count); stats->value[BNXT_RE_ACTIVE_CQ ] =atomic_read (&res_s->cq_count); stats->value[BNXT_RE_ACTIVE_MR ] =atomic_read (&res_s->mr_count); stats->value[BNXT_RE_ACTIVE_MW ] =atomic_read (&res_s->mw_count); stats->value[BNXT_RE_ACTIVE_PD ] =atomic_read (&res_s->pd_count); stats->value[BNXT_RE_ACTIVE_AH ] =atomic_read (&res_s->ah_count); + stats->value[BNXT_RE_WATERMARK_QP ] = res_s->qp_watermark; + stats->value[BNXT_RE_WATERMARK_RC_QP ] = res_s->rc_qp_watermark; + stats->value[BNXT_RE_WATERMARK_UD_QP ] = res_s->ud_qp_watermark; + stats->value[BNXT_RE_WATERMARK_SRQ ] = res_s->srq_watermark; + stats->value[BNXT_RE_WATERMARK_CQ ] = res_s->cq_watermark; + stats->value[BNXT_RE_WATERMARK_MR ] = res_s->mr_watermark; + stats->value[BNXT_RE_WATERMARK_MW ] = res_s->mw_watermark; + stats->value[BNXT_RE_WATERMARK_PD ] = res_s->pd_watermark; + stats->value[BNXT_RE_WATERMARK_AH ] = res_s->ah_watermark; + stats->value[BNXT_RE_RESIZE_CQ_CNT ] =atomic_read (&res_s->resize_count);if (hw_stats) { stats->value[BNXT_RE_RECOVERABLE_ERRORS] =
drivers/infiniband/hw/bnxt_re/hw_counters.h +24 -0
@@ -44,10 +44,22 @@ enum bnxt_re_hw_stats {BNXT_RE_ACTIVE_PD ,BNXT_RE_ACTIVE_AH ,BNXT_RE_ACTIVE_QP , +BNXT_RE_ACTIVE_RC_QP , +BNXT_RE_ACTIVE_UD_QP ,BNXT_RE_ACTIVE_SRQ ,BNXT_RE_ACTIVE_CQ ,BNXT_RE_ACTIVE_MR ,BNXT_RE_ACTIVE_MW , +BNXT_RE_WATERMARK_PD , +BNXT_RE_WATERMARK_AH , +BNXT_RE_WATERMARK_QP , +BNXT_RE_WATERMARK_RC_QP , +BNXT_RE_WATERMARK_UD_QP , +BNXT_RE_WATERMARK_SRQ , +BNXT_RE_WATERMARK_CQ , +BNXT_RE_WATERMARK_MR , +BNXT_RE_WATERMARK_MW , +BNXT_RE_RESIZE_CQ_CNT ,BNXT_RE_RX_PKTS ,BNXT_RE_RX_BYTES , BNXT_RE_TX_PKTS,
@@ -115,12 +127,24 @@ enum bnxt_re_hw_stats {struct bnxt_re_res_cntrs {atomic_t qp_count; +atomic_t rc_qp_count; +atomic_t ud_qp_count;atomic_t cq_count;atomic_t srq_count;atomic_t mr_count;atomic_t mw_count;atomic_t ah_count;atomic_t pd_count; +atomic_t resize_count; +u64 qp_watermark; +u64 rc_qp_watermark; +u64 ud_qp_watermark; +u64 cq_watermark; +u64 srq_watermark; +u64 mr_watermark; +u64 mw_watermark; +u64 ah_watermark; +u64 pd_watermark; };struct bnxt_re_rstat {
drivers/infiniband/hw/bnxt_re/ib_verbs.c +46 -9
169 lines not on this page · raw message
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 3/4 bnxt_re: Expose the missing hw counters
In reply to Selvin XavierFrom: Chandramohan Akula <[email protected]>
Add code to expose some of the HW counters related to tx/rx data and Congestion control.
--- drivers/infiniband/hw/bnxt_re/hw_counters.c | 25 +++++++++++++++++++++++-- drivers/infiniband/hw/bnxt_re/hw_counters.h | 9 +++++++++ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 7 +++++++ 3 files changed, 39 insertions(+), 2 deletions(-)
drivers/infiniband/hw/bnxt_re/hw_counters.c +23 -2
@@ -82,6 +82,8 @@ static const struct rdma_stat_desc bnxt_re_stat_descs[] = { [BNXT_RE_TX_PKTS].name = "tx_pkts", [BNXT_RE_TX_BYTES].name = "tx_bytes", [BNXT_RE_RECOVERABLE_ERRORS].name = "recoverable_errors", + [BNXT_RE_TX_ERRORS].name = "tx_roce_errors", + [BNXT_RE_TX_DISCARDS].name = "tx_roce_discards", [BNXT_RE_RX_ERRORS].name = "rx_roce_errors", [BNXT_RE_RX_DISCARDS].name = "rx_roce_discards", [BNXT_RE_TO_RETRANSMITS].name = "to_retransmits",
@@ -129,14 +131,21 @@ static const struct rdma_stat_desc bnxt_re_stat_descs[] = { [BNXT_RE_TX_READ_RES].name = "tx_read_resp", [BNXT_RE_TX_WRITE_REQ].name = "tx_write_req", [BNXT_RE_TX_SEND_REQ].name = "tx_send_req", + [BNXT_RE_TX_ROCE_PKTS].name = "tx_roce_only_pkts", + [BNXT_RE_TX_ROCE_BYTES].name = "tx_roce_only_bytes", [BNXT_RE_RX_ATOMIC_REQ].name = "rx_atomic_req", [BNXT_RE_RX_READ_REQ].name = "rx_read_req", [BNXT_RE_RX_READ_RESP].name = "rx_read_resp", [BNXT_RE_RX_WRITE_REQ].name = "rx_write_req", [BNXT_RE_RX_SEND_REQ].name = "rx_send_req", + [BNXT_RE_RX_ROCE_PKTS].name = "rx_roce_only_pkts", + [BNXT_RE_RX_ROCE_BYTES].name = "rx_roce_only_bytes", [BNXT_RE_RX_ROCE_GOOD_PKTS].name = "rx_roce_good_pkts", [BNXT_RE_RX_ROCE_GOOD_BYTES].name = "rx_roce_good_bytes", - [BNXT_RE_OOB ].name ="rx_out_of_buffer" + [BNXT_RE_OOB].name = "rx_out_of_buffer", + [BNXT_RE_TX_CNP].name = "tx_cnp_pkts", + [BNXT_RE_RX_CNP].name = "rx_cnp_pkts", + [BNXT_RE_RX_ECN].name = "rx_ecn_marked_pkts", }; static void bnxt_re_copy_ext_stats(struct bnxt_re_dev *rdev,
@@ -148,14 +157,22 @@ static void bnxt_re_copy_ext_stats(struct bnxt_re_dev *rdev, stats->value[BNXT_RE_TX_READ_RES ] = s->tx_read_res; stats->value[BNXT_RE_TX_WRITE_REQ ] = s->tx_write_req; stats->value[BNXT_RE_TX_SEND_REQ ] = s->tx_send_req; + stats->value[BNXT_RE_TX_ROCE_PKTS ] = s->tx_roce_pkts; + stats->value[BNXT_RE_TX_ROCE_BYTES ] = s->tx_roce_bytes; stats->value[BNXT_RE_RX_ATOMIC_REQ ] = s->rx_atomic_req; stats->value[BNXT_RE_RX_READ_REQ ] = s->rx_read_req; stats->value[BNXT_RE_RX_READ_RESP ] = s->rx_read_res; stats->value[BNXT_RE_RX_WRITE_REQ ] = s->rx_write_req; stats->value[BNXT_RE_RX_SEND_REQ ] = s->rx_send_req; + stats->value[BNXT_RE_RX_ROCE_PKTS ] = s->rx_roce_pkts; + stats->value[BNXT_RE_RX_ROCE_BYTES ] = s->rx_roce_bytes; stats->value[BNXT_RE_RX_ROCE_GOOD_PKTS ] = s->rx_roce_good_pkts; stats->value[BNXT_RE_RX_ROCE_GOOD_BYTES ] = s->rx_roce_good_bytes; stats->value[BNXT_RE_OOB ] = s->rx_out_of_buffer; + stats->value[BNXT_RE_TX_CNP ] = s->tx_cnp; + stats->value[BNXT_RE_RX_CNP ] = s->rx_cnp; + stats->value[BNXT_RE_RX_ECN ] = s->rx_ecn_marked; + stats->value[BNXT_RE_OUT_OF_SEQ_ERR ] = s->rx_out_of_sequence; } static int bnxt_re_get_ext_stat(struct bnxt_re_dev *rdev,
@@ -298,6 +315,10 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,if (hw_stats) { stats->value[BNXT_RE_RECOVERABLE_ERRORS ] =le64_to_cpu (hw_stats->tx_bcast_pkts); + stats->value[BNXT_RE_TX_DISCARDS ] = +le64_to_cpu (hw_stats->tx_discard_pkts); + stats->value[BNXT_RE_TX_ERRORS ] = +le64_to_cpu (hw_stats->tx_error_pkts); stats->value[BNXT_RE_RX_ERRORS ] =le64_to_cpu (hw_stats->rx_error_pkts); stats->value[BNXT_RE_RX_DISCARDS] =
@@ -319,6 +340,7 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, &rdev->flags); goto done; } +bnxt_re_copy_err_stats (rdev, stats, err_s);if (_is_ext_stats_supported (rdev->dev_attr.dev_cap_flags) && !rdev->is_virtfn) { rc =bnxt_re_get_ext_stat (rdev, stats);
@@ -328,7 +350,6 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, goto done; } } -bnxt_re_copy_err_stats (rdev, stats, err_s); } done:
drivers/infiniband/hw/bnxt_re/hw_counters.h +9 -0
@@ -65,6 +65,8 @@ enum bnxt_re_hw_stats {BNXT_RE_TX_PKTS ,BNXT_RE_TX_BYTES ,BNXT_RE_RECOVERABLE_ERRORS , +BNXT_RE_TX_ERRORS , +BNXT_RE_TX_DISCARDS ,BNXT_RE_RX_ERRORS ,BNXT_RE_RX_DISCARDS , BNXT_RE_TO_RETRANSMITS,
@@ -112,14 +114,21 @@ enum bnxt_re_hw_stats {BNXT_RE_TX_READ_RES ,BNXT_RE_TX_WRITE_REQ ,BNXT_RE_TX_SEND_REQ , +BNXT_RE_TX_ROCE_PKTS , +BNXT_RE_TX_ROCE_BYTES ,BNXT_RE_RX_ATOMIC_REQ ,BNXT_RE_RX_READ_REQ ,BNXT_RE_RX_READ_RESP ,BNXT_RE_RX_WRITE_REQ ,BNXT_RE_RX_SEND_REQ , +BNXT_RE_RX_ROCE_PKTS , +BNXT_RE_RX_ROCE_BYTES ,BNXT_RE_RX_ROCE_GOOD_PKTS ,BNXT_RE_RX_ROCE_GOOD_BYTES ,BNXT_RE_OOB , +BNXT_RE_TX_CNP , +BNXT_RE_RX_CNP , +BNXT_RE_RX_ECN ,BNXT_RE_NUM_EXT_COUNTERS };
drivers/infiniband/hw/bnxt_re/qplib_sp.c +7 -0
@@ -832,15 +832,22 @@ int bnxt_qplib_qext_stat(struct bnxt_qplib_rcfw *rcfw, u32 fid, estat->tx_read_res =le64_to_cpu (sb->tx_read_res_pkts); estat->tx_write_req =le64_to_cpu (sb->tx_write_req_pkts); estat->tx_send_req =le64_to_cpu (sb->tx_send_req_pkts); + estat->tx_roce_pkts =le64_to_cpu (sb->tx_roce_pkts); + estat->tx_roce_bytes =le64_to_cpu (sb->tx_roce_bytes); estat->rx_atomic_req =le64_to_cpu (sb->rx_atomic_req_pkts); estat->rx_read_req =le64_to_cpu (sb->rx_read_req_pkts); estat->rx_read_res =le64_to_cpu (sb->rx_read_res_pkts); estat->rx_write_req =le64_to_cpu (sb->rx_write_req_pkts); estat->rx_send_req =le64_to_cpu (sb->rx_send_req_pkts); + estat->rx_roce_pkts =le64_to_cpu (sb->rx_roce_pkts); + estat->rx_roce_bytes =le64_to_cpu (sb->rx_roce_bytes); estat->rx_roce_good_pkts =le64_to_cpu (sb->rx_roce_good_pkts); estat->rx_roce_good_bytes =le64_to_cpu (sb->rx_roce_good_bytes); estat->rx_out_of_buffer =le64_to_cpu (sb->rx_out_of_buffer_pkts); estat->rx_out_of_sequence =le64_to_cpu (sb->rx_out_of_sequence_pkts); + estat->tx_cnp =le64_to_cpu (sb->tx_cnp_pkts); + estat->rx_cnp =le64_to_cpu (sb->rx_cnp_pkts); + estat->rx_ecn_marked =le64_to_cpu (sb->rx_ecn_marked_pkts); bail:bnxt_qplib_rcfw_free_sbuf (rcfw, sbuf);
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 4/4 bnxt_re: Update the debug counters for doorbell pacing
In reply to Selvin XavierFrom: Chandramohan Akula <[email protected]>
Add debug counters to track the Doorbell pacing events and report the doorbell pacing debug stats.
--- drivers/infiniband/hw/bnxt_re/hw_counters.c | 18 ++++++++++++++++++ drivers/infiniband/hw/bnxt_re/hw_counters.h | 11 +++++++++++ drivers/infiniband/hw/bnxt_re/main.c | 3 +++ 3 files changed, 32 insertions(+)
drivers/infiniband/hw/bnxt_re/hw_counters.c +18 -0
@@ -146,6 +146,10 @@ static const struct rdma_stat_desc bnxt_re_stat_descs[] = { [BNXT_RE_TX_CNP].name = "tx_cnp_pkts", [BNXT_RE_RX_CNP].name = "rx_cnp_pkts", [BNXT_RE_RX_ECN].name = "rx_ecn_marked_pkts", + [BNXT_RE_PACING_RESCHED].name = "pacing_reschedule", + [BNXT_RE_PACING_CMPL].name = "pacing_complete", + [BNXT_RE_PACING_ALERT].name = "pacing_alerts", + [BNXT_RE_DB_FIFO_REG].name = "db_fifo_register", }; static void bnxt_re_copy_ext_stats(struct bnxt_re_dev *rdev,
@@ -278,6 +282,18 @@ static void bnxt_re_copy_err_stats(struct bnxt_re_dev *rdev, err_s->res_oos_drop_count; } +static void bnxt_re_copy_db_pacing_stats (struct bnxt_re_dev *rdev, +struct rdma_hw_stats *stats) +{ +struct bnxt_re_db_pacing_stats *pacing_s = &rdev->stats.pacing; + + stats->value[BNXT_RE_PACING_RESCHED ] = pacing_s->resched; + stats->value[BNXT_RE_PACING_CMPL ] = pacing_s->complete; + stats->value[BNXT_RE_PACING_ALERT ] = pacing_s->alerts; + stats->value[BNXT_RE_DB_FIFO_REG ] = +readl (rdev->en_dev->bar0 + rdev->pacing.dbr_db_fifo_reg_off); +} +int bnxt_re_ib_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats,u32 port,int index)
@@ -350,6 +366,8 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, goto done; } } +if (rdev->pacing.dbr_pacing) +bnxt_re_copy_db_pacing_stats (rdev, stats); } done:
drivers/infiniband/hw/bnxt_re/hw_counters.h +11 -0
@@ -129,11 +129,21 @@ enum bnxt_re_hw_stats { BNXT_RE_TX_CNP,BNXT_RE_RX_CNP ,BNXT_RE_RX_ECN , +BNXT_RE_PACING_RESCHED , +BNXT_RE_PACING_CMPL , +BNXT_RE_PACING_ALERT , +BNXT_RE_DB_FIFO_REG ,BNXT_RE_NUM_EXT_COUNTERS };#define BNXT_RE_NUM_STD_COUNTERS (BNXT_RE_OUT_OF_SEQ_ERR + 1) +struct bnxt_re_db_pacing_stats { +u64 resched; +u64 complete; +u64 alerts; +}; +struct bnxt_re_res_cntrs {atomic_t qp_count;atomic_t rc_qp_count;
@@ -164,6 +174,7 @@ struct bnxt_re_rstat {struct bnxt_re_stats {struct bnxt_re_rstat rstat;struct bnxt_re_res_cntrs res; +struct bnxt_re_db_pacing_stats pacing; }; struct rdma_hw_stats *bnxt_re_ib_alloc_hw_port_stats(struct ib_device *ibdev,
drivers/infiniband/hw/bnxt_re/main.c +3 -0
@@ -533,6 +533,7 @@ static void bnxt_re_db_fifo_check(struct work_struct *work) pacing_data->pacing_th *BNXT_RE_PACING_ALARM_TH_MULTIPLE ;schedule_delayed_work (&rdev->dbq_pacing_work,msecs_to_jiffies (rdev->pacing.dbq_pacing_time)); + rdev->stats.pacing.alerts++;mutex_unlock (&rdev->pacing.dbq_lock); }
@@ -563,12 +564,14 @@ static void bnxt_re_pacing_timer_exp(struct work_struct *work) pacing_data->do_pacing =max_t (u32, rdev->pacing.dbr_def_do_pacing, pacing_data->do_pacing);if (pacing_data->do_pacing <= rdev->pacing.dbr_def_do_pacing) {bnxt_re_set_default_pacing_data (rdev); + rdev->stats.pacing.complete++; goto dbq_unlock; } restart_timer:schedule_delayed_work (&rdev->dbq_pacing_work,msecs_to_jiffies (rdev->pacing.dbq_pacing_time)); + rdev->stats.pacing.resched++; dbq_unlock: rdev->pacing.do_pacing_save = pacing_data->do_pacing;mutex_unlock (&rdev->pacing.dbq_lock);
Signature · 1 line
2.5.5
Leon Romanovsky
AppliedQuoted 9 lines · Selvin Xavier
This series adds some of the missing hw statistics. Also, adds some debug stats maintained by the driver.
Please review an apply.
Thanks,
Selvin[...]
Applied, thanks!
[1/4] bnxt_re: Reorganize the resource stats
https://git.kernel.org/rdma/rdma/c/063975feedb143 [2/4] bnxt_re: Update the hw counters for resource stats https://git.kernel.org/rdma/rdma/c/cb95709e0dca7a [3/4] bnxt_re: Expose the missing hw counters https://git.kernel.org/rdma/rdma/c/4405baf85a83ed [4/4] bnxt_re: Update the debug counters for doorbell pacing https://git.kernel.org/rdma/rdma/c/8b6573ff3420a2
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>