Found one reason libibnetdisc is slower than subnet_discover

Commit Message

Ira Weiny Jan. 22, 2010, 2:14 a.m. UTC

None

Patch

diff --git a/infiniband-diags/libibnetdisc/src/ibnetdisc.c b/infiniband-diags/libibnetdisc/src/ibnetdisc.c
index d0c97a1..fa0dbe4 100644
--- a/infiniband-diags/libibnetdisc/src/ibnetdisc.c
+++ b/infiniband-diags/libibnetdisc/src/ibnetdisc.c
@@ -101,19 +101,30 @@  static int query_node_info(struct ibmad_port *ibmad_port,
 	return 0;
 }
 
+static ibnd_node_t *find_existing_node(ibnd_fabric_t * fabric,
+				       uint64_t guid)
+{
+	int hash = HASHGUID(guid) % HTSZ;
+	ibnd_node_t *node;
+
+	for (node = fabric->nodestbl[hash]; node; node = node->htnext)
+		if (node->guid == guid)
+			return node;
+
+	return NULL;
+}
+
 static int query_node(struct ibmad_port *ibmad_port, ibnd_fabric_t * fabric,
 		      ibnd_node_t * node, ibnd_port_t * port,
 		      ib_portid_t * portid)
 {
 	int rc = 0;
 	void *nd = node->nodedesc;
+	ibnd_node_t *existing;
 
 	if ((rc = query_node_info(ibmad_port, fabric, node, portid)) != 0)
 		return rc;
 
-	if (!smp_query_via(nd, portid, IB_ATTR_NODE_DESC, 0, 0, ibmad_port))
-		return -1;
-
 	if ((rc = query_port_info(ibmad_port, portid, 0, port)) != 0)
 		return rc;
 
@@ -121,7 +132,7 @@  static int query_node(struct ibmad_port *ibmad_port, ibnd_fabric_t * fabric,
 	port->guid = mad_get_field64(node->info, 0, IB_NODE_PORT_GUID_F);
 
 	if (node->type != IB_NODE_SWITCH)
-		return 0;
+		goto query_nd;
 
 	node->smalid = port->base_lid;
 	node->smalmc = port->lmc;
@@ -135,6 +146,12 @@  static int query_node(struct ibmad_port *ibmad_port, ibnd_fabric_t * fabric,
 	port->base_lid = (uint16_t) node->smalid;	/* LID is still defined by port 0 */
 	port->lmc = (uint8_t) node->smalmc;
 
+	if ((existing = find_existing_node(fabric, node->guid)) != NULL) {
+		/* probably don't even need this memcpy */
+		memcpy(node, existing, sizeof *node);
+		return (0);
+	}
+
 	if (!smp_query_via(node->switchinfo, portid, IB_ATTR_SWITCH_INFO, 0, 0,
 			   ibmad_port))
 		node->smaenhsp0 = 0;	/* assume base SP0 */
@@ -144,6 +161,11 @@  static int query_node(struct ibmad_port *ibmad_port, ibnd_fabric_t * fabric,
 
 	IBND_DEBUG("portid %s: got switch node %" PRIx64 " '%s'\n",
 		   portid2str(portid), node->guid, node->nodedesc);
+
+query_nd:
+	if (!smp_query_via(nd, portid, IB_ATTR_NODE_DESC, 0, 0, ibmad_port))
+		return -1;
+
 	return 0;
 }
 
@@ -208,19 +230,6 @@  static void dump_endnode(ib_portid_t * path, char *prompt,
 	       port->base_lid + (1 << port->lmc) - 1, node->nodedesc);
 }
 
-static ibnd_node_t *find_existing_node(ibnd_fabric_t * fabric,
-				       ibnd_node_t * new)
-{
-	int hash = HASHGUID(new->guid) % HTSZ;
-	ibnd_node_t *node;
-
-	for (node = fabric->nodestbl[hash]; node; node = node->htnext)
-		if (node->guid == new->guid)
-			return node;
-
-	return NULL;
-}
-
 ibnd_node_t *ibnd_find_node_guid(ibnd_fabric_t * fabric, uint64_t guid)
 {
 	int hash = HASHGUID(guid) % HTSZ;
@@ -459,7 +468,7 @@  static int get_remote_node(struct ibmad_port *ibmad_port,
 		return 1;	/* positive == non-fatal error */
 	}
 
-	oldnode = find_existing_node(fabric, &node_buf);
+	oldnode = find_existing_node(fabric, node_buf.guid);
 	if (oldnode)
 		remotenode = oldnode;
 	else if (!(remotenode = create_node(fabric, scan, &node_buf, path,