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

rdma: Place PD parsing print routine into separate function 

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:24 +02:00 committed by David Ahern
parent 46695227d6
commit f9a73796d1
1 changed files with 88 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
rdma/res-pd.c
View File

@ -7,24 +7,9 @@
#include "res.h" #include "res.h"
#include <inttypes.h> #include <inttypes.h>
int res_pd_parse_cb(const struct nlmsghdr *nlh, void *data) static int res_pd_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_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; uint32_t local_dma_lkey = 0, unsafe_global_rkey = 0;
struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {}; struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
char *comm = NULL; char *comm = NULL;
@ -50,33 +35,30 @@ int res_pd_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_UNSAFE_GLOBAL_RKEY]) if (nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY])
unsafe_global_rkey = mnl_attr_get_u32( unsafe_global_rkey = mnl_attr_get_u32(
nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY]); nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY]);
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))
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_PDN]) if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
pdn = mnl_attr_get_u32( pdn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
if (rd_check_is_filtered(rd, "pdn", pdn)) if (rd_check_is_filtered(rd, "pdn", pdn))
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 */
@ -100,11 +82,37 @@ int res_pd_parse_cb(const struct nlmsghdr *nlh, void *data)
if (nla_line[RDMA_NLDEV_ATTR_RES_PDN]) if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
res_print_uint(rd, "pdn", pdn); res_print_uint(rd, "pdn", pdn);
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_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;
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_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) {
ret = res_pd_line(rd, name, idx, nla_entry);
if (ret != MNL_CB_OK)
break;
}
return ret;
}