split out ibnd_fabric_t fields that are only used during a scan
PATCH 1/2 split out ibnd_fabric_t fields that are only used during a scan
Split out public parameters from ibnd_fabric_t that are useless b/c they are only used during the ibnetdiscover scan.
Note that this patch has similarities to a previous patch from Ira, however it is separate and independent of that patch series.
Al
Signature · 5 lines
Albert Chu [email protected] Computer Scientist High Performance Systems Division Lawrence Livermore National Laboratory
From: Albert Chu <[email protected]>
Date: Tue, 27 Oct 2009 16:16:14 -0700
Subject: [PATCH] split out ibnd_fabric_t fields that are only used during a scan
--- .../libibnetdisc/include/infiniband/ibnetdisc.h | 6 -- infiniband-diags/libibnetdisc/src/chassis.c | 68 ++++++++++++-------- infiniband-diags/libibnetdisc/src/chassis.h | 2 +- infiniband-diags/libibnetdisc/src/ibnetdisc.c | 60 +++++++++-------- infiniband-diags/libibnetdisc/src/internal.h | 10 +++ 5 files changed, 83 insertions(+), 63 deletions(-)
infiniband-diags/libibnetdisc/include/infiniband/ibnetdisc.h +0 -6
@@ -124,7 +124,6 @@ typedef struct ibnd_chassis { } ibnd_chassis_t;#define HTSZ 137 -#define MAXHOPS 63/** ========================================================================= * Fabric
@@ -145,14 +144,9 @@ typedef struct ibnd_fabric {/* internal use only */ ibnd_node_t *nodestbl[HTSZ ];ibnd_port_t *portstbl[HTSZ ]; -ibnd_node_t *nodesdist[MAXHOPS +1 ]; -ibnd_chassis_t *first_chassis; -ibnd_chassis_t *current_chassis; -ibnd_chassis_t *last_chassis;ibnd_node_t *switches;ibnd_node_t *ch_adapters;ibnd_node_t *routers; -ib_portid_t selfportid; } ibnd_fabric_t;/** =========================================================================
infiniband-diags/libibnetdisc/src/chassis.c +41 -27
150 lines not on this page · raw message
infiniband-diags/libibnetdisc/src/chassis.h +1 -1
@@ -82,6 +82,6 @@ enum ibnd_chassis_type { };enum ibnd_chassis_slot_type {UNRESOLVED_CS ,LINE_CS ,SPINE_CS ,SRBD_CS }; -int group_nodes (struct ibnd_fabric *fabric); +int group_nodes (struct ibnd_fabric *fabric,ibnd_scan_t *ibnd_scan);#endif /* _CHASSIS_H_ */
infiniband-diags/libibnetdisc/src/ibnetdisc.c +31 -29
171 lines not on this page · raw message
infiniband-diags/libibnetdisc/src/internal.h +10 -0
@@ -50,4 +50,14 @@/* HASH table defines */ #define HASHGUID (guid) ((uint32_t)(((uint32_t)(guid) * 101) ^ ((uint32_t)((guid) >> 32) * 103))) +#define MAXHOPS 63 + +typedef struct ibnd_scan { +ibnd_node_t *nodesdist[MAXHOPS +1 ]; +ibnd_chassis_t *first_chassis; +ibnd_chassis_t *current_chassis; +ibnd_chassis_t *last_chassis; +ib_portid_t selfportid; +}ibnd_scan_t ; +#endif /* _INTERNAL_H_ */
Signature · 1 line
1.5.4.5
A message that is not in the archive (sent off-list or not yet received): 1256773929.4819.190.camel-X2zTWyBD0EhliZ7u+bvwcg@public.gmane.org
Quoted 21 lines · Al Chu
Split out public parameters from
ibnd_fabric_tthat are useless b/c they are only used during the ibnetdiscover scan.Note that this patch has similarities to a previous patch from Ira, however it is separate and independent of that patch series.
Al
Signature · 12 lines
Albert Chu [email protected] Computer Scientist High Performance Systems Division Lawrence Livermore National Laboratory From: Albert Chu <[email protected]> Date: Tue, 27 Oct 2009 16:16:14 -0700 Subject: [PATCH] split out ibnd_fabric_t fields that are only used during a scan Signed-off-by: Albert Chu <[email protected]>
Applies. Thanks.
Sasha
--
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
PATCH 1/1 libibnetdisc: rename ibnd_scan variable to scan
Rename 'ibnd_scan' variable to shorter 'scan' to highlight its local feature.
--- infiniband-diags/libibnetdisc/src/chassis.c | 52 ++++++++++++------------ infiniband-diags/libibnetdisc/src/ibnetdisc.c | 40 +++++++++--------- 2 files changed, 46 insertions(+), 46 deletions(-)
infiniband-diags/libibnetdisc/src/chassis.c +26 -26
@@ -782,19 +782,19 @@ static void voltaire_portmap(ibnd_port_t * port) port->ext_portnum = int2ext_map_slb8[chipnum][portnum]; } -static int add_chassis (ibnd_scan_t *ibnd_scan) +static int add_chassis (ibnd_scan_t *scan) { -if (!(ibnd_scan->current_chassis =calloc (1 ,sizeof (ibnd_chassis_t)))) { +if (!(scan->current_chassis =calloc (1 ,sizeof (ibnd_chassis_t)))) {IBND_ERROR ("OOM: failed to allocate chassis object\n" );return (-1 ); } -if (ibnd_scan->first_chassis ==NULL ) { - ibnd_scan->first_chassis = ibnd_scan->current_chassis; - ibnd_scan->last_chassis = ibnd_scan->current_chassis; +if (scan->first_chassis ==NULL ) { + scan->first_chassis = scan->current_chassis; + scan->last_chassis = scan->current_chassis; }else { - ibnd_scan->last_chassis->next = ibnd_scan->current_chassis; - ibnd_scan->last_chassis = ibnd_scan->current_chassis; + scan->last_chassis->next = scan->current_chassis; + scan->last_chassis = scan->current_chassis; }return (0 ); }
@@ -818,7 +818,7 @@ static void add_node_to_chassis(ibnd_chassis_t * chassis, ibnd_node_t * node)Returns: 0 on success, -1 on failure */ -int group_nodes (ibnd_fabric_t * fabric,ibnd_scan_t *ibnd_scan) +int group_nodes (ibnd_fabric_t * fabric,ibnd_scan_t *scan) {ibnd_node_t *node;int dist;
@@ -826,16 +826,16 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *ibnd_scan)ibnd_chassis_t *chassis;ibnd_chassis_t *ch, *ch_next; - ibnd_scan->first_chassis =NULL ; - ibnd_scan->current_chassis =NULL ; - ibnd_scan->last_chassis =NULL ; + scan->first_chassis =NULL ; + scan->current_chassis =NULL ; + scan->last_chassis =NULL ;/* first pass on switches and build for every Voltaire node */ /* an appropriate chassis record (slotnum and position) */ /* according to internal connectivity */ /* not very efficient but clear code so... */ for (dist =0 ; dist <= fabric->maxhops_discovered; dist++) { -for (node = ibnd_scan->nodesdist[dist]; node; node = node->dnext) { +for (node = scan->nodesdist[dist]; node; node = node->dnext) {if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) ==VTR_VENDOR_ID )if (fill_voltaire_chassis_record (node))
@@ -846,7 +846,7 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *ibnd_scan)/* separate every Voltaire chassis from each other and build linked list of them */ /* algorithm: catch spine and find all surrounding nodes */ for (dist =0 ; dist <= fabric->maxhops_discovered; dist++) { -for (node = ibnd_scan->nodesdist[dist]; node; node = node->dnext) { +for (node = scan->nodesdist[dist]; node; node = node->dnext) {if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) !=VTR_VENDOR_ID )continue ;
@@ -854,10 +854,10 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *ibnd_scan) || (node->chassis && node->chassis->chassisnum) || !is_spine(node))continue ; -if (add_chassis (ibnd_scan)) +if (add_chassis (scan)) goto cleanup; - ibnd_scan->current_chassis->chassisnum = ++chassisnum; -if (build_chassis (node, ibnd_scan->current_chassis)) + scan->current_chassis->chassisnum = ++chassisnum; +if (build_chassis (node, scan->current_chassis)) goto cleanup; } }
@@ -865,7 +865,7 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *ibnd_scan)/* now make pass on nodes for chassis which are not Voltaire */ /* grouped by common SystemImageGUID */ for (dist =0 ; dist <= fabric->maxhops_discovered; dist++) { -for (node = ibnd_scan->nodesdist[dist]; node; node = node->dnext) { +for (node = scan->nodesdist[dist]; node; node = node->dnext) {if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) ==VTR_VENDOR_ID )continue ;
@@ -878,12 +878,12 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *ibnd_scan) chassis->nodecount++; else {/* Possible new chassis */ -if (add_chassis (ibnd_scan)) +if (add_chassis (scan)) goto cleanup; - ibnd_scan->current_chassis->chassisguid = + scan->current_chassis->chassisguid =get_chassisguid ((ibnd_node_t *) node); - ibnd_scan->current_chassis->nodecount =1 ; + scan->current_chassis->nodecount =1 ; } } }
@@ -892,7 +892,7 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *ibnd_scan)/* now, make another pass to see which nodes are part of chassis */ /* (defined as chassis->nodecount > 1) */ for (dist =0 ; dist <=MAXHOPS ;) { -for (node = ibnd_scan->nodesdist[dist]; node; node = node->dnext) { +for (node = scan->nodesdist[dist]; node; node = node->dnext) {if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) ==VTR_VENDOR_ID )continue ;
@@ -920,18 +920,18 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *ibnd_scan) dist++; } - fabric->chassis = ibnd_scan->first_chassis; + fabric->chassis = scan->first_chassis;return (0 ); cleanup: - ch = ibnd_scan->first_chassis; + ch = scan->first_chassis;while (ch) { ch_next = ch->next;free (ch); ch = ch_next; } - ibnd_scan->first_chassis =NULL ; - ibnd_scan->current_chassis =NULL ; - ibnd_scan->last_chassis =NULL ; + scan->first_chassis =NULL ; + scan->current_chassis =NULL ; + scan->last_chassis =NULL ;return (-1 ); }
infiniband-diags/libibnetdisc/src/ibnetdisc.c +20 -20
@@ -180,20 +180,20 @@ static void retract_dpath(ib_portid_t * path) }static int extend_dpath (struct ibmad_port *ibmad_port,ibnd_fabric_t * fabric, -ibnd_scan_t *ibnd_scan,ib_portid_t * portid,int nextport) +ibnd_scan_t *scan,ib_portid_t * portid,int nextport) {int rc =0 ;if (portid->lid) {/* If we were LID routed we need to set up the drslid */ -if (!ibnd_scan->selfportid.lid) -if (ib_resolve_self_via (&ibnd_scan->selfportid,NULL ,NULL , +if (!scan->selfportid.lid) +if (ib_resolve_self_via (&scan->selfportid,NULL ,NULL , ibmad_port) <0 ) {IBND_ERROR ("Failed to resolve self\n" );return -1 ; } - portid->drpath.drslid = (uint16_t ) ibnd_scan->selfportid.lid; + portid->drpath.drslid = (uint16_t ) scan->selfportid.lid; portid->drpath.drdlid =0xFFFF ; }
@@ -387,16 +387,16 @@ static void add_to_type_list(ibnd_node_t * node, ibnd_fabric_t * fabric) } } -static void add_to_nodedist (ibnd_node_t * node,ibnd_scan_t * ibnd_scan,int dist) +static void add_to_nodedist (ibnd_node_t * node,ibnd_scan_t * scan,int dist) {if (node->type !=IB_NODE_SWITCH ) dist =MAXHOPS ;/* special Ca list */ - node->dnext = ibnd_scan->nodesdist[dist]; - ibnd_scan->nodesdist[dist] = node; + node->dnext = scan->nodesdist[dist]; + scan->nodesdist[dist] = node; } -static ibnd_node_t *create_node (ibnd_fabric_t * fabric,ibnd_scan_t * ibnd_scan, +static ibnd_node_t *create_node (ibnd_fabric_t * fabric,ibnd_scan_t * scan,ibnd_node_t * temp,ib_portid_t * path,int dist) {
@@ -418,7 +418,7 @@ static ibnd_node_t *create_node(ibnd_fabric_t * fabric, ibnd_scan_t * ibnd_scan, fabric->nodes = (ibnd_node_t *) node;add_to_type_list (node, fabric); -add_to_nodedist (node, ibnd_scan, dist); +add_to_nodedist (node, scan, dist);return node; }
@@ -478,7 +478,7 @@ static void link_ports(ibnd_node_t * node, ibnd_port_t * port, }static int get_remote_node (struct ibmad_port *ibmad_port, -ibnd_fabric_t * fabric,ibnd_scan_t * ibnd_scan, +ibnd_fabric_t * fabric,ibnd_scan_t * scan,ibnd_node_t * node,ibnd_port_t * port,ib_portid_t * path,int portnum,int dist) {
@@ -498,7 +498,7 @@ static int get_remote_node(struct ibmad_port *ibmad_port, != IB_PORT_PHYS_STATE_LINKUP)return 1 ;/* positive == non-fatal error */ -if (portnum >0 &&extend_dpath (ibmad_port, fabric, ibnd_scan, +if (portnum >0 &&extend_dpath (ibmad_port, fabric, scan, path, portnum) <0 )return -1 ;
@@ -512,8 +512,8 @@ static int get_remote_node(struct ibmad_port *ibmad_port, oldnode =find_existing_node (fabric, &node_buf);if (oldnode) remotenode = oldnode; -else if (!(remotenode =create_node (fabric, ibnd_scan, &node_buf, - path, dist +1 ))) { +else if (!(remotenode =create_node (fabric, scan, &node_buf, path, + dist +1 ))) { rc =-1 ; goto error; }
@@ -552,7 +552,7 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,int dist =0 ;ib_portid_t *path;int max_hops =MAXHOPS -1 ;/* default find everything */ -ibnd_scan_t ibnd_scan; +ibnd_scan_t scan;if (_check_ibmad_port (ibmad_port) <0 )return (NULL );
@@ -575,7 +575,7 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,memset (fabric,0 ,sizeof (*fabric)); -memset (&ibnd_scan,'\0' ,sizeof (ibnd_scan_t)); +memset (&scan,'\0' ,sizeof (ibnd_scan_t));IBND_DEBUG ("from %s\n" ,portid2str (from));
@@ -587,7 +587,7 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port, goto error; } - node =create_node (fabric, &ibnd_scan, &node_buf, from,0 ); + node =create_node (fabric, &scan, &node_buf, from,0 );if (!node) goto error;
@@ -597,7 +597,7 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,if (!port) goto error; - rc =get_remote_node (ibmad_port, fabric, &ibnd_scan, node, port, from, + rc =get_remote_node (ibmad_port, fabric, &scan, node, port, from,mad_get_field (node->info,0 ,IB_NODE_LOCAL_PORT_F ),0 );if (rc <0 )
@@ -607,7 +607,7 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,for (dist =0 ; dist <= max_hops; dist++) { -for (node = ibnd_scan.nodesdist[dist]; node; node = node->dnext) { +for (node = scan.nodesdist[dist]; node; node = node->dnext) { path = &node->path_portid;
@@ -643,14 +643,14 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port, IB_NODE_PORT_GUID_F); } -if (get_remote_node (ibmad_port, fabric, &ibnd_scan, +if (get_remote_node (ibmad_port, fabric, &scan, node, port, path, i, dist) <0 ) goto error; } } } -if (group_nodes (fabric, &ibnd_scan)) +if (group_nodes (fabric, &scan)) goto error;return ((ibnd_fabric_t *) fabric);
Signature · 6 lines
1.6.5.1 -- 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
PATCH 1/1 libibnetdisc: some cleanups
Cleanups: kill not needed braces, castings, consolidate flows.
--- infiniband-diags/libibnetdisc/src/chassis.c | 117 ++++++++++++------------- infiniband-diags/libibnetdisc/src/ibnetdisc.c | 90 +++++++++---------- 2 files changed, 99 insertions(+), 108 deletions(-)
infiniband-diags/libibnetdisc/src/chassis.c +55 -62
@@ -57,16 +57,16 @@ char *ibnd_get_chassis_type(ibnd_node_t * node) {if (!node) {IBND_DEBUG ("node parameter NULL\n" ); -return (NULL ); +return NULL ; }/* Currently, only if Voltaire chassis */ if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) !=VTR_VENDOR_ID ) -return (NULL ); +return NULL ;if (!node->chassis) -return (NULL ); +return NULL ;if (node->ch_type ==UNRESOLVED_CT || node->ch_type >ISR2004_CT ) -return (NULL ); +return NULL ;return ChassisTypeStr[node->ch_type]; }
@@ -74,21 +74,21 @@ char *ibnd_get_chassis_slot_str(ibnd_node_t * node, char *str, size_t size) {if (!node) {IBND_DEBUG ("node parameter NULL\n" ); -return (NULL ); +return NULL ; }/* Currently, only if Voltaire chassis */ if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) !=VTR_VENDOR_ID ) -return (NULL ); +return NULL ;if (!node->chassis) -return (NULL ); +return NULL ;if (node->ch_slot ==UNRESOLVED_CS || node->ch_slot >SRBD_CS ) -return (NULL ); +return NULL ;if (!str) -return (NULL ); +return NULL ;snprintf (str, size,"%s %d Chip %d" , ChassisSlotTypeStr[node->ch_slot], node->ch_slotnum, node->ch_anafanum); -return (str); +return str; } static ibnd_chassis_t *find_chassisnum(ibnd_fabric_t * fabric,
@@ -96,10 +96,9 @@ static ibnd_chassis_t *find_chassisnum(ibnd_fabric_t * fabric, {ibnd_chassis_t *current; -for (current = fabric->chassis; current; current = current->next) { +for (current = fabric->chassis; current; current = current->next)if (current->chassisnum == chassisnum)return current; - }return NULL ; }
@@ -176,7 +175,7 @@ static uint64_t xsigo_chassisguid(ibnd_node_t * node)return sysimgguid; }else {if (!node->ports || !node->ports[1 ]) -return (0 ); +return 0 ;/* Is there a peer port ? */ if (!node->ports[1 ]->remoteport)
@@ -214,10 +213,9 @@ static ibnd_chassis_t *find_chassisguid(ibnd_fabric_t * fabric,uint64_t chguid; chguid =get_chassisguid (node); -for (current = fabric->chassis; current; current = current->next) { +for (current = fabric->chassis; current; current = current->next)if (current->chassisguid == chguid)return current; - }return NULL ; }
@@ -372,9 +370,9 @@ static int get_sfb_slot(ibnd_node_t * node, ibnd_port_t * lineport) }else {IBND_ERROR ("Unexpected node found: guid 0x%016" PRIx64, node->guid); -return (-1 ); +return -1 ; } -return (0 ); +return 0 ; }static int get_router_slot (ibnd_node_t * n,ibnd_port_t * spineport)
@@ -413,9 +411,9 @@ static int get_router_slot(ibnd_node_t * n, ibnd_port_t * spineport) }else {IBND_ERROR ("Unexpected node found: guid 0x%016" PRIx64, spineport->node->guid); -return (-1 ); +return -1 ; } -return (0 ); +return 0 ; }static int get_slb_slot (ibnd_node_t * n,ibnd_port_t * spineport)
@@ -440,9 +438,9 @@ static int get_slb_slot(ibnd_node_t * n, ibnd_port_t * spineport) }else {IBND_ERROR ("Unexpected node found: guid 0x%016" PRIx64, spineport->node->guid); -return (-1 ); +return -1 ; } -return (0 ); +return 0 ; }/* forward declare this */
@@ -459,20 +457,20 @@ static int fill_voltaire_chassis_record(ibnd_node_t * node)ibnd_node_t *remnode =0 ;if (node->ch_found)/* somehow this node has already been passed */ -return (0 ); +return 0 ; node->ch_found =1 ;/* node is router only in case of using unique lid */ /* (which is lid of chassis router port) */ /* in such case node->ports is actually a requested port... */ -if (is_router (node)) { +if (is_router (node))/* find the remote node */ for (p =1 ; p <= node->numports; p++) { port = node->ports[p];if (port &&is_spine (port->remoteport->node))get_router_slot (node, port->remoteport); } - }else if (is_spine (node)) { +else if (is_spine (node))for (p =1 ; p <= node->numports; p++) { port = node->ports[p];if (!port || !port->remoteport)
@@ -486,22 +484,21 @@ static int fill_voltaire_chassis_record(ibnd_node_t * node)if (!node->ch_type)/* we assume here that remoteport belongs to line */ if (get_sfb_slot (node, port->remoteport)) -return (-1 ); +return -1 ;/* we could break here, but need to find if more routers connected */ } - }else if (is_line (node)) { +else if (is_line (node))for (p =1 ; p <= node->numports; p++) { port = node->ports[p];if (!port || port->portnum >12 || !port->remoteport)continue ;/* we assume here that remoteport belongs to spine */ if (get_slb_slot (node, port->remoteport)) -return (-1 ); +return -1 ;break ; } - }/* for each port of this node, map external ports */ for (p =1 ; p <= node->numports; p++) {
@@ -511,7 +508,7 @@ static int fill_voltaire_chassis_record(ibnd_node_t * node)voltaire_portmap (port); } -return (0 ); +return 0 ; }static int get_line_index (ibnd_node_t * node)
@@ -520,7 +517,7 @@ static int get_line_index(ibnd_node_t * node)if (retval >LINES_MAX_NUM || retval <1 ) {IBND_ERROR ("Internal error\n" ); -return (-1 ); +return -1 ; }return retval; }
@@ -536,7 +533,7 @@ static int get_spine_index(ibnd_node_t * node)if (retval >SPINES_MAX_NUM || retval <1 ) {IBND_ERROR ("Internal error\n" ); -return (-1 ); +return -1 ; }return retval; }
@@ -546,14 +543,14 @@ static int insert_line_router(ibnd_node_t * node, ibnd_chassis_t * chassis)int i =get_line_index (node);if (i <0 ) -return (i); +return i;if (chassis->linenode[i]) -return (0 );/* already filled slot */ +return 0 ;/* already filled slot */ chassis->linenode[i] = node; node->chassis = chassis; -return (0 ); +return 0 ; }static int insert_spine (ibnd_node_t * node,ibnd_chassis_t * chassis)
@@ -561,14 +558,14 @@ static int insert_spine(ibnd_node_t * node, ibnd_chassis_t * chassis)int i =get_spine_index (node);if (i <0 ) -return (i); +return i;if (chassis->spinenode[i]) -return (0 );/* already filled slot */ +return 0 ;/* already filled slot */ chassis->spinenode[i] = node; node->chassis = chassis; -return (0 ); +return 0 ; }static int pass_on_lines_catch_spines (ibnd_chassis_t * chassis)
@@ -593,10 +590,10 @@ static int pass_on_lines_catch_spines(ibnd_chassis_t * chassis)if (!remnode->ch_found)continue ;/* some error - spine not initialized ? FIXME */ if (insert_spine (remnode, chassis)) -return (-1 ); +return -1 ; } } -return (0 ); +return 0 ; }static int pass_on_spines_catch_lines (ibnd_chassis_t * chassis)
@@ -618,10 +615,10 @@ static int pass_on_spines_catch_lines(ibnd_chassis_t * chassis)if (!remnode->ch_found)continue ;/* some error - line/router not initialized ? FIXME */ if (insert_line_router (remnode, chassis)) -return (-1 ); +return -1 ; } } -return (0 ); +return 0 ; }/*
@@ -657,7 +654,7 @@ static int build_chassis(ibnd_node_t * node, ibnd_chassis_t * chassis)/* we get here with node = chassis_spine */ if (insert_spine ((ibnd_node_t *) node, chassis)) -return (-1 ); +return -1 ;/* loop: pass on all ports of node */ for (p =1 ; p <= node->numports; p++) {
@@ -673,22 +670,22 @@ static int build_chassis(ibnd_node_t * node, ibnd_chassis_t * chassis) }if (pass_on_lines_catch_spines (chassis)) -return (-1 ); +return -1 ;/* this pass needed for to catch routers, since routers connected only */ /* to spines in slot 1 or 4 and we could miss them first time */ if (pass_on_spines_catch_lines (chassis)) -return (-1 ); +return -1 ;/* additional 2 passes needed for to overcome a problem of pure "in-chassis" */ /* connectivity - extra pass to ensure that all related chips/modules */ /* inserted into the chassis */ if (pass_on_lines_catch_spines (chassis)) -return (-1 ); +return -1 ;if (pass_on_spines_catch_lines (chassis)) -return (-1 ); +return -1 ;pass_on_spines_interpolate_chguid (chassis); -return (0 ); +return 0 ; }/*========================================================*/
@@ -786,7 +783,7 @@ static int add_chassis(ibnd_scan_t *scan) {if (!(scan->current_chassis =calloc (1 ,sizeof (ibnd_chassis_t)))) {IBND_ERROR ("OOM: failed to allocate chassis object\n" ); -return (-1 ); +return -1 ; }if (scan->first_chassis ==NULL ) {
@@ -796,7 +793,7 @@ static int add_chassis(ibnd_scan_t *scan) scan->last_chassis->next = scan->current_chassis; scan->last_chassis = scan->current_chassis; } -return (0 ); +return 0 ; }static void add_node_to_chassis (ibnd_chassis_t * chassis,ibnd_node_t * node)
@@ -834,18 +831,16 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *scan)/* an appropriate chassis record (slotnum and position) */ /* according to internal connectivity */ /* not very efficient but clear code so... */ -for (dist =0 ; dist <= fabric->maxhops_discovered; dist++) { -for (node = scan->nodesdist[dist]; node; node = node->dnext) { +for (dist =0 ; dist <= fabric->maxhops_discovered; dist++) +for (node = scan->nodesdist[dist]; node; node = node->dnext)if (mad_get_field (node->info,0 , -IB_NODE_VENDORID_F ) ==VTR_VENDOR_ID ) -if (fill_voltaire_chassis_record (node)) - goto cleanup; - } - } +IB_NODE_VENDORID_F ) ==VTR_VENDOR_ID + &&fill_voltaire_chassis_record (node)) + goto cleanup;/* separate every Voltaire chassis from each other and build linked list of them */ /* algorithm: catch spine and find all surrounding nodes */ -for (dist =0 ; dist <= fabric->maxhops_discovered; dist++) { +for (dist =0 ; dist <= fabric->maxhops_discovered; dist++)for (node = scan->nodesdist[dist]; node; node = node->dnext) {if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) !=VTR_VENDOR_ID )
@@ -860,11 +855,10 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *scan)if (build_chassis (node, scan->current_chassis)) goto cleanup; } - }/* now make pass on nodes for chassis which are not Voltaire */ /* grouped by common SystemImageGUID */ -for (dist =0 ; dist <= fabric->maxhops_discovered; dist++) { +for (dist =0 ; dist <= fabric->maxhops_discovered; dist++)for (node = scan->nodesdist[dist]; node; node = node->dnext) {if (mad_get_field (node->info,0 ,IB_NODE_VENDORID_F ) ==VTR_VENDOR_ID )
@@ -887,7 +881,6 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *scan) } } } - }/* now, make another pass to see which nodes are part of chassis */ /* (defined as chassis->nodecount > 1) */
@@ -921,7 +914,7 @@ int group_nodes(ibnd_fabric_t * fabric, ibnd_scan_t *scan) } fabric->chassis = scan->first_chassis; -return (0 ); +return 0 ; cleanup: ch = scan->first_chassis;
@@ -933,5 +926,5 @@ cleanup: scan->first_chassis =NULL ; scan->current_chassis =NULL ; scan->last_chassis =NULL ; -return (-1 ); +return -1 ; }
infiniband-diags/libibnetdisc/src/ibnetdisc.c +44 -46
277 lines not on this page · raw message
Signature · 6 lines
1.6.5.1 -- 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