| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20210818112428.209111-5-markzhang@nvidia.com>
Date: Wed, 18 Aug 2021 14:24:22 +0300
From: Mark Zhang <markzhang@...dia.com>
To: <jgg@...dia.com>, <dledford@...hat.com>, <saeedm@...dia.com>
CC: <linux-rdma@...r.kernel.org>, <netdev@...r.kernel.org>,
<aharonl@...dia.com>, <netao@...dia.com>, <leonro@...dia.com>,
Mark Zhang <markzhang@...dia.com>
Subject: [PATCH rdma-next 04/10] RDMA/mlx5: Add alloc_op_port_stats() support
From: Aharon Landau <aharonl@...dia.com>
Add support for ib callback alloc_op_port_stats().
Signed-off-by: Aharon Landau <aharonl@...dia.com>
Signed-off-by: Mark Zhang <markzhang@...dia.com>
---
drivers/infiniband/hw/mlx5/counters.c | 71 ++++++++++++++++++++++++++-
drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 +++
include/rdma/ib_verbs.h | 2 +
3 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/counters.c b/drivers/infiniband/hw/mlx5/counters.c
index 224ba36f2946..5b4b446727d1 100644
--- a/drivers/infiniband/hw/mlx5/counters.c
+++ b/drivers/infiniband/hw/mlx5/counters.c
@@ -187,6 +187,72 @@ mlx5_ib_alloc_hw_port_stats(struct ib_device *ibdev, u32 port_num)
RDMA_HW_STATS_DEFAULT_LIFESPAN);
}
+struct mlx5_ib_opcounter {
+ const char *name;
+ enum mlx5_ib_optional_counter_type type;
+};
+
+static const struct mlx5_ib_opcounter basic_op_cnts[] = {
+ {.name = "cc_rx_ce_pkts", .type = MLX5_IB_OPCOUNTER_CC_RX_CE_PKTS},
+};
+
+static const struct mlx5_ib_opcounter rdmarx_cnp_op_cnts[] = {
+ {.name = "cc_rx_cnp_pkts", .type = MLX5_IB_OPCOUNTER_CC_RX_CNP_PKTS},
+};
+
+static const struct mlx5_ib_opcounter rdmatx_cnp_op_cnts[] = {
+ {.name = "cc_tx_cnp_pkts", .type = MLX5_IB_OPCOUNTER_CC_TX_CNP_PKTS},
+};
+
+static struct rdma_op_stats *
+mlx5_ib_alloc_op_port_stats(struct ib_device *ibdev, u32 port_num)
+{
+ struct rdma_op_stats *opstats;
+ struct mlx5_ib_dev *dev = to_mdev(ibdev);
+ int num_opcounters, i, j = 0;
+
+ num_opcounters = ARRAY_SIZE(basic_op_cnts);
+
+ if (MLX5_CAP_FLOWTABLE(dev->mdev,
+ ft_field_support_2_nic_receive_rdma.bth_opcode))
+ num_opcounters += ARRAY_SIZE(rdmarx_cnp_op_cnts);
+
+ if (MLX5_CAP_FLOWTABLE(dev->mdev,
+ ft_field_support_2_nic_transmit_rdma.bth_opcode))
+ num_opcounters += ARRAY_SIZE(rdmatx_cnp_op_cnts);
+
+ opstats = kzalloc(sizeof(*opstats) +
+ num_opcounters * sizeof(struct rdma_op_counter),
+ GFP_KERNEL);
+ if (!opstats)
+ return NULL;
+
+ for (i = 0; i < ARRAY_SIZE(basic_op_cnts); i++, j++) {
+ opstats->opcounters[j].name = basic_op_cnts[i].name;
+ opstats->opcounters[j].type = basic_op_cnts[i].type;
+ }
+
+ if (MLX5_CAP_FLOWTABLE(dev->mdev,
+ ft_field_support_2_nic_receive_rdma.bth_opcode)) {
+ for (i = 0; i < ARRAY_SIZE(rdmarx_cnp_op_cnts); i++, j++) {
+ opstats->opcounters[j].name = rdmarx_cnp_op_cnts[i].name;
+ opstats->opcounters[j].type = rdmarx_cnp_op_cnts[i].type;
+ }
+ }
+
+ if (MLX5_CAP_FLOWTABLE(dev->mdev,
+ ft_field_support_2_nic_transmit_rdma.bth_opcode)) {
+ for (i = 0; i < ARRAY_SIZE(rdmatx_cnp_op_cnts); i++, j++) {
+ opstats->opcounters[j].name = rdmatx_cnp_op_cnts[i].name;
+ opstats->opcounters[j].type = rdmatx_cnp_op_cnts[i].type;
+ }
+ }
+
+ opstats->num_opcounters = num_opcounters;
+
+ return opstats;
+}
+
static int mlx5_ib_query_q_counters(struct mlx5_core_dev *mdev,
const struct mlx5_ib_counters *cnts,
struct rdma_hw_stats *stats,
@@ -672,8 +738,9 @@ void mlx5_ib_counters_clear_description(struct ib_counters *counters)
mutex_unlock(&mcounters->mcntrs_mutex);
}
-static const struct ib_device_ops hw_stats_ops = {
+static const struct ib_device_ops stats_ops = {
.alloc_hw_port_stats = mlx5_ib_alloc_hw_port_stats,
+ .alloc_op_port_stats = mlx5_ib_alloc_op_port_stats,
.get_hw_stats = mlx5_ib_get_hw_stats,
.counter_bind_qp = mlx5_ib_counter_bind_qp,
.counter_unbind_qp = mlx5_ib_counter_unbind_qp,
@@ -710,7 +777,7 @@ int mlx5_ib_counters_init(struct mlx5_ib_dev *dev)
if (is_mdev_switchdev_mode(dev->mdev))
ib_set_device_ops(&dev->ib_dev, &hw_switchdev_stats_ops);
else
- ib_set_device_ops(&dev->ib_dev, &hw_stats_ops);
+ ib_set_device_ops(&dev->ib_dev, &stats_ops);
return mlx5_ib_alloc_counters(dev);
}
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index bf20a388eabe..2ba352702294 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -797,6 +797,14 @@ struct mlx5_ib_resources {
struct mlx5_ib_port_resources ports[2];
};
+enum mlx5_ib_optional_counter_type {
+ MLX5_IB_OPCOUNTER_CC_RX_CE_PKTS,
+ MLX5_IB_OPCOUNTER_CC_RX_CNP_PKTS,
+ MLX5_IB_OPCOUNTER_CC_TX_CNP_PKTS,
+
+ MLX5_IB_OPCOUNTER_MAX,
+};
+
struct mlx5_ib_counters {
const char **names;
size_t *offsets;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e8763d336df1..40b0f7825975 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -600,10 +600,12 @@ static inline struct rdma_hw_stats *rdma_alloc_hw_stats_struct(
/**
* struct rdma_op_counter
+ * @type - The vendor-specific type of the counter
* @name - The name of the counter
* @value - The value of the counter
*/
struct rdma_op_counter {
+ int type;
const char *name;
u64 value;
};
--
2.26.2
Powered by blists - more mailing lists