It becomes difficult to make out from the output of ibv_devinfo
if a particular gid index is RoCE v2 or not.
Adding a string to the output of ibv_devinfo -v to display the
gid type at the end of gid.
The output would look something like below:
$ ibv_devinfo -v -d bnxt_re2
hca_id: bnxt_re2
transport: InfiniBand (0)
fw_ver: 216.0.220.0
node_guid: b226:28ff:fed3:b0f0
sys_image_guid: b226:28ff:fed3:b0f0
.
.
.
.
phys_state: LINK_UP (5)
GID[ 0]: fe80::b226:28ff:fed3:b0f0, IB/RoCE v1
GID[ 1]: fe80::b226:28ff:fed3:b0f0, RoCE v2
GID[ 2]: ::ffff:192.170.1.101, IB/RoCE v1
GID[ 3]: ::ffff:192.170.1.101, RoCE v2
$
$
Reviewed-by: Jason Gunthrope <jgg@xxxxxxxx>
Reviewed-by: Leon Romanovsky <leon@xxxxxxxxxx>
Reviewed-by: Gal Pressman <galpress@xxxxxxxxxx>
Reviewed-by: Parav Pandit <parav@xxxxxxxxxxxx>
Signed-off-by: Devesh Sharma <devesh.sharma@xxxxxxxxxxxx>
---
libibverbs/driver.h | 1 +
libibverbs/examples/devinfo.c | 35 ++++++++++++++++++++++++-----------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/libibverbs/driver.h b/libibverbs/driver.h
index a0e6f89..fc0699d 100644
--- a/libibverbs/driver.h
+++ b/libibverbs/driver.h
@@ -84,6 +84,7 @@ enum verbs_qp_mask {
enum ibv_gid_type {
IBV_GID_TYPE_IB_ROCE_V1,
IBV_GID_TYPE_ROCE_V2,
+ IBV_GID_TYPE_INVALID
};
enum ibv_mr_type {
diff --git a/libibverbs/examples/devinfo.c b/libibverbs/examples/devinfo.c
index bf53eac..568712c 100644
--- a/libibverbs/examples/devinfo.c
+++ b/libibverbs/examples/devinfo.c
@@ -40,6 +40,7 @@
#include <getopt.h>
#include <endian.h>
#include <inttypes.h>
+#include <arpa/inet.h>
#include <infiniband/verbs.h>
#include <infiniband/driver.h>
@@ -162,8 +163,19 @@ static const char *vl_str(uint8_t vl_num)
}
}
+static const char *gid_type_str(enum ibv_gid_type type)
+{
+ switch (type) {
+ case IBV_GID_TYPE_IB_ROCE_V1: return "IB/RoCE v1";
+ case IBV_GID_TYPE_ROCE_V2: return "RoCE v2";
+ default: return "Invalid gid type";
+ }
+}
+
static int print_all_port_gids(struct ibv_context *ctx, uint8_t port_num, int tbl_len)
{
+ char gid_str[INET6_ADDRSTRLEN] = {};
+ enum ibv_gid_type type;
union ibv_gid gid;
int rc = 0;
int i;
@@ -175,17 +187,18 @@ static int print_all_port_gids(struct ibv_context *ctx, uint8_t port_num, int tb
port_num, i);
return rc;
}
- if (!null_gid(&gid))
- printf("\t\t\tGID[%3d]:\t\t%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\n",
- i,
- gid.raw[ 0], gid.raw[ 1],
- gid.raw[ 2], gid.raw[ 3],
- gid.raw[ 4], gid.raw[ 5],
- gid.raw[ 6], gid.raw[ 7],
- gid.raw[ 8], gid.raw[ 9],
- gid.raw[10], gid.raw[11],
- gid.raw[12], gid.raw[13],
- gid.raw[14], gid.raw[15]);
+
+ rc = ibv_query_gid_type(ctx, port_num, i, &type);
+ if (rc) {
+ rc = 0;
+ type = IBV_GID_TYPE_INVALID;
+ }
+
+ if (!null_gid(&gid)) {
+ inet_ntop(AF_INET6, gid.raw, gid_str, sizeof(gid_str));
+ printf("\t\t\tGID[%3d]:\t\t%s, %s\n", i, gid_str,
+ gid_type_str(type));
+ }
}
return rc;
}
--
1.8.3.1
