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

rdma: Simplify CM_ID print code 

Refactor our the CM_ID print code.

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:21 +02:00 committed by David Ahern
parent 05846c9cd3
commit 7d06b31f0e
1 changed files with 124 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
rdma/res-cmid.c
View File

@ -108,23 +108,9 @@ static int ss_ntop(struct nlattr *nla_line, char *addr_str, uint16_t *port)
return 0; return 0;
} }
int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data) static int res_cm_id_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;
int 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_CM_ID])
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_CM_ID];
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 src_addr_str[INET6_ADDRSTRLEN]; char src_addr_str[INET6_ADDRSTRLEN];
char dst_addr_str[INET6_ADDRSTRLEN]; char dst_addr_str[INET6_ADDRSTRLEN];
@ -138,7 +124,7 @@ int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line); err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
if (err != MNL_CB_OK) if (err != MNL_CB_OK)
return -EINVAL; return MNL_CB_ERROR;
if (!nla_line[RDMA_NLDEV_ATTR_RES_STATE] || if (!nla_line[RDMA_NLDEV_ATTR_RES_STATE] ||
!nla_line[RDMA_NLDEV_ATTR_RES_PS] || !nla_line[RDMA_NLDEV_ATTR_RES_PS] ||
@ -148,73 +134,63 @@ int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
} }
if (nla_line[RDMA_NLDEV_ATTR_PORT_INDEX]) if (nla_line[RDMA_NLDEV_ATTR_PORT_INDEX])
port = mnl_attr_get_u32( port = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_PORT_INDEX]);
nla_line[RDMA_NLDEV_ATTR_PORT_INDEX]);
if (port && port != rd->port_idx) if (port && port != rd->port_idx)
continue; goto out;
if (nla_line[RDMA_NLDEV_ATTR_RES_LQPN]) { if (nla_line[RDMA_NLDEV_ATTR_RES_LQPN]) {
lqpn = mnl_attr_get_u32( lqpn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
if (rd_check_is_filtered(rd, "lqpn", lqpn)) if (rd_check_is_filtered(rd, "lqpn", lqpn))
continue; goto out;
} }
if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE]) { if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE]) {
type = mnl_attr_get_u8( type = mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_TYPE]);
nla_line[RDMA_NLDEV_ATTR_RES_TYPE]);
if (rd_check_is_string_filtered(rd, "qp-type", if (rd_check_is_string_filtered(rd, "qp-type",
qp_types_to_str(type))) qp_types_to_str(type)))
continue; goto out;
} }
ps = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PS]); ps = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PS]);
if (rd_check_is_string_filtered(rd, "ps", cm_id_ps_to_str(ps))) if (rd_check_is_string_filtered(rd, "ps", cm_id_ps_to_str(ps)))
continue; goto out;
state = mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_STATE]); state = mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_STATE]);
if (rd_check_is_string_filtered(rd, "state", if (rd_check_is_string_filtered(rd, "state", cm_id_state_to_str(state)))
cm_id_state_to_str(state))) goto out;
continue;
if (nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR]) { if (nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR]) {
if (ss_ntop(nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR], if (ss_ntop(nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR],
src_addr_str, &src_port)) src_addr_str, &src_port))
continue; goto out;
if (rd_check_is_string_filtered(rd, "src-addr", if (rd_check_is_string_filtered(rd, "src-addr", src_addr_str))
src_addr_str)) goto out;
continue;
if (rd_check_is_filtered(rd, "src-port", src_port)) if (rd_check_is_filtered(rd, "src-port", src_port))
continue; goto out;
} }
if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]) { if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]) {
if (ss_ntop(nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR], if (ss_ntop(nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR],
dst_addr_str, &dst_port)) dst_addr_str, &dst_port))
continue; goto out;
if (rd_check_is_string_filtered(rd, "dst-addr", if (rd_check_is_string_filtered(rd, "dst-addr", dst_addr_str))
dst_addr_str)) goto out;
continue;
if (rd_check_is_filtered(rd, "dst-port", dst_port)) if (rd_check_is_filtered(rd, "dst-port", dst_port))
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_CM_IDN]) if (nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN])
cm_idn = mnl_attr_get_u32( cm_idn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN]);
nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN]);
if (rd_check_is_filtered(rd, "cm-idn", cm_idn)) if (rd_check_is_filtered(rd, "cm-idn", cm_idn))
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 */
@ -242,11 +218,37 @@ int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]) if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR])
print_ipaddr(rd, "dst-addr", dst_addr_str, dst_port); print_ipaddr(rd, "dst-addr", dst_addr_str, dst_port);
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_cm_id_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;
int 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_CM_ID])
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_CM_ID];
mnl_attr_for_each_nested(nla_entry, nla_table) {
ret = res_cm_id_line(rd, name, idx, nla_entry);
if (ret != MNL_CB_OK)
break;
}
return ret;
}