Skip to contentSkip to conversation

Fix rdmatool JSON conversion

PATCH In review Leon Romanovsky 3 participants 6 messages Aug 11, 2020 – Aug 17, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Fix rdmatool JSON conversion

From: Leon Romanovsky <[email protected]>

Changelog:
v1:
* Added extra patch
* Don't print [] in owner name in JSON output
v0:
https://lore.kernel.org/linux-rdma/[email protected]
---------------------------------------------------------------------------

Two fixes to RDMAtool JSON/CLI prints.

Leon Romanovsky (2):
rdma: Fix owner name for the kernel resources
rdma: Properly print device and link names in CLI output

 rdma/res.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

--
2.26.2

#1 lore raw

PATCH 1/2 rdma: Fix owner name for the kernel resources

From: Leon Romanovsky <[email protected]>

Owner of kernel resources is printed in different format than user resources to easy with the reader by simply looking on the name. The kernel owner will have "[ ]" around the name.

Before this change:
[leonro@vm ~]$ rdma res show qp
link rocep0s9/1 lqpn 1 type GSI state RTS sq-psn 58 comm ib_core

After this change:
[leonro@vm ~]$ rdma res show qp
link rocep0s9/1 lqpn 1 type GSI state RTS sq-psn 58 comm [ib_core]

Fixes b0a688a542cd ("rdma: Rewrite custom JSON and prints logic to use common API")
---
 rdma/res.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
rdma/res.c +2 -2
index c99a1fcb..b7a703f8 100644
@@ -157,11 +157,11 @@ void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line)
 	if (!str)
 		return;
 
-	if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
+	if (nla_line[RDMA_NLDEV_ATTR_RES_PID] || rd->json_output)
 		snprintf(tmp, sizeof(tmp), "%s", str);
 	else
 		snprintf(tmp, sizeof(tmp), "[%s]", str);
-	print_color_string(PRINT_ANY, COLOR_NONE, "comm", "comm %s ", str);
+	print_color_string(PRINT_ANY, COLOR_NONE, "comm", "comm %s ", tmp);
 }
 
 void print_dev(struct rd *rd, uint32_t idx, const char *name)

--
2.26.2

#2 lore raw

PATCH 2/2 rdma: Properly print device and link names in CLI output

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

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 b0a688a542cd ("rdma: Rewrite custom JSON and prints logic to use common API")
---
 rdma/res.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
rdma/res.c +15 -5
index b7a703f8..dc12bbe4 100644
@@ -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)

--
2.26.2

maintainer
#5 lore raw
In reply to Leon Romanovsky
Quoted 10 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Changelog:
v1:
* Added extra patch
* Don't print [] in owner name in JSON output
v0:
https://lore.kernel.org/linux-rdma/[email protected]
---------------------------------------------------------------------------

Quoted 8 lines

Two fixes to RDMAtool JSON/CLI prints.

Leon Romanovsky (2):
rdma: Fix owner name for the kernel resources
rdma: Properly print device and link names in CLI output

 rdma/res.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

Stephen, David

Is anything expected from me before merging the fixes?

Thanks

Quoted 4 lines

--
2.26.2

#3 lore raw

Re: [PATCH iproute2-rc v1 2/2] rdma: Properly print device and link names in CLI output

In reply to Leon Romanovsky

rdma/res.c void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line) · line 170

Quoted 1 line · On Tue, 11 Aug 2020 10:32:01 +0300 Leon Romanovsky <[email protected]> wrote:
rdma/res.c +1 -0
+	print_color_string(PRINT_ANY, COLOR_NONE, "ifname", "dev %s ", name);

Since this is an interface name, you might want to consider using COLOR_IFNAME?

I will go ahead and apply it as is but more work is needed here.

#4 lore raw

Re: [PATCH iproute2-rc v1 2/2] rdma: Properly print device and link names in CLI output

Quoted 8 lines · Stephen Hemminger

rdma/res.c void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line) · line 170

Quoted 1 line · On Tue, 11 Aug 2020 10:32:01 +0300 Leon Romanovsky <[email protected]> wrote:
rdma/res.c +1 -0
+	print_color_string(PRINT_ANY, COLOR_NONE, "ifname", "dev %s ", name);

Since this is an interface name, you might want to consider using COLOR_IFNAME?

I will go ahead and apply it as is but more work is needed here.

Thanks for taking care.