matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rdma: Refactor CQ prints 

Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Leon Romanovsky 2019-02-23 11:15:22 +02:00 committed by David Ahern
parent 7d06b31f0e
commit 83ea72289e
1 changed files with 90 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
rdma/res-cq.c
View File

@ -27,24 +27,9 @@ static void print_poll_ctx(struct rd *rd, uint8_t poll_ctx)
pr_out("poll-ctx %s ", poll_ctx_to_str(poll_ctx)); pr_out("poll-ctx %s ", poll_ctx_to_str(poll_ctx));
} }
int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data) static int res_cq_line(struct rd *rd, const char *name, int idx,
struct nlattr *nla_entry)
{ {
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_CQ])
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_CQ];
mnl_attr_for_each_nested(nla_entry, nla_table) {
struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {}; struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
char *comm = NULL; char *comm = NULL;
uint32_t pid = 0; uint32_t pid = 0;
@ -70,38 +55,33 @@ int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data)
users = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_USECNT]); users = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
if (rd_check_is_filtered(rd, "users", users)) if (rd_check_is_filtered(rd, "users", users))
continue; goto out;
if (nla_line[RDMA_NLDEV_ATTR_RES_POLL_CTX]) { if (nla_line[RDMA_NLDEV_ATTR_RES_POLL_CTX]) {
poll_ctx = mnl_attr_get_u8( poll_ctx =
nla_line[RDMA_NLDEV_ATTR_RES_POLL_CTX]); mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_POLL_CTX]);
if (rd_check_is_string_filtered( if (rd_check_is_string_filtered(rd, "poll-ctx",
rd, "poll-ctx", poll_ctx_to_str(poll_ctx))) poll_ctx_to_str(poll_ctx)))
continue; goto out;
} }
if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) { if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) {
pid = mnl_attr_get_u32( pid = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PID]);
nla_line[RDMA_NLDEV_ATTR_RES_PID]);
comm = get_task_name(pid); comm = get_task_name(pid);
} }
if (rd_check_is_filtered(rd, "pid", pid)) { if (rd_check_is_filtered(rd, "pid", pid))
free(comm); goto out;
continue;
}
if (nla_line[RDMA_NLDEV_ATTR_RES_CQN]) if (nla_line[RDMA_NLDEV_ATTR_RES_CQN])
cqn = mnl_attr_get_u32( cqn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_CQN]);
nla_line[RDMA_NLDEV_ATTR_RES_CQN]);
if (rd_check_is_filtered(rd, "cqn", cqn)) if (rd_check_is_filtered(rd, "cqn", cqn))
continue; goto out;
if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN]) if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN])
ctxn = mnl_attr_get_u32( ctxn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
if (rd_check_is_filtered(rd, "ctxn", ctxn)) if (rd_check_is_filtered(rd, "ctxn", ctxn))
continue; goto out;
if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]) if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])
/* discard const from mnl_attr_get_str */ /* discard const from mnl_attr_get_str */
@ -124,12 +104,37 @@ int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data)
if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN]) if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN])
res_print_uint(rd, "ctxn", ctxn); res_print_uint(rd, "ctxn", ctxn);
if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
free(comm);
print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
newline(rd); newline(rd);
}
out: if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
free(comm);
return MNL_CB_OK; return MNL_CB_OK;
} }
int res_cq_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_CQ])
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_CQ];
mnl_attr_for_each_nested(nla_entry, nla_table) {
ret = res_cq_line(rd, name, idx, nla_entry);
if (ret != MNL_CB_OK)
break;
}
return ret;
}