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

rdma: Unify netlink attribute checks prior to prints 

Place check if netlink attribute available in general place,
instead of doing the same check in many paces.

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:26 +02:00 committed by David Ahern
parent 6da9d2517c
commit 127ff95610
7 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rdma/res-cmid.c
View File

@ -202,16 +202,15 @@ static int res_cm_id_line(struct rd *rd, const char *name, int idx,
jsonw_start_array(rd->jw); jsonw_start_array(rd->jw);
print_link(rd, idx, name, port, nla_line); print_link(rd, idx, name, port, nla_line);
if (nla_line[RDMA_NLDEV_ATTR_RES_LQPN]) res_print_uint(rd, "cm-idn", cm_idn,
res_print_uint(rd, "lqpn", lqpn); nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN]);
res_print_uint(rd, "lqpn", lqpn, nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE]) if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE])
print_qp_type(rd, type); print_qp_type(rd, type);
print_cm_id_state(rd, state); print_cm_id_state(rd, state);
print_ps(rd, ps); print_ps(rd, ps);
res_print_uint(rd, "pid", pid); res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
print_comm(rd, comm, nla_line); print_comm(rd, comm, nla_line);
if (nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN])
res_print_uint(rd, "cm-idn", cm_idn);
if (nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR]) if (nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR])
print_ipaddr(rd, "src-addr", src_addr_str, src_port); print_ipaddr(rd, "src-addr", src_addr_str, src_port);

22
rdma/res-cq.c
View File

@ -17,8 +17,11 @@ static const char *poll_ctx_to_str(uint8_t idx)
return "UNKNOWN"; return "UNKNOWN";
} }
static void print_poll_ctx(struct rd *rd, uint8_t poll_ctx) static void print_poll_ctx(struct rd *rd, uint8_t poll_ctx, struct nlattr *attr)
{ {
if (!attr)
return;
if (rd->json_output) { if (rd->json_output) {
jsonw_string_field(rd->jw, "poll-ctx", jsonw_string_field(rd->jw, "poll-ctx",
poll_ctx_to_str(poll_ctx)); poll_ctx_to_str(poll_ctx));
@ -92,18 +95,15 @@ static int res_cq_line(struct rd *rd, const char *name, int idx,
jsonw_start_array(rd->jw); jsonw_start_array(rd->jw);
print_dev(rd, idx, name); print_dev(rd, idx, name);
res_print_uint(rd, "cqe", cqe); res_print_uint(rd, "cqn", cqn, nla_line[RDMA_NLDEV_ATTR_RES_CQN]);
res_print_uint(rd, "users", users); res_print_uint(rd, "cqe", cqe, nla_line[RDMA_NLDEV_ATTR_RES_CQE]);
if (nla_line[RDMA_NLDEV_ATTR_RES_POLL_CTX]) res_print_uint(rd, "users", users,
print_poll_ctx(rd, poll_ctx); nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
res_print_uint(rd, "pid", pid); print_poll_ctx(rd, poll_ctx, nla_line[RDMA_NLDEV_ATTR_RES_POLL_CTX]);
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_comm(rd, comm, nla_line);
if (nla_line[RDMA_NLDEV_ATTR_RES_CQN])
res_print_uint(rd, "cqn", cqn);
if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN])
res_print_uint(rd, "ctxn", ctxn);
print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
newline(rd); newline(rd);

21
rdma/res-mr.c
View File

@ -67,22 +67,15 @@ static int res_mr_line(struct rd *rd, const char *name, int idx,
jsonw_start_array(rd->jw); jsonw_start_array(rd->jw);
print_dev(rd, idx, name); print_dev(rd, idx, name);
if (nla_line[RDMA_NLDEV_ATTR_RES_RKEY]) res_print_uint(rd, "mrn", mrn, nla_line[RDMA_NLDEV_ATTR_RES_MRN]);
print_key(rd, "rkey", rkey); print_key(rd, "rkey", rkey, nla_line[RDMA_NLDEV_ATTR_RES_RKEY]);
if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY]) print_key(rd, "lkey", lkey, nla_line[RDMA_NLDEV_ATTR_RES_LKEY]);
print_key(rd, "lkey", lkey); print_key(rd, "iova", iova, nla_line[RDMA_NLDEV_ATTR_RES_IOVA]);
if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA]) res_print_uint(rd, "mrlen", mrlen, nla_line[RDMA_NLDEV_ATTR_RES_MRLEN]);
print_key(rd, "iova", iova); res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
res_print_uint(rd, "mrlen", mrlen); res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
res_print_uint(rd, "pid", pid);
print_comm(rd, comm, nla_line); print_comm(rd, comm, nla_line);
if (nla_line[RDMA_NLDEV_ATTR_RES_MRN])
res_print_uint(rd, "mrn", mrn);
if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
res_print_uint(rd, "pdn", pdn);
print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
newline(rd); newline(rd);

20
rdma/res-pd.c
View File

@ -69,18 +69,16 @@ static int res_pd_line(struct rd *rd, const char *name, int idx,
jsonw_start_array(rd->jw); jsonw_start_array(rd->jw);
print_dev(rd, idx, name); print_dev(rd, idx, name);
if (nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY]) res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
print_key(rd, "local_dma_lkey", local_dma_lkey); print_key(rd, "local_dma_lkey", local_dma_lkey,
res_print_uint(rd, "users", users); nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY]);
if (nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY]) res_print_uint(rd, "users", users,
print_key(rd, "unsafe_global_rkey", unsafe_global_rkey); nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
res_print_uint(rd, "pid", pid); print_key(rd, "unsafe_global_rkey", unsafe_global_rkey,
nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY]);
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_comm(rd, comm, nla_line);
if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN])
res_print_uint(rd, "ctxn", ctxn);
if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
res_print_uint(rd, "pdn", pdn);
print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);
newline(rd); newline(rd);

10
rdma/res-qp.c
View File

@ -176,19 +176,19 @@ static int res_qp_line(struct rd *rd, const char *name, int idx,
print_link(rd, idx, name, port, nla_line); print_link(rd, idx, name, port, nla_line);
res_print_uint(rd, "lqpn", lqpn); res_print_uint(rd, "lqpn", lqpn, nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
res_print_uint(rd, "pdn", pdn);
print_rqpn(rd, rqpn, nla_line); print_rqpn(rd, rqpn, nla_line);
print_type(rd, type); print_type(rd, type);
print_state(rd, state); print_state(rd, state);
print_rqpsn(rd, rq_psn, nla_line); print_rqpsn(rd, rq_psn, nla_line);
res_print_uint(rd, "sq-psn", sq_psn); res_print_uint(rd, "sq-psn", sq_psn,
nla_line[RDMA_NLDEV_ATTR_RES_SQ_PSN]);
print_pathmig(rd, path_mig_state, nla_line); print_pathmig(rd, path_mig_state, nla_line);
res_print_uint(rd, "pid", pid); res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
print_comm(rd, comm, nla_line); print_comm(rd, comm, nla_line);
print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);

16
rdma/res.c
View File

@ -47,7 +47,9 @@ static int res_print_summary(struct rd *rd, struct nlattr **tb)
name = mnl_attr_get_str(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_NAME]); name = mnl_attr_get_str(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_NAME]);
curr = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]); curr = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]);
res_print_uint(rd, name, curr); res_print_uint(
rd, name, curr,
nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]);
} }
return 0; return 0;
} }
@ -188,16 +190,24 @@ char *get_task_name(uint32_t pid)
return comm; return comm;
} }
void print_key(struct rd *rd, const char *name, uint64_t val) void print_key(struct rd *rd, const char *name, uint64_t val,
struct nlattr *nlattr)
{ {
if (!nlattr)
return;
if (rd->json_output) if (rd->json_output)
jsonw_xint_field(rd->jw, name, val); jsonw_xint_field(rd->jw, name, val);
else else
pr_out("%s 0x%" PRIx64 " ", name, val); pr_out("%s 0x%" PRIx64 " ", name, val);
} }
void res_print_uint(struct rd *rd, const char *name, uint64_t val) void res_print_uint(struct rd *rd, const char *name, uint64_t val,
struct nlattr *nlattr)
{ {
if (!nlattr)
return;
if (rd->json_output) if (rd->json_output)
jsonw_u64_field(rd->jw, name, val); jsonw_u64_field(rd->jw, name, val);
else else

6
rdma/res.h
View File

@ -112,8 +112,10 @@ char *get_task_name(uint32_t pid);
void print_dev(struct rd *rd, uint32_t idx, const char *name); 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, void print_link(struct rd *rd, uint32_t idx, const char *name, uint32_t port,
struct nlattr **nla_line); struct nlattr **nla_line);
void print_key(struct rd *rd, const char *name, uint64_t val); void print_key(struct rd *rd, const char *name, uint64_t val,
void res_print_uint(struct rd *rd, const char *name, uint64_t val); struct nlattr *nlattr);
void res_print_uint(struct rd *rd, const char *name, uint64_t val,
struct nlattr *nlattr);
void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line); void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line);
const char *qp_types_to_str(uint8_t idx); const char *qp_types_to_str(uint8_t idx);