Skip to content

Commit 7fcf00b

Browse files
anprabhu78jgunthorpe
authored andcommitted
RDMA/bnxt_re: Remove non-statistics counters from hw_counters
Remove non-statistics counters from the RDMA hw_counters framework. The removed data includes: - Active resource counts (ACTIVE_PD, ACTIVE_QP, etc.) - Resource watermarks (WATERMARK_PD, WATERMARK_QP, etc.) - Operational counters (RESIZE_CQ_CNT) - DB pacing metrics (PACING_RESCHED, PACING_CMPL, etc.) This change ensures hw_counters contains only true performance and error statistics. Link: https://patch.msgid.link/r/[email protected] Signed-off-by: Anantha Prabhu <[email protected]> Signed-off-by: Kalesh AP <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent 604f202 commit 7fcf00b

File tree

2 files changed

+0
-81
lines changed

2 files changed

+0
-81
lines changed

drivers/infiniband/hw/bnxt_re/hw_counters.c

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,6 @@
5151
#include "hw_counters.h"
5252

5353
static const struct rdma_stat_desc bnxt_re_stat_descs[] = {
54-
[BNXT_RE_ACTIVE_PD].name = "active_pds",
55-
[BNXT_RE_ACTIVE_AH].name = "active_ahs",
56-
[BNXT_RE_ACTIVE_QP].name = "active_qps",
57-
[BNXT_RE_ACTIVE_RC_QP].name = "active_rc_qps",
58-
[BNXT_RE_ACTIVE_UD_QP].name = "active_ud_qps",
59-
[BNXT_RE_ACTIVE_SRQ].name = "active_srqs",
60-
[BNXT_RE_ACTIVE_CQ].name = "active_cqs",
61-
[BNXT_RE_ACTIVE_MR].name = "active_mrs",
62-
[BNXT_RE_ACTIVE_MW].name = "active_mws",
63-
[BNXT_RE_WATERMARK_PD].name = "watermark_pds",
64-
[BNXT_RE_WATERMARK_AH].name = "watermark_ahs",
65-
[BNXT_RE_WATERMARK_QP].name = "watermark_qps",
66-
[BNXT_RE_WATERMARK_RC_QP].name = "watermark_rc_qps",
67-
[BNXT_RE_WATERMARK_UD_QP].name = "watermark_ud_qps",
68-
[BNXT_RE_WATERMARK_SRQ].name = "watermark_srqs",
69-
[BNXT_RE_WATERMARK_CQ].name = "watermark_cqs",
70-
[BNXT_RE_WATERMARK_MR].name = "watermark_mrs",
71-
[BNXT_RE_WATERMARK_MW].name = "watermark_mws",
72-
[BNXT_RE_RESIZE_CQ_CNT].name = "resize_cq_cnt",
7354
[BNXT_RE_RX_PKTS].name = "rx_pkts",
7455
[BNXT_RE_RX_BYTES].name = "rx_bytes",
7556
[BNXT_RE_TX_PKTS].name = "tx_pkts",
@@ -139,10 +120,6 @@ static const struct rdma_stat_desc bnxt_re_stat_descs[] = {
139120
[BNXT_RE_TX_CNP].name = "np_cnp_pkts",
140121
[BNXT_RE_RX_CNP].name = "rp_cnp_handled",
141122
[BNXT_RE_RX_ECN].name = "np_ecn_marked_roce_packets",
142-
[BNXT_RE_PACING_RESCHED].name = "pacing_reschedule",
143-
[BNXT_RE_PACING_CMPL].name = "pacing_complete",
144-
[BNXT_RE_PACING_ALERT].name = "pacing_alerts",
145-
[BNXT_RE_DB_FIFO_REG].name = "db_fifo_register",
146123
[BNXT_RE_REQ_CQE_ERROR].name = "req_cqe_error",
147124
[BNXT_RE_RESP_CQE_ERROR].name = "resp_cqe_error",
148125
[BNXT_RE_RESP_REMOTE_ACCESS_ERRS].name = "resp_remote_access_errors",
@@ -292,18 +269,6 @@ static void bnxt_re_copy_err_stats(struct bnxt_re_dev *rdev,
292269
err_s->res_tx_no_perm;
293270
}
294271

295-
static void bnxt_re_copy_db_pacing_stats(struct bnxt_re_dev *rdev,
296-
struct rdma_hw_stats *stats)
297-
{
298-
struct bnxt_re_db_pacing_stats *pacing_s = &rdev->stats.pacing;
299-
300-
stats->value[BNXT_RE_PACING_RESCHED] = pacing_s->resched;
301-
stats->value[BNXT_RE_PACING_CMPL] = pacing_s->complete;
302-
stats->value[BNXT_RE_PACING_ALERT] = pacing_s->alerts;
303-
stats->value[BNXT_RE_DB_FIFO_REG] =
304-
readl(rdev->en_dev->bar0 + rdev->pacing.dbr_db_fifo_reg_off);
305-
}
306-
307272
int bnxt_re_assign_pma_port_ext_counters(struct bnxt_re_dev *rdev, struct ib_mad *out_mad)
308273
{
309274
struct ib_pma_portcounters_ext *pma_cnt_ext;
@@ -399,7 +364,6 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
399364
u32 port, int index)
400365
{
401366
struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);
402-
struct bnxt_re_res_cntrs *res_s = &rdev->stats.res;
403367
struct bnxt_qplib_roce_stats *err_s = NULL;
404368
struct ctx_hw_stats *hw_stats = NULL;
405369
int rc = 0;
@@ -408,26 +372,6 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
408372
if (!port || !stats)
409373
return -EINVAL;
410374

411-
stats->value[BNXT_RE_ACTIVE_QP] = atomic_read(&res_s->qp_count);
412-
stats->value[BNXT_RE_ACTIVE_RC_QP] = atomic_read(&res_s->rc_qp_count);
413-
stats->value[BNXT_RE_ACTIVE_UD_QP] = atomic_read(&res_s->ud_qp_count);
414-
stats->value[BNXT_RE_ACTIVE_SRQ] = atomic_read(&res_s->srq_count);
415-
stats->value[BNXT_RE_ACTIVE_CQ] = atomic_read(&res_s->cq_count);
416-
stats->value[BNXT_RE_ACTIVE_MR] = atomic_read(&res_s->mr_count);
417-
stats->value[BNXT_RE_ACTIVE_MW] = atomic_read(&res_s->mw_count);
418-
stats->value[BNXT_RE_ACTIVE_PD] = atomic_read(&res_s->pd_count);
419-
stats->value[BNXT_RE_ACTIVE_AH] = atomic_read(&res_s->ah_count);
420-
stats->value[BNXT_RE_WATERMARK_QP] = res_s->qp_watermark;
421-
stats->value[BNXT_RE_WATERMARK_RC_QP] = res_s->rc_qp_watermark;
422-
stats->value[BNXT_RE_WATERMARK_UD_QP] = res_s->ud_qp_watermark;
423-
stats->value[BNXT_RE_WATERMARK_SRQ] = res_s->srq_watermark;
424-
stats->value[BNXT_RE_WATERMARK_CQ] = res_s->cq_watermark;
425-
stats->value[BNXT_RE_WATERMARK_MR] = res_s->mr_watermark;
426-
stats->value[BNXT_RE_WATERMARK_MW] = res_s->mw_watermark;
427-
stats->value[BNXT_RE_WATERMARK_PD] = res_s->pd_watermark;
428-
stats->value[BNXT_RE_WATERMARK_AH] = res_s->ah_watermark;
429-
stats->value[BNXT_RE_RESIZE_CQ_CNT] = atomic_read(&res_s->resize_count);
430-
431375
if (hw_stats) {
432376
stats->value[BNXT_RE_RECOVERABLE_ERRORS] =
433377
le64_to_cpu(hw_stats->tx_bcast_pkts);
@@ -466,8 +410,6 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
466410
goto done;
467411
}
468412
}
469-
if (rdev->pacing.dbr_pacing && bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
470-
bnxt_re_copy_db_pacing_stats(rdev, stats);
471413
}
472414

473415
done:

drivers/infiniband/hw/bnxt_re/hw_counters.h

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,6 @@
4141
#define __BNXT_RE_HW_STATS_H__
4242

4343
enum bnxt_re_hw_stats {
44-
BNXT_RE_ACTIVE_PD,
45-
BNXT_RE_ACTIVE_AH,
46-
BNXT_RE_ACTIVE_QP,
47-
BNXT_RE_ACTIVE_RC_QP,
48-
BNXT_RE_ACTIVE_UD_QP,
49-
BNXT_RE_ACTIVE_SRQ,
50-
BNXT_RE_ACTIVE_CQ,
51-
BNXT_RE_ACTIVE_MR,
52-
BNXT_RE_ACTIVE_MW,
53-
BNXT_RE_WATERMARK_PD,
54-
BNXT_RE_WATERMARK_AH,
55-
BNXT_RE_WATERMARK_QP,
56-
BNXT_RE_WATERMARK_RC_QP,
57-
BNXT_RE_WATERMARK_UD_QP,
58-
BNXT_RE_WATERMARK_SRQ,
59-
BNXT_RE_WATERMARK_CQ,
60-
BNXT_RE_WATERMARK_MR,
61-
BNXT_RE_WATERMARK_MW,
62-
BNXT_RE_RESIZE_CQ_CNT,
6344
BNXT_RE_RX_PKTS,
6445
BNXT_RE_RX_BYTES,
6546
BNXT_RE_TX_PKTS,
@@ -129,10 +110,6 @@ enum bnxt_re_hw_stats {
129110
BNXT_RE_TX_CNP,
130111
BNXT_RE_RX_CNP,
131112
BNXT_RE_RX_ECN,
132-
BNXT_RE_PACING_RESCHED,
133-
BNXT_RE_PACING_CMPL,
134-
BNXT_RE_PACING_ALERT,
135-
BNXT_RE_DB_FIFO_REG,
136113
BNXT_RE_REQ_CQE_ERROR,
137114
BNXT_RE_RESP_CQE_ERROR,
138115
BNXT_RE_RESP_REMOTE_ACCESS_ERRS,

0 commit comments

Comments
 (0)