Merge branch 'main' into next

[mirror_iproute2.git] / rdma / res-mr.c

diff --git a/rdma/res-mr.c b/rdma/res-mr.c
index c1b8069abbfeaa72e4a5c52c0516e37133fce388..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)
 {
@@ -57,10 +71,7 @@ static int res_mr_line(struct rd *rd, const char *name, int idx,
                /* discard const from mnl_attr_get_str */
                comm = (char *)mnl_attr_get_str(
                        nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]);
-
-       if (rd->json_output)
-               jsonw_start_array(rd->jw);
-
+       open_json_object(NULL);
        print_dev(rd, idx, name);
        res_print_uint(rd, "mrn", mrn, nla_line[RDMA_NLDEV_ATTR_RES_MRN]);
        print_key(rd, "rkey", rkey, nla_line[RDMA_NLDEV_ATTR_RES_RKEY]);
@@ -72,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:
@@ -94,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)
@@ -122,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;
        }