From 94323e96119a4fc3e575d295a9e1e6745281e3bb Mon Sep 17 00:00:00 2001 From: Maor Gottlieb Date: Wed, 24 Jun 2020 13:40:11 +0300 Subject: [PATCH] rdma: Add support to get CQ in raw format Add the required support to print CQ data in raw format. Example: $rdma res show cq dev mlx5_2 cqn 1 -r -j [{"ifindex":8,"ifname":"mlx5_2", "data":[0,4,255,254,0,0,0,0,0,0,0,0,16,28,...]}] Signed-off-by: Maor Gottlieb Signed-off-by: Leon Romanovsky Signed-off-by: David Ahern --- rdma/res-cq.c | 20 ++++++++++++++++++-- rdma/res.h | 2 ++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/rdma/res-cq.c b/rdma/res-cq.c index e1efe3ba..313f929a 100644 --- a/rdma/res-cq.c +++ b/rdma/res-cq.c @@ -39,6 +39,20 @@ static void print_cq_dim_setting(struct rd *rd, struct nlattr *attr) print_on_off(rd, "adaptive-moderation", dim_setting); } +static int res_cq_line_raw(struct rd *rd, const char *name, int idx, + struct nlattr **nla_line) +{ + if (!nla_line[RDMA_NLDEV_ATTR_RES_RAW]) + return MNL_CB_ERROR; + + open_json_object(NULL); + print_dev(rd, idx, name); + print_raw_data(rd, nla_line); + newline(rd); + + return MNL_CB_OK; +} + static int res_cq_line(struct rd *rd, const char *name, int idx, struct nlattr **nla_line) { @@ -128,7 +142,8 @@ int res_cq_idx_parse_cb(const struct nlmsghdr *nlh, void *data) name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]); idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]); - return res_cq_line(rd, name, idx, tb); + return (rd->show_raw) ? res_cq_line_raw(rd, name, idx, tb) : + res_cq_line(rd, name, idx, tb); } int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data) @@ -156,7 +171,8 @@ int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data) if (ret != MNL_CB_OK) break; - ret = res_cq_line(rd, name, idx, nla_line); + ret = (rd->show_raw) ? res_cq_line_raw(rd, name, idx, nla_line) : + res_cq_line(rd, name, idx, nla_line); if (ret != MNL_CB_OK) break; diff --git a/rdma/res.h b/rdma/res.h index 24eee2a1..bb0f19e0 100644 --- a/rdma/res.h +++ b/rdma/res.h @@ -31,6 +31,8 @@ static inline uint32_t res_get_command(uint32_t command, struct rd *rd) switch (command) { case RDMA_NLDEV_CMD_RES_QP_GET: return RDMA_NLDEV_CMD_RES_QP_GET_RAW; + case RDMA_NLDEV_CMD_RES_CQ_GET: + return RDMA_NLDEV_CMD_RES_CQ_GET_RAW; default: return command; } -- 2.39.2