rdma: Add support to dump SRQ resource in raw format

Add support to dump SRQ resource in raw format.

This patch relies on the corresponding kernel commit aebf8145e11a
("RDMA/core: Add support to dump SRQ resource in RAW format")

Example:
$ rdma res show srq -r
dev hns3 149000...

$ rdma res show srq -j -r
[{"ifindex":0,"ifname":"hns3","data":[149,0,0,...]}]

Signed-off-by: wenglianfa <wenglianfa@huawei.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/rdma/res-srq.c b/rdma/res-srq.c
index 186ae281ddc7bed25ee5af101615499a849fcb6e..cf9209d775e1d158a259878d218f3163f6f73d2e 100644 (file)
--- a/rdma/res-srq.c
+++ b/rdma/res-srq.c
@@ -162,6 +162,20 @@ out:
        return -EINVAL;
 }
 
+static int res_srq_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_srq_line(struct rd *rd, const char *name, int idx,
                        struct nlattr **nla_line)
 {
@@ -248,7 +262,8 @@ int res_srq_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_srq_line(rd, name, idx, tb);
+       return (rd->show_raw) ? res_srq_line_raw(rd, name, idx, tb) :
+               res_srq_line(rd, name, idx, tb);
 }
 
 int res_srq_parse_cb(const struct nlmsghdr *nlh, void *data)
@@ -276,7 +291,8 @@ int res_srq_parse_cb(const struct nlmsghdr *nlh, void *data)
                if (ret != MNL_CB_OK)
                        break;
 
-               ret = res_srq_line(rd, name, idx, nla_line);
+               ret = (rd->show_raw) ? res_srq_line_raw(rd, name, idx, nla_line) :
+                      res_srq_line(rd, name, idx, nla_line);
                if (ret != MNL_CB_OK)
                        break;
        }

diff --git a/rdma/res.h b/rdma/res.h
index 70e51acd01539192b6d21d167845c2432e8b3b46..e880c28be569fae8ce875e6f5f1e15b54eeef182 100644 (file)
--- a/rdma/res.h
+++ b/rdma/res.h
@@ -39,6 +39,8 @@ static inline uint32_t res_get_command(uint32_t command, struct rd *rd)
                return RDMA_NLDEV_CMD_RES_CQ_GET_RAW;
        case RDMA_NLDEV_CMD_RES_MR_GET:
                return RDMA_NLDEV_CMD_RES_MR_GET_RAW;
+       case RDMA_NLDEV_CMD_RES_SRQ_GET:
+               return RDMA_NLDEV_CMD_RES_SRQ_GET_RAW;
        default:
                return command;
        }