Skip to contentSkip to conversation

opensm/osm_dump.c: dump SL2VL tables

PATCH In review Yevgeny Kliteynik 2 participants 4 messages Mar 25, 2010 – Apr 16, 2010 2 messages not in the archive InfiniBand

lore
Share & tools
lore

Yevgeny Kliteynik

author
#0 lore raw

PATCH 1/1 opensm/osm_dump.c: dump SL2VL tables

Hi Sasha,

Dumping SL2VL tables in ROUTING verbosity level when QoS is on. This is needed for SL2VL tables analysis in general, and for routing engines that are using IB VLs in particular, such as torus-2QoS.

Signed-off-by Yevgeny Kliteynik <[email protected]>
---
 opensm/opensm/osm_dump.c |   61 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 1 deletions(-)
opensm/opensm/osm_dump.c +60 -1
index 86e9c00..2c21591 100644
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
  * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved.
- * Copyright (c) 2002-2006 Mellanox Technologies LTD. All rights reserved.
+ * Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved.
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
  *
  * This software is available to you under a choice of one of two

@@ -456,6 +456,60 @@ static void dump_topology_node(cl_map_item_t * item, FILE * file, void *cxt)
 	}
 }
 
+static void dump_sl2vl_tbl(cl_map_item_t * item, FILE * file, void *cxt)
+{
+	osm_port_t *p_port = (osm_port_t *) item;
+	osm_node_t *p_node = p_port->p_node;
+	uint32_t in_port, out_port,
+		 num_ports = p_node->node_info.num_ports;
+	ib_net16_t base_lid = osm_port_get_base_lid(p_port);
+	osm_physp_t *p_physp;
+	ib_slvl_table_t *p_tbl;
+	int i, n;
+	char buf[1024];
+	char * header_line =	"#in out : 0  1  2  3  4  5  6  7  8  9  10 11 12 13 14 15";
+	char * separator_line = "#--------------------------------------------------------";
+
+	if (!num_ports)
+		return;
+
+	fprintf(file, "%s 0x%016" PRIx64 ", base LID %d, "
+		"\"%s\"\n%s\n%s\n",
+		ib_get_node_type_str(p_node->node_info.node_type),
+		cl_ntoh64(p_port->guid), cl_ntoh16(base_lid),
+		p_node->print_desc, header_line, separator_line);
+
+	if (p_node->node_info.node_type == IB_NODE_TYPE_SWITCH) {
+		for (out_port = 0; out_port <= num_ports; out_port++){
+			p_physp = osm_node_get_physp_ptr(p_node, out_port);
+
+			/* no need to print SL2VL table for port that is down */
+			if (!p_physp->p_remote_physp)
+				continue;
+
+			for (in_port = 0; in_port <= num_ports; in_port++) {
+				p_tbl = osm_physp_get_slvl_tbl(p_physp, in_port);
+				for (i = 0, n = 0; i < 16; i++)
+					n += sprintf(buf + n, " %-2d",
+						ib_slvl_table_get(p_tbl, i));
+				fprintf(file, "%-3d %-3d :%s\n",
+					in_port, out_port, buf);
+			}
+		}
+	} else {
+		p_physp = p_port->p_physp;
+		CL_ASSERT(p_physp->p_remote_physp);
+		p_tbl = osm_physp_get_slvl_tbl(p_physp, 0);
+		for (i = 0, n = 0; i < 16; i++)
+			n += sprintf(buf + n, " %-2d",
+					ib_slvl_table_get(p_tbl, i));
+		fprintf(file, "%-3d %-3d :%s\n",
+			0, p_physp->port_num, buf);
+	}
+
+	fprintf(file, "%s\n\n", separator_line);
+}
+
 static void print_node_report(cl_map_item_t * item, FILE * file, void *cxt)
 {
 	osm_node_t *p_node = (osm_node_t *) item;

@@ -630,6 +684,11 @@ void osm_dump_all(osm_opensm_t * osm)
 		osm_dump_qmap_to_file(osm, "opensm.mcfdbs",
 				      &osm->subn.sw_guid_tbl,
 				      dump_mcast_routes, osm);
+		/* SL2VL tables */
+		if (osm->subn.opt.qos)
+			osm_dump_qmap_to_file(osm, "opensm-sl2vl.dump",
+					      &osm->subn.port_guid_tbl,
+					      dump_sl2vl_tbl, osm);
 	}
 	osm_dump_qmap_to_file(osm, "opensm-subnet.lst",
 			      &osm->subn.node_guid_tbl, dump_topology_node,
Signature · 6 lines
1.5.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

Hi Yevgey,

Quoted 7 lines · Yevgeny Kliteynik

Hi Sasha,

Dumping SL2VL tables in ROUTING verbosity level when QoS is on. This is needed for SL2VL tables analysis in general, and for routing engines that are using IB VLs in particular, such as torus-2QoS.

Very cool. Thanks.

-- Jim

Quoted 4 lines
Signed-off-by Yevgeny Kliteynik <[email protected]>
---
 opensm/opensm/osm_dump.c |   61 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 1 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 1269535468.4618.159.camel-mgfCWIlwujvg4c9jKm7R2O1ftBKYq+Ku@public.gmane.org

author
#4 lore raw

Hi Jim,

Quoted 6 lines · Jim Schutt

Hi Yevgey,

Quoted 2 lines · Yevgeny Kliteynik

Hi Sasha,

Quoted 7 lines
Quoted 5 lines

Dumping SL2VL tables in ROUTING verbosity level when QoS is on. This is needed for SL2VL tables analysis in general, and for routing engines that are using IB VLs in particular, such as torus-2QoS.

Very cool. Thanks.

Sure, no problem.
The next dump file would be path resolution file, which will have SLs (and other parameters) for all the paths.

-- Yevgeny

Quoted 9 lines

-- Jim

Quoted 4 lines
Signed-off-by Yevgeny Kliteynik<[email protected]>
---
  opensm/opensm/osm_dump.c |   61 +++++++++++++++++++++++++++++++++++++++++++++-
  1 files changed, 60 insertions(+), 1 deletions(-)
Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw
In reply to a message not in the archive

Hi Yevgeny,

If this patch is included on top of my torus-2QoS
patchset, you might want the addition below.

This is because my patchset causes SL2VL maps to always be set when a routing engine registers its intent to do so by providing an update_sl2vl() function, without requiring opensm to be invoked with -Q.

So we want to dump SL2VL tables also in that case.

Quoted 11 lines · Yevgeny Kliteynik

Hi Sasha,

Dumping SL2VL tables in ROUTING verbosity level when QoS is on. This is needed for SL2VL tables analysis in general, and for routing engines that are using IB VLs in particular, such as torus-2QoS.

Signed-off-by Yevgeny Kliteynik <[email protected]>
---
 opensm/opensm/osm_dump.c |   61 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 1 deletions(-)

[snip]

opensm/opensm/osm_dump.c void osm_dump_all(osm_opensm_t * osm) · line 688

Quoted 6 lines
opensm/opensm/osm_dump.c +2 -0
@@ -630,6 +684,11 @@ void osm_dump_all(osm_opensm_t * osm)
 		osm_dump_qmap_to_file(osm, "opensm.mcfdbs",
 				      &osm->subn.sw_guid_tbl,
 				      dump_mcast_routes, osm);
+		/* SL2VL tables */
+		if (osm->subn.opt.qos)

- if (osm->subn.opt.qos)
+ if (osm->subn.opt.qos ||
+ (osm->routing_engine_used &&
+ osm->routing_engine_used->update_sl2vl))

opensm/opensm/osm_dump.c void osm_dump_all(osm_opensm_t * osm) · line 694

Quoted 6 lines
opensm/opensm/osm_dump.c +3 -0
+			osm_dump_qmap_to_file(osm, "opensm-sl2vl.dump",
+					      &osm->subn.port_guid_tbl,
+					      dump_sl2vl_tbl, osm);
 	}
 	osm_dump_qmap_to_file(osm, "opensm-subnet.lst",
 			      &osm->subn.node_guid_tbl, dump_topology_node,

Sorry for the delay in noticing this.

-- Jim

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html