rdma: Add support to get MR in raw format

Add the required support to print MR data in raw format.
Example:

$rdma res show mr dev mlx5_1 mrn 2 -r -j
[{"ifindex":7,"ifname":"mlx5_1",
"data":[0,4,255,254,0,0,0,0,0,0,0,0,16,28,0,216,...]}]

Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/rdma/res-mr.c b/rdma/res-mr.c
index c13660351db03422340101946827a92691dd87d8..1bf73f3a8112a7d1b1bd47ca0a292fc3c0de0136 100644 (file)
--- a/rdma/res-mr.c
+++ b/rdma/res-mr.c
@@ -7,6 +7,20 @@
 #include "res.h"
 #include <inttypes.h>
 
+static int res_mr_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_mr_line(struct rd *rd, const char *name, int idx,
                       struct nlattr **nla_line)
 {
@@ -69,6 +83,7 @@ static int res_mr_line(struct rd *rd, const char *name, int idx,
        print_comm(rd, comm, nla_line);
 
        print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
+       print_raw_data(rd, nla_line);
        newline(rd);
 
 out:
@@ -91,7 +106,8 @@ int res_mr_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_mr_line(rd, name, idx, tb);
+       return (rd->show_raw) ? res_mr_line_raw(rd, name, idx, tb) :
+               res_mr_line(rd, name, idx, tb);
 }
 
 int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data)
@@ -119,7 +135,8 @@ int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data)
                if (ret != MNL_CB_OK)
                        break;
 
-               ret = res_mr_line(rd, name, idx, nla_line);
+               ret = (rd->show_raw) ? res_mr_line_raw(rd, name, idx, nla_line) :
+                       res_mr_line(rd, name, idx, nla_line);
                if (ret != MNL_CB_OK)
                        break;
        }

diff --git a/rdma/res.h b/rdma/res.h
index bb0f19e0ae0899872e2cd036d873dc2dc5d98ab3..70ce575885b606b5f1db38e49aae6bbcdad1bfb0 100644 (file)
--- a/rdma/res.h
+++ b/rdma/res.h
@@ -33,6 +33,8 @@ static inline uint32_t res_get_command(uint32_t command, struct rd *rd)
                return RDMA_NLDEV_CMD_RES_QP_GET_RAW;
        case RDMA_NLDEV_CMD_RES_CQ_GET:
                return RDMA_NLDEV_CMD_RES_CQ_GET_RAW;
+       case RDMA_NLDEV_CMD_RES_MR_GET:
+               return RDMA_NLDEV_CMD_RES_MR_GET_RAW;
        default:
                return command;
        }