ibnetdisc: Adding support XDR speed and collect aggregated values of …

…LinkSpeedExt & LinkSpeedExt2 groups field Added - ibnd_get_agg_linkspeedext_field - ibnd_get_agg_linkspeedext - ibnd_get_agg_linkspeedexten - ibnd_get_agg_linkspeedextsup - ibnd_dump_agg_linkspeedext_bits - ibnd_dump_agg_linkspeedext - ibnd_dump_agg_linkspeedexten - ibnd_dump_agg_linkspeedextsup Changed all entries of usage IB_PORT_LINK_SPEED_EXT_ACTIVE_F to use new mechanism Signed-off-by: Gregory Linschitz <[email protected]>
linux-rdma · Jun 29, 2023 · d01b21b · d01b21b
1 parent 0538e6d
commit d01b21b
Show file tree

Hide file tree

Showing 5 changed files with 161 additions and 14 deletions.
diff --git a/debian/libibnetdisc5.symbols b/debian/libibnetdisc5.symbols
@@ -19,3 +19,11 @@ libibnetdisc.so.5 libibnetdisc5 #MINVER#
  ibnd_iter_nodes_type@IBNETDISC_1.0 1.6.1
  ibnd_iter_ports@IBNETDISC_1.0 1.6.1
  ibnd_load_fabric@IBNETDISC_1.0 1.6.1
+ ibnd_get_agg_linkspeedext_field@IBNETDISC_5.1 1.6.1
+ ibnd_get_agg_linkspeedext@IBNETDISC_5.1 1.6.1
+ ibnd_get_agg_linkspeedexten@IBNETDISC_5.1 1.6.1
+ ibnd_get_agg_linkspeedextsup@IBNETDISC_5.1 1.6.1
+ ibnd_dump_agg_linkspeedext_bits@IBNETDISC_5.1 1.6.1
+ ibnd_dump_agg_linkspeedext@IBNETDISC_5.1 1.6.1
+ ibnd_dump_agg_linkspeedexten@IBNETDISC_5.1 1.6.1
+ ibnd_dump_agg_linkspeedextsup@IBNETDISC_5.1 1.6.1
diff --git a/libibnetdisc/CMakeLists.txt b/libibnetdisc/CMakeLists.txt
@@ -5,7 +5,7 @@ publish_headers(infiniband
 
 rdma_library(ibnetdisc libibnetdisc.map
  # See Documentation/versioning.md
- 5 5.0.${PACKAGE_VERSION}
+ 5 5.1.${PACKAGE_VERSION}
  chassis.c
  ibnetdisc.c
  ibnetdisc_cache.c

diff --git a/libibnetdisc/ibnetdisc.c b/libibnetdisc/ibnetdisc.c
@@ -165,7 +165,6 @@ static void debug_port(ib_portid_t * portid, ibnd_port_t * port)
  int iwidth;
  int ispeed, fdr10, espeed;
  uint8_t *info;
- uint32_t cap_mask;
 
  iwidth = mad_get_field(port->info, 0, IB_PORT_LINK_WIDTH_ACTIVE_F);
  ispeed = mad_get_field(port->info, 0, IB_PORT_LINK_SPEED_ACTIVE_F);
@@ -176,11 +175,9 @@ static void debug_port(ib_portid_t * portid, ibnd_port_t * port)
  info = (uint8_t *)&port->node->ports[0]->info;
  else
  info = (uint8_t *)&port->info;
- cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
- if (cap_mask & be32toh(IB_PORT_CAP_HAS_EXT_SPEEDS))
- espeed = mad_get_field(port->info, 0, IB_PORT_LINK_SPEED_EXT_ACTIVE_F);
- else
- espeed = 0;
+
+ espeed = ibnd_get_agg_linkspeedext(info, port->info);
+
  IBND_DEBUG
  ("portid %s portnum %d: base lid %d state %d physstate %d %s %s %s %s\n",
  portid2str(portid), port->portnum, port->base_lid,
@@ -189,7 +186,7 @@ static void debug_port(ib_portid_t * portid, ibnd_port_t * port)
  mad_dump_val(IB_PORT_LINK_WIDTH_ACTIVE_F, width, 64, &iwidth),
  mad_dump_val(IB_PORT_LINK_SPEED_ACTIVE_F, speed, 64, &ispeed),
  (fdr10 & FDR10) ? "FDR10" : "",
- mad_dump_val(IB_PORT_LINK_SPEED_EXT_ACTIVE_F, speed, 64, &espeed));
+ ibnd_dump_agg_linkspeedext(speed, 64, espeed));
 }
 
 static int is_mlnx_ext_port_info_supported(ibnd_port_t * port)
@@ -341,7 +338,6 @@ static int recv_port_info(smp_engine_t * engine, ibnd_smp_t * smp,
  uint8_t port_num, local_port;
  int phystate, ispeed, espeed;
  uint8_t *info;
- uint32_t cap_mask;
 
  port_num = (uint8_t) mad_get_field(mad, 0, IB_MAD_ATTRMOD_F);
  local_port = (uint8_t) mad_get_field(port_info, 0, IB_PORT_LOCAL_PORT_F);
@@ -390,11 +386,8 @@ static int recv_port_info(smp_engine_t * engine, ibnd_smp_t * smp,
  info = (uint8_t *)&port->node->ports[0]->info;
  else
  info = (uint8_t *)&port->info;
- cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
- if (cap_mask & be32toh(IB_PORT_CAP_HAS_EXT_SPEEDS))
- espeed = mad_get_field(port->info, 0, IB_PORT_LINK_SPEED_EXT_ACTIVE_F);
- else
- espeed = 0;
+
+ espeed = ibnd_get_agg_linkspeedext(info, port->info);
 
  if (phystate == IB_PORT_PHYS_STATE_LINKUP &&
  ispeed == IB_LINK_SPEED_ACTIVE_10 &&
@@ -1023,3 +1016,125 @@ void ibnd_iter_ports(ibnd_fabric_t * fabric, ibnd_iter_port_func_t func,
  for (cur = fabric->portstbl[i]; cur; cur = cur->htnext)
  func(cur, user_data);
 }
+
+int ibnd_get_agg_linkspeedext_field(void *cap_info, void *info,
+ enum MAD_FIELDS efield, enum MAD_FIELDS e2field)
+{
+ int espeed = 0, e2speed = 0;
+ int cap_mask = mad_get_field(cap_info, 0, IB_PORT_CAPMASK_F);
+ int cap_mask2 = 0;
+
+ if (cap_mask & be32toh(IB_PORT_CAP_HAS_EXT_SPEEDS)) {
+ espeed = mad_get_field(info, 0, efield);
+
+ if (efield == IB_PORT_LINK_SPEED_EXT_ENABLED_F)
+ if (espeed == 30)
+ espeed = 0;
+
+ if (cap_mask & be32toh(IB_PORT_CAP_HAS_CAP_MASK2))
+ cap_mask2 = mad_get_field(cap_info, 0, IB_PORT_CAPMASK2_F);
+
+ if (cap_mask2 & be16toh(IB_PORT_CAP2_IS_EXT_SPEEDS_2_SUPPORTED)) {
+ e2speed = (mad_get_field(info, 0, e2field) << 5);
+ }
+ }
+
+ if (efield == IB_PORT_LINK_SPEED_EXT_ACTIVE_F)
+ return e2speed ? e2speed : espeed;
+
+ return espeed | e2speed;
+}
+
+int ibnd_get_agg_linkspeedext(void *cap_info, void *info)
+{
+ return ibnd_get_agg_linkspeedext_field(cap_info, info,
+ IB_PORT_LINK_SPEED_EXT_ACTIVE_F,
+ IB_PORT_LINK_SPEED_EXT_ACTIVE_2_F);
+}
+
+int ibnd_get_agg_linkspeedexten(void *cap_info, void *info)
+{
+ return ibnd_get_agg_linkspeedext_field(cap_info, info,
+ IB_PORT_LINK_SPEED_EXT_ENABLED_F,
+ IB_PORT_LINK_SPEED_EXT_ENABLED_2_F);
+}
+
+int ibnd_get_agg_linkspeedextsup(void *cap_info, void *info)
+{
+ return ibnd_get_agg_linkspeedext_field(cap_info, info,
+ IB_PORT_LINK_SPEED_EXT_SUPPORTED_F,
+ IB_PORT_LINK_SPEED_EXT_SUPPORTED_2_F);
+}
+
+char *ibnd_dump_agg_linkspeedext(char *buf, int bufsz, int speed)
+{
+ switch (speed) {
+ case 0:
+ snprintf(buf, bufsz, "No Extended Speed");
+ break;
+ case 1:
+ snprintf(buf, bufsz, "14.0625 Gbps");
+ break;
+ case 2:
+ snprintf(buf, bufsz, "25.78125 Gbps");
+ break;
+ case 4:
+ snprintf(buf, bufsz, "53.125 Gbps");
+ break;
+ case 8:
+ snprintf(buf, bufsz, "106.25 Gbps");
+ break;
+ /* case 16: not used value */
+ case 32:
+ snprintf(buf, bufsz, "212.5 Gbps");
+ break;
+ default:
+ snprintf(buf, bufsz, "undefined (%d)", speed);
+ break;
+ }
+
+ return buf;
+}
+
+char *ibnd_dump_agg_linkspeedext_bits(char *buf, int bufsz, int speed)
+{
+ int n = 0;
+
+ if (speed == 0) {
+ snprintf(buf, bufsz, "%d", speed);
+ return buf;
+ }
+
+ if (speed & 0x1)
+ n += snprintf(buf + n, bufsz - n, "14.0625 Gbps or ");
+
+ if (n < bufsz && (speed & 0x02))
+ n += snprintf(buf + n, bufsz - n, "25.78125 Gbps or ");
+
+ if (n < bufsz && (speed & 0x04))
+ n += snprintf(buf + n, bufsz - n, "53.125 Gbps or ");
+
+ if (n < bufsz && (speed & 0x08))
+ n += snprintf(buf + n, bufsz - n, "106.25 Gbps or ");
+
+ if (n < bufsz && (speed & 0x20))
+ n += snprintf(buf + n, bufsz - n, "212.5 Gbps or ");
+
+ if (speed >> 6) {
+ n += snprintf(buf + n, bufsz - n, "undefined (%d)", speed);
+ return buf;
+ } else if (bufsz > 3)
+ buf[n - 4] = '\0';
+
+ return buf;
+}
+
+char *ibnd_dump_agg_linkspeedexten(char *buf, int bufsz, int speed)
+{
+ return ibnd_dump_agg_linkspeedext_bits(buf, bufsz, speed);
+}
+
+char *ibnd_dump_agg_linkspeedextsup(char *buf, int bufsz, int speed)
+{
+ return ibnd_dump_agg_linkspeedext_bits(buf, bufsz, speed);
+}
diff --git a/libibnetdisc/ibnetdisc.h b/libibnetdisc/ibnetdisc.h
@@ -239,6 +239,17 @@ int ibnd_is_xsigo_guid(uint64_t guid);
 int ibnd_is_xsigo_tca(uint64_t guid);
 int ibnd_is_xsigo_hca(uint64_t guid);
 
+int ibnd_get_agg_linkspeedext_field(void *cap_info, void *info,
+ enum MAD_FIELDS efield, enum MAD_FIELDS e2field);
+int ibnd_get_agg_linkspeedext(void *cap_info, void *info);
+int ibnd_get_agg_linkspeedexten(void *cap_info, void *info);
+int ibnd_get_agg_linkspeedextsup(void *cap_info, void *info);
+
+char *ibnd_dump_agg_linkspeedext_bits(char *buf, int bufsz, int speed);
+char *ibnd_dump_agg_linkspeedext(char *buf, int bufsz, int speed);
+char *ibnd_dump_agg_linkspeedexten(char *buf, int bufsz, int speed);
+char *ibnd_dump_agg_linkspeedextsup(char *buf, int bufsz, int speed);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/libibnetdisc/libibnetdisc.map b/libibnetdisc/libibnetdisc.map
@@ -20,3 +20,16 @@ IBNETDISC_1.0 {
  ibnd_iter_ports;
  local: *;
 };
+
+IBNETDISC_5.1 {
+ global:
+ ibnd_get_agg_linkspeedext_field;
+ ibnd_get_agg_linkspeedext;
+ ibnd_get_agg_linkspeedexten;
+ ibnd_get_agg_linkspeedextsup;
+ ibnd_dump_agg_linkspeedext_bits;
+ ibnd_dump_agg_linkspeedext;
+ ibnd_dump_agg_linkspeedexten;
+ ibnd_dump_agg_linkspeedextsup;
+ local: *;
+};