github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 06:31:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

RDMA/erdma: Add hardware statistics support

Browse Source 
First, we add a new command to query hardware statistics, and then
implement two functions: ib_device_ops.alloc_hw_port_stats and
ib_device_ops.get_hw_stats to allow rdma tool can get the statistics
of erdma device.

Signed-off-by: Cheng Xu <chengyou@linux.alibaba.com>
Link: https://lore.kernel.org/r/20231227084800.99091-3-chengyou@linux.alibaba.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
This commit is contained in:
Cheng Xu 2023-12-27 16:48:00 +08:00 committed by Leon Romanovsky
parent 68cf9d82f7
commit 63a43a675c
4 changed files with 133 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/infiniband/hw/erdma/erdma_hw.h
View File

@ -146,6 +146,7 @@ enum CMDQ_COMMON_OPCODE {
CMDQ_OPCODE_DESTROY_EQ = 1,
CMDQ_OPCODE_QUERY_FW_INFO = 2,
CMDQ_OPCODE_CONF_MTU = 3,
CMDQ_OPCODE_GET_STATS = 4,
CMDQ_OPCODE_CONF_DEVICE = 5,
CMDQ_OPCODE_ALLOC_DB = 8,
CMDQ_OPCODE_FREE_DB = 9,
@ -359,6 +360,42 @@ struct erdma_cmdq_reflush_req {
#define ERDMA_HW_RESP_SIZE 256
struct erdma_cmdq_query_req {
u64 hdr;
u32 rsvd;
u32 index;
u64 target_addr;
u32 target_length;
};
#define ERDMA_HW_RESP_MAGIC 0x5566
struct erdma_cmdq_query_resp_hdr {
u16 magic;
u8 ver;
u8 length;
u32 index;
u32 rsvd[2];
};
struct erdma_cmdq_query_stats_resp {
struct erdma_cmdq_query_resp_hdr hdr;
u64 tx_req_cnt;
u64 tx_packets_cnt;
u64 tx_bytes_cnt;
u64 tx_drop_packets_cnt;
u64 tx_bps_meter_drop_packets_cnt;
u64 tx_pps_meter_drop_packets_cnt;
u64 rx_packets_cnt;
u64 rx_bytes_cnt;
u64 rx_drop_packets_cnt;
u64 rx_bps_meter_drop_packets_cnt;
u64 rx_pps_meter_drop_packets_cnt;
};
/* cap qword 0 definition */
#define ERDMA_CMD_DEV_CAP_MAX_CQE_MASK GENMASK_ULL(47, 40)
#define ERDMA_CMD_DEV_CAP_FLAGS_MASK GENMASK_ULL(31, 24)

2
drivers/infiniband/hw/erdma/erdma_main.c
View File

@ -468,6 +468,7 @@ static const struct ib_device_ops erdma_device_ops = {
.driver_id = RDMA_DRIVER_ERDMA,
.uverbs_abi_ver = ERDMA_ABI_VERSION,
.alloc_hw_port_stats = erdma_alloc_hw_port_stats,
.alloc_mr = erdma_ib_alloc_mr,
.alloc_pd = erdma_alloc_pd,
.alloc_ucontext = erdma_alloc_ucontext,
@ -479,6 +480,7 @@ static const struct ib_device_ops erdma_device_ops = {
.destroy_cq = erdma_destroy_cq,
.destroy_qp = erdma_destroy_qp,
.get_dma_mr = erdma_get_dma_mr,
.get_hw_stats = erdma_get_hw_stats,
.get_port_immutable = erdma_get_port_immutable,
.iw_accept = erdma_accept,
.iw_add_ref = erdma_qp_get_ref,

90
drivers/infiniband/hw/erdma/erdma_verbs.c
View File

@ -1708,3 +1708,93 @@ void erdma_port_event(struct erdma_dev *dev, enum ib_event_type reason)
ib_dispatch_event(&event);
}
enum counters {
ERDMA_STATS_TX_REQS_CNT,
ERDMA_STATS_TX_PACKETS_CNT,
ERDMA_STATS_TX_BYTES_CNT,
ERDMA_STATS_TX_DISABLE_DROP_CNT,
ERDMA_STATS_TX_BPS_METER_DROP_CNT,
ERDMA_STATS_TX_PPS_METER_DROP_CNT,
ERDMA_STATS_RX_PACKETS_CNT,
ERDMA_STATS_RX_BYTES_CNT,
ERDMA_STATS_RX_DISABLE_DROP_CNT,
ERDMA_STATS_RX_BPS_METER_DROP_CNT,
ERDMA_STATS_RX_PPS_METER_DROP_CNT,
ERDMA_STATS_MAX
};
static const struct rdma_stat_desc erdma_descs[] = {
[ERDMA_STATS_TX_REQS_CNT].name = "tx_reqs_cnt",
[ERDMA_STATS_TX_PACKETS_CNT].name = "tx_packets_cnt",
[ERDMA_STATS_TX_BYTES_CNT].name = "tx_bytes_cnt",
[ERDMA_STATS_TX_DISABLE_DROP_CNT].name = "tx_disable_drop_cnt",
[ERDMA_STATS_TX_BPS_METER_DROP_CNT].name = "tx_bps_limit_drop_cnt",
[ERDMA_STATS_TX_PPS_METER_DROP_CNT].name = "tx_pps_limit_drop_cnt",
[ERDMA_STATS_RX_PACKETS_CNT].name = "rx_packets_cnt",
[ERDMA_STATS_RX_BYTES_CNT].name = "rx_bytes_cnt",
[ERDMA_STATS_RX_DISABLE_DROP_CNT].name = "rx_disable_drop_cnt",
[ERDMA_STATS_RX_BPS_METER_DROP_CNT].name = "rx_bps_limit_drop_cnt",
[ERDMA_STATS_RX_PPS_METER_DROP_CNT].name = "rx_pps_limit_drop_cnt",
};
struct rdma_hw_stats *erdma_alloc_hw_port_stats(struct ib_device *device,
u32 port_num)
{
return rdma_alloc_hw_stats_struct(erdma_descs, ERDMA_STATS_MAX,
RDMA_HW_STATS_DEFAULT_LIFESPAN);
}
static int erdma_query_hw_stats(struct erdma_dev *dev,
struct rdma_hw_stats *stats)
{
struct erdma_cmdq_query_stats_resp *resp;
struct erdma_cmdq_query_req req;
dma_addr_t dma_addr;
int err;
erdma_cmdq_build_reqhdr(&req.hdr, CMDQ_SUBMOD_COMMON,
CMDQ_OPCODE_GET_STATS);
resp = dma_pool_zalloc(dev->resp_pool, GFP_KERNEL, &dma_addr);
if (!resp)
return -ENOMEM;
req.target_addr = dma_addr;
req.target_length = ERDMA_HW_RESP_SIZE;
err = erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);
if (err)
goto out;
if (resp->hdr.magic != ERDMA_HW_RESP_MAGIC) {
err = -EINVAL;
goto out;
}
memcpy(&stats->value[0], &resp->tx_req_cnt,
sizeof(u64) * stats->num_counters);
out:
dma_pool_free(dev->resp_pool, resp, dma_addr);
return err;
}
int erdma_get_hw_stats(struct ib_device *ibdev, struct rdma_hw_stats *stats,
u32 port, int index)
{
struct erdma_dev *dev = to_edev(ibdev);
int ret;
if (port == 0)
return 0;
ret = erdma_query_hw_stats(dev, stats);
if (ret)
return ret;
return stats->num_counters;
}

4
drivers/infiniband/hw/erdma/erdma_verbs.h
View File

@ -361,5 +361,9 @@ int erdma_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,
unsigned int *sg_offset);
void erdma_port_event(struct erdma_dev *dev, enum ib_event_type reason);
void erdma_set_mtu(struct erdma_dev *dev, u32 mtu);
struct rdma_hw_stats *erdma_alloc_hw_port_stats(struct ib_device *device,
u32 port_num);
int erdma_get_hw_stats(struct ib_device *ibdev, struct rdma_hw_stats *stats,
u32 port, int index);
#endif