Merge 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / rdma / res.c

diff --git a/rdma/res.c b/rdma/res.c
index 9c1f73635f2a56621f8452693a76f5faaa5b353e..6b0f5fe35f74063af758241a8069829292bc5cca 100644 (file)
--- a/rdma/res.c
+++ b/rdma/res.c
@@ -16,13 +16,17 @@ static int res_help(struct rd *rd)
 {
        pr_out("Usage: %s resource\n", rd->filename);
        pr_out("          resource show [DEV]\n");
-       pr_out("          resource show [qp|cm_id]\n");
+       pr_out("          resource show [qp|cm_id|pd|mr|cq]\n");
        pr_out("          resource show qp link [DEV/PORT]\n");
        pr_out("          resource show qp link [DEV/PORT] [FILTER-NAME FILTER-VALUE]\n");
        pr_out("          resource show cm_id link [DEV/PORT]\n");
        pr_out("          resource show cm_id link [DEV/PORT] [FILTER-NAME FILTER-VALUE]\n");
        pr_out("          resource show cq link [DEV/PORT]\n");
        pr_out("          resource show cq link [DEV/PORT] [FILTER-NAME FILTER-VALUE]\n");
+       pr_out("          resource show pd dev [DEV]\n");
+       pr_out("          resource show pd dev [DEV] [FILTER-NAME FILTER-VALUE]\n");
+       pr_out("          resource show mr dev [DEV]\n");
+       pr_out("          resource show mr dev [DEV] [FILTER-NAME FILTER-VALUE]\n");
        return 0;
 }
 
@@ -439,10 +443,8 @@ static int res_qp_parse_cb(const struct nlmsghdr *nlh, void *data)
                if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
                        free(comm);
 
-               if (rd->json_output)
-                       jsonw_end_array(rd->jw);
-               else
-                       pr_out("\n");
+               print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
+               newline(rd);
        }
        return MNL_CB_OK;
 }
@@ -623,6 +625,8 @@ static int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
                        if (rd_check_is_string_filtered(rd, "src-addr",
                                                        src_addr_str))
                                continue;
+                       if (rd_check_is_filtered(rd, "src-port", src_port))
+                               continue;
                }
 
                if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]) {
@@ -632,14 +636,10 @@ static int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
                        if (rd_check_is_string_filtered(rd, "dst-addr",
                                                        dst_addr_str))
                                continue;
+                       if (rd_check_is_filtered(rd, "dst-port", dst_port))
+                               continue;
                }
 
-               if (rd_check_is_filtered(rd, "src-port", src_port))
-                       continue;
-
-               if (rd_check_is_filtered(rd, "dst-port", dst_port))
-                       continue;
-
                if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) {
                        pid = mnl_attr_get_u32(
                                        nla_line[RDMA_NLDEV_ATTR_RES_PID]);
@@ -678,10 +678,8 @@ static int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
                if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
                        free(comm);
 
-               if (rd->json_output)
-                       jsonw_end_array(rd->jw);
-               else
-                       pr_out("\n");
+               print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
+               newline(rd);
        }
        return MNL_CB_OK;
 }
@@ -705,7 +703,7 @@ static void print_users(struct rd *rd, uint64_t val)
 static const char *poll_ctx_to_str(uint8_t idx)
 {
        static const char * const cm_id_states_str[] = {
-               "DIRECT", "SOFTIRQ", "WORKQUEUE"};
+               "DIRECT", "SOFTIRQ", "WORKQUEUE", "UNBOUND_WORKQUEUE"};
 
        if (idx < ARRAY_SIZE(cm_id_states_str))
                return cm_id_states_str[idx];
@@ -804,10 +802,8 @@ static int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data)
                if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
                        free(comm);
 
-               if (rd->json_output)
-                       jsonw_end_array(rd->jw);
-               else
-                       pr_out("\n");
+               print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
+               newline(rd);
        }
        return MNL_CB_OK;
 }
@@ -919,10 +915,91 @@ static int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data)
                if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
                        free(comm);
 
+               print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
+               newline(rd);
+       }
+       return MNL_CB_OK;
+}
+
+static int res_pd_parse_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
+       struct nlattr *nla_table, *nla_entry;
+       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] ||
+           !tb[RDMA_NLDEV_ATTR_RES_PD])
+               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]);
+       nla_table = tb[RDMA_NLDEV_ATTR_RES_PD];
+
+       mnl_attr_for_each_nested(nla_entry, nla_table) {
+               uint32_t local_dma_lkey = 0, unsafe_global_rkey = 0;
+               struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
+               char *comm = NULL;
+               uint32_t pid = 0;
+               uint64_t users;
+               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_USECNT] ||
+                   (!nla_line[RDMA_NLDEV_ATTR_RES_PID] &&
+                    !nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])) {
+                       return MNL_CB_ERROR;
+               }
+
+               if (nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY])
+                       local_dma_lkey = mnl_attr_get_u32(
+                               nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY]);
+
+               users = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
+               if (rd_check_is_filtered(rd, "users", users))
+                       continue;
+
+               if (nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY])
+                       unsafe_global_rkey = mnl_attr_get_u32(
+                             nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY]);
+
+               if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) {
+                       pid = mnl_attr_get_u32(
+                               nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+                       comm = get_task_name(pid);
+               }
+
+               if (rd_check_is_filtered(rd, "pid", pid))
+                       continue;
+
+               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_end_array(rd->jw);
-               else
-                       pr_out("\n");
+                       jsonw_start_array(rd->jw);
+
+               print_dev(rd, idx, name);
+               if (nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY])
+                       print_key(rd, "local_dma_lkey", local_dma_lkey);
+               print_users(rd, users);
+               if (nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY])
+                       print_key(rd, "unsafe_global_rkey", unsafe_global_rkey);
+               print_pid(rd, pid);
+               print_comm(rd, comm, nla_line);
+
+               if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
+                       free(comm);
+
+               print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
+               newline(rd);
        }
        return MNL_CB_OK;
 }
@@ -990,6 +1067,15 @@ struct filters mr_valid_filters[MAX_NUMBER_OF_FILTERS] = {
 
 RES_FUNC(res_mr, RDMA_NLDEV_CMD_RES_MR_GET, mr_valid_filters, true);
 
+static const
+struct filters pd_valid_filters[MAX_NUMBER_OF_FILTERS] = {
+       { .name = "dev", .is_number = false },
+       { .name = "users", .is_number = true },
+       { .name = "pid", .is_number = true }
+};
+
+RES_FUNC(res_pd, RDMA_NLDEV_CMD_RES_PD_GET, pd_valid_filters, true);
+
 static int res_show(struct rd *rd)
 {
        const struct rd_cmd cmds[] = {
@@ -998,6 +1084,7 @@ static int res_show(struct rd *rd)
                { "cm_id",      res_cm_id       },
                { "cq",         res_cq          },
                { "mr",         res_mr          },
+               { "pd",         res_pd          },
                { 0 }
        };