]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
rdma: Add context resource tracking information
authorNeta Ostrovsky <netao@nvidia.com>
Sun, 25 Apr 2021 11:53:21 +0000 (14:53 +0300)
committerDavid Ahern <dsahern@kernel.org>
Wed, 28 Apr 2021 15:36:59 +0000 (15:36 +0000)
Sample output:

$ rdma res show ctx
dev ibp8s0f0 ctxn 0 pid 980 comm ibv_rc_pingpong
dev ibp8s0f0 ctxn 1 pid 981 comm ibv_rc_pingpong
dev ibp8s0f0 ctxn 2 pid 992 comm ibv_rc_pingpong
dev ibp8s0f1 ctxn 0 pid 984 comm ibv_rc_pingpong
dev ibp8s0f1 ctxn 1 pid 987 comm ibv_rc_pingpong

$ rdma res show ctx dev ibp8s0f1
dev ibp8s0f1 ctxn 0 pid 984 comm ibv_rc_pingpong
dev ibp8s0f1 ctxn 1 pid 987 comm ibv_rc_pingpong

Reviewed-by: Mark Zhang <markz@mellanox.com>
Reviewed-by: Ido Kalir <idok@nvidia.com>
Signed-off-by: Neta Ostrovsky <netao@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
man/man8/rdma-resource.8
rdma/Makefile
rdma/res-ctx.c [new file with mode: 0644]
rdma/res.c
rdma/res.h
rdma/utils.c

index 8d0d14c6d66b02c62191b3ff39baa35469ff36a1..c2102853ed07073271508a70af4e04ad7d901f72 100644 (file)
@@ -13,7 +13,7 @@ rdma-resource \- rdma resource configuration
 
 .ti -8
 .IR RESOURCE " := { "
-.BR cm_id " | " cq " | " mr " | " pd " | " qp " }"
+.BR cm_id " | " cq " | " mr " | " pd " | " qp " | " ctx " }"
 .sp
 
 .ti -8
@@ -103,6 +103,11 @@ rdma resource show cq pid 30489
 Show CQs belonging to pid 30489
 .RE
 .PP
+rdma resource show ctx ctxn 1
+.RS 4
+Show contexts that have index equal to 1.
+.RE
+.PP
 
 .SH SEE ALSO
 .BR rdma (8),
index aa5ce82205f70e61769fda57ae6aa465efc5bcd8..32f504fcdd1055c0e14fd8a7a78fbab50e530431 100644 (file)
@@ -7,7 +7,7 @@ ifeq ($(HAVE_MNL),y)
 CFLAGS += -I./include/uapi/
 
 RDMA_OBJ = rdma.o utils.o dev.o link.o res.o res-pd.o res-mr.o res-cq.o \
-          res-cmid.o res-qp.o sys.o stat.o stat-mr.o
+          res-cmid.o res-qp.o sys.o stat.o stat-mr.o res-ctx.o
 
 TARGETS += rdma
 endif
diff --git a/rdma/res-ctx.c b/rdma/res-ctx.c
new file mode 100644 (file)
index 0000000..30afe97
--- /dev/null
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+/*
+ * res-ctx.c   RDMA tool
+ * Authors:     Neta Ostrovsky <netao@nvidia.com>
+ */
+
+#include "res.h"
+#include <inttypes.h>
+
+static int res_ctx_line(struct rd *rd, const char *name, int idx,
+                       struct nlattr **nla_line)
+{
+       char *comm = NULL;
+       uint32_t ctxn = 0;
+       uint32_t pid = 0;
+
+       if (!nla_line[RDMA_NLDEV_ATTR_RES_CTXN])
+               return MNL_CB_ERROR;
+
+       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_is_filtered_attr(rd, "pid", pid,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PID]))
+               goto out;
+
+       if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN])
+               ctxn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
+
+       if (rd_is_filtered_attr(rd, "ctxn", ctxn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_CTXN]))
+               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]);
+
+       open_json_object(NULL);
+       print_dev(rd, idx, name);
+       res_print_uint(rd, "ctxn", ctxn, nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
+       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       print_comm(rd, comm, nla_line);
+
+       print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
+       newline(rd);
+
+out:
+       if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
+               free(comm);
+       return MNL_CB_OK;
+}
+
+int res_ctx_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 res_ctx_line(rd, name, idx, tb);
+}
+
+int res_ctx_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;
+       int ret = MNL_CB_OK;
+       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_CTX])
+               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_CTX];
+
+       mnl_attr_for_each_nested(nla_entry, nla_table) {
+               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 = res_ctx_line(rd, name, idx, nla_line);
+               if (ret != MNL_CB_OK)
+                       break;
+       }
+       return ret;
+}
index f42ae938f6f9a160a6fea1b806f39ddeb1df285a..dbc3179ee03379d0b847f4e28b2f74a4e5dd5eaa 100644 (file)
@@ -11,7 +11,7 @@ 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|pd|mr|cq]\n");
+       pr_out("          resource show [qp|cm_id|pd|mr|cq|ctx]\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");
@@ -22,6 +22,8 @@ static int res_help(struct rd *rd)
        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");
+       pr_out("          resource show ctx dev [DEV]\n");
+       pr_out("          resource show ctx dev [DEV] [FILTER-NAME FILTER-VALUE]\n");
        return 0;
 }
 
@@ -224,6 +226,7 @@ static int res_show(struct rd *rd)
                { "cq",         res_cq          },
                { "mr",         res_mr          },
                { "pd",         res_pd          },
+               { "ctx",        res_ctx         },
                { 0 }
        };
 
index e8bd02e4b2d93cc32a0bd2043dc63e714d5ff00a..a8093d154423af7087d95378b7e090b79d787247 100644 (file)
@@ -22,6 +22,8 @@ int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data);
 int res_cm_id_idx_parse_cb(const struct nlmsghdr *nlh, void *data);
 int res_qp_parse_cb(const struct nlmsghdr *nlh, void *data);
 int res_qp_idx_parse_cb(const struct nlmsghdr *nlh, void *data);
+int res_ctx_parse_cb(const struct nlmsghdr *nlh, void *data);
+int res_ctx_idx_parse_cb(const struct nlmsghdr *nlh, void *data);
 
 static inline uint32_t res_get_command(uint32_t command, struct rd *rd)
 {
@@ -155,6 +157,16 @@ filters qp_valid_filters[MAX_NUMBER_OF_FILTERS] = {
 RES_FUNC(res_qp, RDMA_NLDEV_CMD_RES_QP_GET, qp_valid_filters, false,
         RDMA_NLDEV_ATTR_RES_LQPN);
 
+static const
+struct filters ctx_valid_filters[MAX_NUMBER_OF_FILTERS] = {
+       { .name = "dev", .is_number = false },
+       { .name = "pid", .is_number = true },
+       { .name = "ctxn", .is_number = true, .is_doit = true },
+};
+
+RES_FUNC(res_ctx, RDMA_NLDEV_CMD_RES_CTX_GET, ctx_valid_filters, true,
+        RDMA_NLDEV_ATTR_RES_CTXN);
+
 void print_dev(struct rd *rd, uint32_t idx, const char *name);
 void print_link(struct rd *rd, uint32_t idx, const char *name, uint32_t port,
                struct nlattr **nla_line);
index 292e1808bd219dc265d0eb293abebfcab01b047f..e2c9bb6f2116148f498497124129b2052776350d 100644 (file)
@@ -435,6 +435,9 @@ static const enum mnl_attr_data_type nldev_policy[RDMA_NLDEV_ATTR_MAX] = {
        [RDMA_NLDEV_ATTR_RES_LKEY] = MNL_TYPE_U32,
        [RDMA_NLDEV_ATTR_RES_IOVA] = MNL_TYPE_U64,
        [RDMA_NLDEV_ATTR_RES_MRLEN] = MNL_TYPE_U64,
+       [RDMA_NLDEV_ATTR_RES_CTX] = MNL_TYPE_NESTED,
+       [RDMA_NLDEV_ATTR_RES_CTX_ENTRY] = MNL_TYPE_NESTED,
+       [RDMA_NLDEV_ATTR_RES_CTXN] = MNL_TYPE_U32,
        [RDMA_NLDEV_ATTR_NDEV_INDEX]            = MNL_TYPE_U32,
        [RDMA_NLDEV_ATTR_NDEV_NAME]             = MNL_TYPE_NUL_STRING,
        [RDMA_NLDEV_ATTR_DRIVER] = MNL_TYPE_NESTED,