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 82e6d150ab91ec33f8d1d92e2c7dc3a6094bf583..1bf73f3a8112a7d1b1bd47ca0a292fc3c0de0136 100644 (file)
--- a/rdma/res-mr.c
+++ b/rdma/res-mr.c
@@ -7,27 +7,32 @@
 #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_entry)
+                      struct nlattr **nla_line)
 {
-       struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
        uint32_t rkey = 0, lkey = 0;
        uint64_t iova = 0, mrlen;
        char *comm = NULL;
        uint32_t pdn = 0;
        uint32_t mrn = 0;
        uint32_t pid = 0;
-       int err;
-
-       err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
-       if (err != MNL_CB_OK)
-               return MNL_CB_ERROR;
 
-       if (!nla_line[RDMA_NLDEV_ATTR_RES_MRLEN] ||
-           (!nla_line[RDMA_NLDEV_ATTR_RES_PID] &&
-            !nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])) {
+       if (!nla_line[RDMA_NLDEV_ATTR_RES_MRLEN])
                return MNL_CB_ERROR;
-       }
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_RKEY])
                rkey = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_RKEY]);
@@ -37,7 +42,8 @@ static int res_mr_line(struct rd *rd, const char *name, int idx,
                iova = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_IOVA]);
 
        mrlen = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_MRLEN]);
-       if (rd_check_is_filtered(rd, "mrlen", mrlen))
+       if (rd_is_filtered_attr(rd, "mrlen", mrlen,
+                               nla_line[RDMA_NLDEV_ATTR_RES_MRLEN]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) {
@@ -45,27 +51,27 @@ static int res_mr_line(struct rd *rd, const char *name, int idx,
                comm = get_task_name(pid);
        }
 
-       if (rd_check_is_filtered(rd, "pid", pid))
+       if (rd_is_filtered_attr(rd, "pid", pid,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PID]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_MRN])
                mrn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_MRN]);
-       if (rd_check_is_filtered(rd, "mrn", mrn))
+       if (rd_is_filtered_attr(rd, "mrn", mrn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_MRN]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
                pdn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
-       if (rd_check_is_filtered(rd, "pdn", pdn))
+       if (rd_is_filtered_attr(rd, "pdn", pdn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PDN]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])
                /* 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]);
@@ -77,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:
@@ -84,6 +91,25 @@ out:
                free(comm);
        return MNL_CB_OK;
 }
+
+int res_mr_idx_parse_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
+       struct rd *rd = data;
+       const char *name;
+       uint32_t idx;
+
+       mnl_attr_parse(nlh, 0, rd_attr_cb, tb);
+       if (!tb[RDMA_NLDEV_ATTR_DEV_INDEX] || !tb[RDMA_NLDEV_ATTR_DEV_NAME])
+               return MNL_CB_ERROR;
+
+       name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]);
+       idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]);
+
+       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)
 {
        struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
@@ -103,8 +129,14 @@ int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data)
        nla_table = tb[RDMA_NLDEV_ATTR_RES_MR];
 
        mnl_attr_for_each_nested(nla_entry, nla_table) {
-               ret = res_mr_line(rd, name, idx, nla_entry);
+               struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
+
+               ret = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
+               if (ret != MNL_CB_OK)
+                       break;
 
+               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;
        }