proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 14:41:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rdma: Properly print device and link names in CLI output

Browse Source 
The citied commit broke the CLI output and printed ifindex/ifname
instead of dev/link.

Before:
[leonro@vm ~]$ rdma res show qp
link mlx5_0/lqpn 1 type GSI state RTS sq-psn 0 comm ib_core
[leonro@vm ~]$ rdma res show cq
ifindex 0 ifname rocep0s9 cqn 0 cqe 1023 users 2 poll-ctx WORKQUEUE adaptive-moderation on comm ib_core

After:
[leonro@vm ~]$ rdma res show qp
link mlx5_0/- lqpn 1 type GSI state RTS sq-psn 0 comm [ib_core]
[leonro@vm ~]$ rdma res show cq
dev rocep0s9 cqn 0 cqe 1023 users 2 poll-ctx WORKQUEUE adaptive-moderation on comm [ib_core]

It was missed because rdmatool mostly used in JSON mode.

Fixes: b0a688a542 ("rdma: Rewrite custom JSON and prints logic to use common API")
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Leon Romanovsky 2020-08-11 10:32:01 +03:00 committed by Stephen Hemminger
parent 7ded3c97b9
commit db6d6becb0
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rdma/res.c
View File

@ -166,17 +166,27 @@ void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line)
void print_dev(struct rd *rd, uint32_t idx, const char *name)
{
print_color_int(PRINT_ANY, COLOR_NONE, "ifindex", "ifindex %d ", idx);
print_color_string(PRINT_ANY, COLOR_NONE, "ifname", "ifname %s ", name);
print_color_int(PRINT_ANY, COLOR_NONE, "ifindex", NULL, idx);
print_color_string(PRINT_ANY, COLOR_NONE, "ifname", "dev %s ", name);
}
void print_link(struct rd *rd, uint32_t idx, const char *name, uint32_t port,
struct nlattr **nla_line)
{
char tmp[64] = {};
print_color_uint(PRINT_JSON, COLOR_NONE, "ifindex", NULL, idx);
print_color_string(PRINT_ANY, COLOR_NONE, "ifname", "link %s/", name);
if (nla_line[RDMA_NLDEV_ATTR_PORT_INDEX])
print_color_uint(PRINT_ANY, COLOR_NONE, "port", "%u ", port);
print_color_string(PRINT_ANY, COLOR_NONE, "ifname", NULL, name);
if (nla_line[RDMA_NLDEV_ATTR_PORT_INDEX]) {
print_color_uint(PRINT_ANY, COLOR_NONE, "port", NULL, port);
snprintf(tmp, sizeof(tmp), "%s/%d", name, port);
} else {
snprintf(tmp, sizeof(tmp), "%s/-", name);
}
if (!rd->json_output)
print_color_string(PRINT_ANY, COLOR_NONE, NULL, "link %s ",
tmp);
}
void print_qp_type(struct rd *rd, uint32_t val)