[ofa-general] [PATCH v3 3/3] Convert ibnetdiscover to use new ibnetdisc library.
Ira Weiny
weiny2 at llnl.gov
Fri Apr 3 15:43:01 PDT 2009
>From e506ac4d6accefb49b89811cc9dd77775ad481f7 Mon Sep 17 00:00:00 2001
From: Ira Weiny <weiny2 at llnl.gov>
Date: Fri, 3 Apr 2009 15:28:29 -0700
Subject: [PATCH] Convert ibnetdiscover to use new ibnetdisc library.
All other functionality is preserved
Signed-off-by: Ira Weiny <weiny2 at llnl.gov>
---
infiniband-diags/Makefile.am | 5 +-
infiniband-diags/include/grouping.h | 113 ---
infiniband-diags/libibnetdisc/src/chassis.c | 20 +-
infiniband-diags/libibnetdisc/src/ibnetdisc.c | 5 +-
infiniband-diags/man/ibnetdiscover.8 | 10 +-
infiniband-diags/src/grouping.c | 785 --------------------
infiniband-diags/src/ibnetdiscover.c | 974 +++++++++----------------
7 files changed, 345 insertions(+), 1567 deletions(-)
delete mode 100644 infiniband-diags/include/grouping.h
delete mode 100644 infiniband-diags/src/grouping.c
diff --git a/infiniband-diags/Makefile.am b/infiniband-diags/Makefile.am
index b480a4a..19b992c 100644
--- a/infiniband-diags/Makefile.am
+++ b/infiniband-diags/Makefile.am
@@ -41,7 +41,8 @@ LDADD = libcommon.a
libcommon_a_SOURCES = src/ibdiag_common.c
src_ibaddr_SOURCES = src/ibaddr.c
-src_ibnetdiscover_SOURCES = src/ibnetdiscover.c src/grouping.c
+src_ibnetdiscover_SOURCES = src/ibnetdiscover.c
+src_ibnetdiscover_LDFLAGS = -L$(top_srcdir)/libibnetdisc -libnetdisc
src_ibping_SOURCES = src/ibping.c
src_ibportstate_SOURCES = src/ibportstate.c
src_ibroute_SOURCES = src/ibroute.c
@@ -57,7 +58,7 @@ src_ibsendtrap_SOURCES = src/ibsendtrap.c
src_vendstat_SOURCES = src/vendstat.c
src_mcm_rereg_test_SOURCES = src/mcm_rereg_test.c
src_iblinkinfo_SOURCES = src/iblinkinfo.c
-src_iblinkinfo_LDADD = -libnetdisc
+src_iblinkinfo_LDFLAGS = -L$(top_srcdir)/libibnetdisc -libnetdisc
man_MANS = man/ibaddr.8 man/ibcheckerrors.8 man/ibcheckerrs.8 \
man/ibchecknet.8 man/ibchecknode.8 man/ibcheckport.8 \
diff --git a/infiniband-diags/include/grouping.h b/infiniband-diags/include/grouping.h
deleted file mode 100644
index 811e372..0000000
--- a/infiniband-diags/include/grouping.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved.
- * Copyright (c) 2007 Xsigo Systems Inc. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _GROUPING_H_
-#define _GROUPING_H_
-
-/*========================================================*/
-/* FABRIC SCANNER SPECIFIC DATA */
-/*========================================================*/
-
-#define SPINES_MAX_NUM 12
-#define LINES_MAX_NUM 36
-
-typedef struct ChassisList ChassisList;
-typedef struct AllChassisList AllChassisList;
-
-struct ChassisList {
- ChassisList *next;
- uint64_t chassisguid;
- unsigned char chassisnum;
- unsigned char chassistype;
- unsigned int nodecount; /* used for grouping by SystemImageGUID */
- Node *spinenode[SPINES_MAX_NUM + 1];
- Node *linenode[LINES_MAX_NUM + 1];
-};
-
-struct AllChassisList {
- ChassisList *first;
- ChassisList *current;
- ChassisList *last;
-};
-
-/*========================================================*/
-/* CHASSIS RECOGNITION SPECIFIC DATA */
-/*========================================================*/
-
-/* Device IDs */
-#define VTR_DEVID_IB_FC_ROUTER 0x5a00
-#define VTR_DEVID_IB_IP_ROUTER 0x5a01
-#define VTR_DEVID_ISR9600_SPINE 0x5a02
-#define VTR_DEVID_ISR9600_LEAF 0x5a03
-#define VTR_DEVID_HCA1 0x5a04
-#define VTR_DEVID_HCA2 0x5a44
-#define VTR_DEVID_HCA3 0x6278
-#define VTR_DEVID_SW_6IB4 0x5a05
-#define VTR_DEVID_ISR9024 0x5a06
-#define VTR_DEVID_ISR9288 0x5a07
-#define VTR_DEVID_SLB24 0x5a09
-#define VTR_DEVID_SFB12 0x5a08
-#define VTR_DEVID_SFB4 0x5a0b
-#define VTR_DEVID_ISR9024_12 0x5a0c
-#define VTR_DEVID_SLB8 0x5a0d
-#define VTR_DEVID_RLX_SWITCH_BLADE 0x5a20
-#define VTR_DEVID_ISR9024_DDR 0x5a31
-#define VTR_DEVID_SFB12_DDR 0x5a32
-#define VTR_DEVID_SFB4_DDR 0x5a33
-#define VTR_DEVID_SLB24_DDR 0x5a34
-#define VTR_DEVID_SFB2012 0x5a37
-#define VTR_DEVID_SLB2024 0x5a38
-#define VTR_DEVID_ISR2012 0x5a39
-#define VTR_DEVID_SFB2004 0x5a40
-#define VTR_DEVID_ISR2004 0x5a41
-#define VTR_DEVID_SRB2004 0x5a42
-
-enum ChassisType { UNRESOLVED_CT, ISR9288_CT, ISR9096_CT, ISR2012_CT, ISR2004_CT };
-enum ChassisSlot { UNRESOLVED_CS, LINE_CS, SPINE_CS, SRBD_CS };
-
-/*========================================================*/
-/* External interface */
-/*========================================================*/
-
-ChassisList *group_nodes();
-char *portmapstring(Port *port);
-char *get_chassis_type(unsigned char chassistype);
-char *get_chassis_slot(unsigned char chassisslot);
-uint64_t get_chassis_guid(unsigned char chassisnum);
-
-int is_xsigo_guid(uint64_t guid);
-int is_xsigo_tca(uint64_t guid);
-int is_xsigo_hca(uint64_t guid);
-
-#endif /* _GROUPING_H_ */
diff --git a/infiniband-diags/libibnetdisc/src/chassis.c b/infiniband-diags/libibnetdisc/src/chassis.c
index a25d710..6b4930e 100644
--- a/infiniband-diags/libibnetdisc/src/chassis.c
+++ b/infiniband-diags/libibnetdisc/src/chassis.c
@@ -292,19 +292,19 @@ int is_chassis_switch(struct ibnd_node *n)
}
/* these structs help find Line (Anafa) slot number while using spine portnum */
-int line_slot_2_sfb4[25] = { 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4 };
-int anafa_line_slot_2_sfb4[25] = { 0, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2 };
-int line_slot_2_sfb12[25] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10, 10, 11, 11, 12, 12 };
-int anafa_line_slot_2_sfb12[25] = { 0, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2 };
+char line_slot_2_sfb4[25] = { 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4 };
+char anafa_line_slot_2_sfb4[25] = { 0, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2 };
+char line_slot_2_sfb12[25] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10, 10, 11, 11, 12, 12 };
+char anafa_line_slot_2_sfb12[25] = { 0, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2 };
/* IPR FCR modules connectivity while using sFB4 port as reference */
-int ipr_slot_2_sfb4_port[25] = { 0, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1 };
+char ipr_slot_2_sfb4_port[25] = { 0, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1 };
/* these structs help find Spine (Anafa) slot number while using spine portnum */
-int spine12_slot_2_slb[25] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-int anafa_spine12_slot_2_slb[25]= { 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-int spine4_slot_2_slb[25] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-int anafa_spine4_slot_2_slb[25] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+char spine12_slot_2_slb[25] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+char anafa_spine12_slot_2_slb[25]= { 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+char spine4_slot_2_slb[25] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+char anafa_spine4_slot_2_slb[25] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
/* reference { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 }; */
static void get_sfb_slot(struct ibnd_node *node, ibnd_port_t *lineport)
@@ -337,7 +337,7 @@ static void get_sfb_slot(struct ibnd_node *node, ibnd_port_t *lineport)
static void get_router_slot(struct ibnd_node *node, ibnd_port_t *spineport)
{
ibnd_node_t *n = (ibnd_node_t *)node;
- int guessnum = 0;
+ uint64_t guessnum = 0;
node->ch_found = 1;
diff --git a/infiniband-diags/libibnetdisc/src/ibnetdisc.c b/infiniband-diags/libibnetdisc/src/ibnetdisc.c
index bf7c2a7..479bae7 100644
--- a/infiniband-diags/libibnetdisc/src/ibnetdisc.c
+++ b/infiniband-diags/libibnetdisc/src/ibnetdisc.c
@@ -150,6 +150,9 @@ query_node(struct ibnd_fabric *fabric, struct ibnd_node *inode,
return -1;
decode_port_info(port);
+ port->base_lid = node->smalid; /* LID is still defined by port 0 */
+ port->lmc = node->smalmc;
+
if (!smp_query_via(node->switchinfo, portid, IB_ATTR_SWITCH_INFO, 0, timeout_ms,
fabric->ibmad_port))
node->smaenhsp0 = 0; /* assume base SP0 */
@@ -167,7 +170,7 @@ add_port_to_dpath(ib_dr_path_t *path, int nextport)
if (path->cnt+2 >= sizeof(path->p))
return -1;
++path->cnt;
- path->p[path->cnt] = nextport;
+ path->p[path->cnt] = (uint8_t) nextport;
return path->cnt;
}
diff --git a/infiniband-diags/man/ibnetdiscover.8 b/infiniband-diags/man/ibnetdiscover.8
index 958efa9..768d392 100644
--- a/infiniband-diags/man/ibnetdiscover.8
+++ b/infiniband-diags/man/ibnetdiscover.8
@@ -5,7 +5,7 @@ ibnetdiscover \- discover InfiniBand topology
.SH SYNOPSIS
.B ibnetdiscover
-[\-d(ebug)] [\-e(rr_show)] [\-v(erbose)] [\-s(how)] [\-l(ist)] [\-g(rouping)] [\-H(ca_list)] [\-S(witch_list)] [\-R(outer_list)] [\-C ca_name] [\-P ca_port] [\-t(imeout) timeout_ms] [\-V(ersion)] [\--node-name-map <node-name-map>] [\-p(orts)] [\-h(elp)] [<topology-file>]
+[\-d(ebug)] [\-s(how)] [\-l(ist)] [\-g(rouping)] [\-H(ca_list)] [\-S(witch_list)] [\-R(outer_list)] [\-C ca_name] [\-P ca_port] [\-t(imeout) timeout_ms] [\-V(ersion)] [\--node-name-map <node-name-map>] [\-p(orts)] [\-h(elp)] [<topology-file>]
.SH DESCRIPTION
.PP
@@ -37,7 +37,7 @@ List of connected switches
List of connected routers
.TP
\fB\-s\fR, \fB\-\-show\fR
-Show more information
+Show progress information during discovery.
.TP
\fB\-\-node\-name\-map\fR <node-name-map>
Specify a node name map. The node name map file maps GUIDs to more user friendly
@@ -57,15 +57,9 @@ using the util_name -h syntax.
# Debugging flags
.PP
\-d raise the IB debugging level.
- May be used several times (-ddd or -d -d -d).
-.PP
-\-e show send and receive errors (timeouts and others)
.PP
\-h show the usage message
.PP
-\-v increase the application verbosity level.
- May be used several times (-vv or -v -v -v)
-.PP
\-V show the version info.
# Other common flags:
diff --git a/infiniband-diags/src/grouping.c b/infiniband-diags/src/grouping.c
deleted file mode 100644
index 0c30726..0000000
--- a/infiniband-diags/src/grouping.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved.
- * Copyright (c) 2007 Xsigo Systems Inc. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-/*========================================================*/
-/* FABRIC SCANNER SPECIFIC DATA */
-/*========================================================*/
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <stdlib.h>
-#include <inttypes.h>
-
-#include <infiniband/mad.h>
-
-#include "ibnetdiscover.h"
-#include "grouping.h"
-
-#define OUT_BUFFER_SIZE 16
-
-
-extern Node *nodesdist[MAXHOPS+1]; /* last is CA list */
-extern Node *mynode;
-extern Port *myport;
-extern int maxhops_discovered;
-
-AllChassisList mylist;
-
-char *ChassisTypeStr[5] = { "", "ISR9288", "ISR9096", "ISR2012", "ISR2004" };
-char *ChassisSlotStr[4] = { "", "Line", "Spine", "SRBD" };
-
-
-char *get_chassis_type(unsigned char chassistype)
-{
- if (chassistype == UNRESOLVED_CT || chassistype > ISR2004_CT)
- return NULL;
- return ChassisTypeStr[chassistype];
-}
-
-char *get_chassis_slot(unsigned char chassisslot)
-{
- if (chassisslot == UNRESOLVED_CS || chassisslot > SRBD_CS)
- return NULL;
- return ChassisSlotStr[chassisslot];
-}
-
-static struct ChassisList *find_chassisnum(unsigned char chassisnum)
-{
- ChassisList *current;
-
- for (current = mylist.first; current; current = current->next) {
- if (current->chassisnum == chassisnum)
- return current;
- }
-
- return NULL;
-}
-
-static uint64_t topspin_chassisguid(uint64_t guid)
-{
- /* Byte 3 in system image GUID is chassis type, and */
- /* Byte 4 is location ID (slot) so just mask off byte 4 */
- return guid & 0xffffffff00ffffffULL;
-}
-
-int is_xsigo_guid(uint64_t guid)
-{
- if ((guid & 0xffffff0000000000ULL) == 0x0013970000000000ULL)
- return 1;
- else
- return 0;
-}
-
-static int is_xsigo_leafone(uint64_t guid)
-{
- if ((guid & 0xffffffffff000000ULL) == 0x0013970102000000ULL)
- return 1;
- else
- return 0;
-}
-
-int is_xsigo_hca(uint64_t guid)
-{
- /* NodeType 2 is HCA */
- if ((guid & 0xffffffff00000000ULL) == 0x0013970200000000ULL)
- return 1;
- else
- return 0;
-}
-
-int is_xsigo_tca(uint64_t guid)
-{
- /* NodeType 3 is TCA */
- if ((guid & 0xffffffff00000000ULL) == 0x0013970300000000ULL)
- return 1;
- else
- return 0;
-}
-
-static int is_xsigo_ca(uint64_t guid)
-{
- if (is_xsigo_hca(guid) || is_xsigo_tca(guid))
- return 1;
- else
- return 0;
-}
-
-static int is_xsigo_switch(uint64_t guid)
-{
- if ((guid & 0xffffffff00000000ULL) == 0x0013970100000000ULL)
- return 1;
- else
- return 0;
-}
-
-static uint64_t xsigo_chassisguid(Node *node)
-{
- if (!is_xsigo_ca(node->sysimgguid)) {
- /* Byte 3 is NodeType and byte 4 is PortType */
- /* If NodeType is 1 (switch), PortType is masked */
- if (is_xsigo_switch(node->sysimgguid))
- return node->sysimgguid & 0xffffffff00ffffffULL;
- else
- return node->sysimgguid;
- } else {
- /* Is there a peer port ? */
- if (!node->ports->remoteport)
- return node->sysimgguid;
-
- /* If peer port is Leaf 1, use its chassis GUID */
- if (is_xsigo_leafone(node->ports->remoteport->node->sysimgguid))
- return node->ports->remoteport->node->sysimgguid &
- 0xffffffff00ffffffULL;
- else
- return node->sysimgguid;
- }
-}
-
-static uint64_t get_chassisguid(Node *node)
-{
- if (node->vendid == TS_VENDOR_ID || node->vendid == SS_VENDOR_ID)
- return topspin_chassisguid(node->sysimgguid);
- else if (node->vendid == XS_VENDOR_ID || is_xsigo_guid(node->sysimgguid))
- return xsigo_chassisguid(node);
- else
- return node->sysimgguid;
-}
-
-static struct ChassisList *find_chassisguid(Node *node)
-{
- ChassisList *current;
- uint64_t chguid;
-
- chguid = get_chassisguid(node);
- for (current = mylist.first; current; current = current->next) {
- if (current->chassisguid == chguid)
- return current;
- }
-
- return NULL;
-}
-
-uint64_t get_chassis_guid(unsigned char chassisnum)
-{
- ChassisList *chassis;
-
- chassis = find_chassisnum(chassisnum);
- if (chassis)
- return chassis->chassisguid;
- else
- return 0;
-}
-
-static int is_router(Node *node)
-{
- return (node->devid == VTR_DEVID_IB_FC_ROUTER ||
- node->devid == VTR_DEVID_IB_IP_ROUTER);
-}
-
-static int is_spine_9096(Node *node)
-{
- return (node->devid == VTR_DEVID_SFB4 ||
- node->devid == VTR_DEVID_SFB4_DDR);
-}
-
-static int is_spine_9288(Node *node)
-{
- return (node->devid == VTR_DEVID_SFB12 ||
- node->devid == VTR_DEVID_SFB12_DDR);
-}
-
-static int is_spine_2004(Node *node)
-{
- return (node->devid == VTR_DEVID_SFB2004);
-}
-
-static int is_spine_2012(Node *node)
-{
- return (node->devid == VTR_DEVID_SFB2012);
-}
-
-static int is_spine(Node *node)
-{
- return (is_spine_9096(node) || is_spine_9288(node) ||
- is_spine_2004(node) || is_spine_2012(node));
-}
-
-static int is_line_24(Node *node)
-{
- return (node->devid == VTR_DEVID_SLB24 ||
- node->devid == VTR_DEVID_SLB24_DDR ||
- node->devid == VTR_DEVID_SRB2004);
-}
-
-static int is_line_8(Node *node)
-{
- return (node->devid == VTR_DEVID_SLB8);
-}
-
-static int is_line_2024(Node *node)
-{
- return (node->devid == VTR_DEVID_SLB2024);
-}
-
-static int is_line(Node *node)
-{
- return (is_line_24(node) || is_line_8(node) || is_line_2024(node));
-}
-
-int is_chassis_switch(Node *node)
-{
- return (is_spine(node) || is_line(node));
-}
-
-/* these structs help find Line (Anafa) slot number while using spine portnum */
-char line_slot_2_sfb4[25] = { 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4 };
-char anafa_line_slot_2_sfb4[25] = { 0, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2 };
-char line_slot_2_sfb12[25] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10, 10, 11, 11, 12, 12 };
-char anafa_line_slot_2_sfb12[25] = { 0, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2 };
-
-/* IPR FCR modules connectivity while using sFB4 port as reference */
-char ipr_slot_2_sfb4_port[25] = { 0, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1 };
-
-/* these structs help find Spine (Anafa) slot number while using spine portnum */
-char spine12_slot_2_slb[25] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-char anafa_spine12_slot_2_slb[25]= { 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-char spine4_slot_2_slb[25] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-char anafa_spine4_slot_2_slb[25] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-/* reference { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24 }; */
-
-static void get_sfb_slot(Node *node, Port *lineport)
-{
- ChassisRecord *ch = node->chrecord;
-
- ch->chassisslot = SPINE_CS;
- if (is_spine_9096(node)) {
- ch->chassistype = ISR9096_CT;
- ch->slotnum = spine4_slot_2_slb[lineport->portnum];
- ch->anafanum = anafa_spine4_slot_2_slb[lineport->portnum];
- } else if (is_spine_9288(node)) {
- ch->chassistype = ISR9288_CT;
- ch->slotnum = spine12_slot_2_slb[lineport->portnum];
- ch->anafanum = anafa_spine12_slot_2_slb[lineport->portnum];
- } else if (is_spine_2012(node)) {
- ch->chassistype = ISR2012_CT;
- ch->slotnum = spine12_slot_2_slb[lineport->portnum];
- ch->anafanum = anafa_spine12_slot_2_slb[lineport->portnum];
- } else if (is_spine_2004(node)) {
- ch->chassistype = ISR2004_CT;
- ch->slotnum = spine4_slot_2_slb[lineport->portnum];
- ch->anafanum = anafa_spine4_slot_2_slb[lineport->portnum];
- } else {
- IBPANIC("Unexpected node found: guid 0x%016" PRIx64, node->nodeguid);
- }
-}
-
-static void get_router_slot(Node *node, Port *spineport)
-{
- ChassisRecord *ch = node->chrecord;
- uint64_t guessnum = 0;
-
- if (!ch) {
- if (!(node->chrecord = calloc(1, sizeof(ChassisRecord))))
- IBPANIC("out of mem");
- ch = node->chrecord;
- }
-
- ch->chassisslot = SRBD_CS;
- if (is_spine_9096(spineport->node)) {
- ch->chassistype = ISR9096_CT;
- ch->slotnum = line_slot_2_sfb4[spineport->portnum];
- ch->anafanum = ipr_slot_2_sfb4_port[spineport->portnum];
- } else if (is_spine_9288(spineport->node)) {
- ch->chassistype = ISR9288_CT;
- ch->slotnum = line_slot_2_sfb12[spineport->portnum];
- /* this is a smart guess based on nodeguids order on sFB-12 module */
- guessnum = spineport->node->nodeguid % 4;
- /* module 1 <--> remote anafa 3 */
- /* module 2 <--> remote anafa 2 */
- /* module 3 <--> remote anafa 1 */
- ch->anafanum = (guessnum == 3 ? 1 : (guessnum == 1 ? 3 : 2));
- } else if (is_spine_2012(spineport->node)) {
- ch->chassistype = ISR2012_CT;
- ch->slotnum = line_slot_2_sfb12[spineport->portnum];
- /* this is a smart guess based on nodeguids order on sFB-12 module */
- guessnum = spineport->node->nodeguid % 4;
- /* module 1 <--> remote anafa 3 */
- /* module 2 <--> remote anafa 2 */
- /* module 3 <--> remote anafa 1 */
- ch->anafanum = (guessnum == 3? 1 : (guessnum == 1 ? 3 : 2));
- } else if (is_spine_2004(spineport->node)) {
- ch->chassistype = ISR2004_CT;
- ch->slotnum = line_slot_2_sfb4[spineport->portnum];
- ch->anafanum = ipr_slot_2_sfb4_port[spineport->portnum];
- } else {
- IBPANIC("Unexpected node found: guid 0x%016" PRIx64, spineport->node->nodeguid);
- }
-}
-
-static void get_slb_slot(ChassisRecord *ch, Port *spineport)
-{
- ch->chassisslot = LINE_CS;
- if (is_spine_9096(spineport->node)) {
- ch->chassistype = ISR9096_CT;
- ch->slotnum = line_slot_2_sfb4[spineport->portnum];
- ch->anafanum = anafa_line_slot_2_sfb4[spineport->portnum];
- } else if (is_spine_9288(spineport->node)) {
- ch->chassistype = ISR9288_CT;
- ch->slotnum = line_slot_2_sfb12[spineport->portnum];
- ch->anafanum = anafa_line_slot_2_sfb12[spineport->portnum];
- } else if (is_spine_2012(spineport->node)) {
- ch->chassistype = ISR2012_CT;
- ch->slotnum = line_slot_2_sfb12[spineport->portnum];
- ch->anafanum = anafa_line_slot_2_sfb12[spineport->portnum];
- } else if (is_spine_2004(spineport->node)) {
- ch->chassistype = ISR2004_CT;
- ch->slotnum = line_slot_2_sfb4[spineport->portnum];
- ch->anafanum = anafa_line_slot_2_sfb4[spineport->portnum];
- } else {
- IBPANIC("Unexpected node found: guid 0x%016" PRIx64, spineport->node->nodeguid);
- }
-}
-
-/*
- This function called for every Voltaire node in fabric
- It could be optimized so, but time overhead is very small
- and its only diag.util
-*/
-static void fill_chassis_record(Node *node)
-{
- Port *port;
- Node *remnode = 0;
- ChassisRecord *ch = 0;
-
- if (node->chrecord) /* somehow this node has already been passed */
- return;
-
- if (!(node->chrecord = calloc(1, sizeof(ChassisRecord))))
- IBPANIC("out of mem");
-
- ch = node->chrecord;
-
- /* 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) && is_spine(node->ports->remoteport->node))
- get_router_slot(node, node->ports->remoteport);
- else if (is_spine(node)) {
- for (port = node->ports; port; port = port->next) {
- if (!port->remoteport)
- continue;
- remnode = port->remoteport->node;
- if (remnode->type != SWITCH_NODE) {
- if (!remnode->chrecord)
- get_router_slot(remnode, port);
- continue;
- }
- if (!ch->chassistype)
- /* we assume here that remoteport belongs to line */
- get_sfb_slot(node, port->remoteport);
-
- /* we could break here, but need to find if more routers connected */
- }
-
- } else if (is_line(node)) {
- for (port = node->ports; port; port = port->next) {
- if (port->portnum > 12)
- continue;
- if (!port->remoteport)
- continue;
- /* we assume here that remoteport belongs to spine */
- get_slb_slot(ch, port->remoteport);
- break;
- }
- }
-
- return;
-}
-
-static int get_line_index(Node *node)
-{
- int retval = 3 * (node->chrecord->slotnum - 1) + node->chrecord->anafanum;
-
- if (retval > LINES_MAX_NUM || retval < 1)
- IBPANIC("Internal error");
- return retval;
-}
-
-static int get_spine_index(Node *node)
-{
- int retval;
-
- if (is_spine_9288(node) || is_spine_2012(node))
- retval = 3 * (node->chrecord->slotnum - 1) + node->chrecord->anafanum;
- else
- retval = node->chrecord->slotnum;
-
- if (retval > SPINES_MAX_NUM || retval < 1)
- IBPANIC("Internal error");
- return retval;
-}
-
-static void insert_line_router(Node *node, ChassisList *chassislist)
-{
- int i = get_line_index(node);
-
- if (chassislist->linenode[i])
- return; /* already filled slot */
-
- chassislist->linenode[i] = node;
- node->chrecord->chassisnum = chassislist->chassisnum;
-}
-
-static void insert_spine(Node *node, ChassisList *chassislist)
-{
- int i = get_spine_index(node);
-
- if (chassislist->spinenode[i])
- return; /* already filled slot */
-
- chassislist->spinenode[i] = node;
- node->chrecord->chassisnum = chassislist->chassisnum;
-}
-
-static void pass_on_lines_catch_spines(ChassisList *chassislist)
-{
- Node *node, *remnode;
- Port *port;
- int i;
-
- for (i = 1; i <= LINES_MAX_NUM; i++) {
- node = chassislist->linenode[i];
-
- if (!(node && is_line(node)))
- continue; /* empty slot or router */
-
- for (port = node->ports; port; port = port->next) {
- if (port->portnum > 12)
- continue;
-
- if (!port->remoteport)
- continue;
- remnode = port->remoteport->node;
-
- if (!remnode->chrecord)
- continue; /* some error - spine not initialized ? FIXME */
- insert_spine(remnode, chassislist);
- }
- }
-}
-
-static void pass_on_spines_catch_lines(ChassisList *chassislist)
-{
- Node *node, *remnode;
- Port *port;
- int i;
-
- for (i = 1; i <= SPINES_MAX_NUM; i++) {
- node = chassislist->spinenode[i];
- if (!node)
- continue; /* empty slot */
- for (port = node->ports; port; port = port->next) {
- if (!port->remoteport)
- continue;
- remnode = port->remoteport->node;
-
- if (!remnode->chrecord)
- continue; /* some error - line/router not initialized ? FIXME */
- insert_line_router(remnode, chassislist);
- }
- }
-}
-
-/*
- Stupid interpolation algorithm...
- But nothing to do - have to be compliant with VoltaireSM/NMS
-*/
-static void pass_on_spines_interpolate_chguid(ChassisList *chassislist)
-{
- Node *node;
- int i;
-
- for (i = 1; i <= SPINES_MAX_NUM; i++) {
- node = chassislist->spinenode[i];
- if (!node)
- continue; /* skip the empty slots */
-
- /* take first guid minus one to be consistent with SM */
- chassislist->chassisguid = node->nodeguid - 1;
- break;
- }
-}
-
-/*
- This function fills chassislist structure with all nodes
- in that chassis
- chassislist structure = structure of one standalone chassis
-*/
-static void build_chassis(Node *node, ChassisList *chassislist)
-{
- Node *remnode = 0;
- Port *port = 0;
-
- /* we get here with node = chassis_spine */
- chassislist->chassistype = node->chrecord->chassistype;
- insert_spine(node, chassislist);
-
- /* loop: pass on all ports of node */
- for (port = node->ports; port; port = port->next) {
- if (!port->remoteport)
- continue;
- remnode = port->remoteport->node;
-
- if (!remnode->chrecord)
- continue; /* some error - line or router not initialized ? FIXME */
-
- insert_line_router(remnode, chassislist);
- }
-
- pass_on_lines_catch_spines(chassislist);
- /* 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 */
- pass_on_spines_catch_lines(chassislist);
-
- /* 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 chassislist */
- pass_on_lines_catch_spines(chassislist);
- pass_on_spines_catch_lines(chassislist);
- pass_on_spines_interpolate_chguid(chassislist);
-}
-
-/*========================================================*/
-/* INTERNAL TO EXTERNAL PORT MAPPING */
-/*========================================================*/
-
-/*
-Description : On ISR9288/9096 external ports indexing
- is not matching the internal ( anafa ) port
- indexes. Use this MAP to translate the data you get from
- the OpenIB diagnostics (smpquery, ibroute, ibtracert, etc.)
-
-
-Module : sLB-24
- anafa 1 anafa 2
-ext port | 13 14 15 16 17 18 | 19 20 21 22 23 24
-int port | 22 23 24 18 17 16 | 22 23 24 18 17 16
-ext port | 1 2 3 4 5 6 | 7 8 9 10 11 12
-int port | 19 20 21 15 14 13 | 19 20 21 15 14 13
-------------------------------------------------
-
-Module : sLB-8
- anafa 1 anafa 2
-ext port | 13 14 15 16 17 18 | 19 20 21 22 23 24
-int port | 24 23 22 18 17 16 | 24 23 22 18 17 16
-ext port | 1 2 3 4 5 6 | 7 8 9 10 11 12
-int port | 21 20 19 15 14 13 | 21 20 19 15 14 13
-
------------>
- anafa 1 anafa 2
-ext port | - - 5 - - 6 | - - 7 - - 8
-int port | 24 23 22 18 17 16 | 24 23 22 18 17 16
-ext port | - - 1 - - 2 | - - 3 - - 4
-int port | 21 20 19 15 14 13 | 21 20 19 15 14 13
-------------------------------------------------
-
-Module : sLB-2024
-
-ext port | 13 14 15 16 17 18 19 20 21 22 23 24
-A1 int port| 13 14 15 16 17 18 19 20 21 22 23 24
-ext port | 1 2 3 4 5 6 7 8 9 10 11 12
-A2 int port| 13 14 15 16 17 18 19 20 21 22 23 24
----------------------------------------------------
-
-*/
-
-int int2ext_map_slb24[2][25] = {
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 5, 4, 18, 17, 16, 1, 2, 3, 13, 14, 15 },
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 11, 10, 24, 23, 22, 7, 8, 9, 19, 20, 21 }
- };
-int int2ext_map_slb8[2][25] = {
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 6, 6, 6, 1, 1, 1, 5, 5, 5 },
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 8, 8, 8, 3, 3, 3, 7, 7, 7 }
- };
-int int2ext_map_slb2024[2][25] = {
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 },
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }
- };
-/* reference { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 }; */
-
-/*
- This function relevant only for line modules/chips
- Returns string with external port index
-*/
-char *portmapstring(Port *port)
-{
- static char mapping[OUT_BUFFER_SIZE];
- ChassisRecord *ch = port->node->chrecord;
- int portnum = port->portnum;
- int chipnum = 0;
- int pindex = 0;
- Node *node = port->node;
-
- if (!ch || !is_line(node) || (portnum < 13 || portnum > 24))
- return NULL;
-
- if (ch->anafanum < 1 || ch->anafanum > 2)
- return NULL;
-
- memset(mapping, 0, sizeof(mapping));
-
- chipnum = ch->anafanum - 1;
-
- if (is_line_24(node))
- pindex = int2ext_map_slb24[chipnum][portnum];
- else if (is_line_2024(node))
- pindex = int2ext_map_slb2024[chipnum][portnum];
- else
- pindex = int2ext_map_slb8[chipnum][portnum];
-
- sprintf(mapping, "[ext %d]", pindex);
-
- return mapping;
-}
-
-static void add_chassislist()
-{
- if (!(mylist.current = calloc(1, sizeof(ChassisList))))
- IBPANIC("out of mem");
-
- if (mylist.first == NULL) {
- mylist.first = mylist.current;
- mylist.last = mylist.current;
- } else {
- mylist.last->next = mylist.current;
- mylist.current->next = NULL;
- mylist.last = mylist.current;
- }
-}
-
-/*
- Main grouping function
- Algorithm:
- 1. pass on every Voltaire node
- 2. catch spine chip for every Voltaire node
- 2.1 build/interpolate chassis around this chip
- 2.2 go to 1.
- 3. pass on non Voltaire nodes (SystemImageGUID based grouping)
- 4. now group non Voltaire nodes by SystemImageGUID
-*/
-ChassisList *group_nodes()
-{
- Node *node;
- int dist;
- int chassisnum = 0;
- struct ChassisList *chassis;
-
- mylist.first = NULL;
- mylist.current = NULL;
- mylist.last = 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 <= maxhops_discovered; dist++) {
- for (node = nodesdist[dist]; node; node = node->dnext) {
- if (node->vendid == VTR_VENDOR_ID)
- fill_chassis_record(node);
- }
- }
-
- /* 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 <= maxhops_discovered; dist++) {
- for (node = nodesdist[dist]; node; node = node->dnext) {
- if (node->vendid != VTR_VENDOR_ID)
- continue;
- if (!node->chrecord || node->chrecord->chassisnum || !is_spine(node))
- continue;
- add_chassislist();
- mylist.current->chassisnum = ++chassisnum;
- build_chassis(node, mylist.current);
- }
- }
-
- /* now make pass on nodes for chassis which are not Voltaire */
- /* grouped by common SystemImageGUID */
- for (dist = 0; dist <= maxhops_discovered; dist++) {
- for (node = nodesdist[dist]; node; node = node->dnext) {
- if (node->vendid == VTR_VENDOR_ID)
- continue;
- if (node->sysimgguid) {
- chassis = find_chassisguid(node);
- if (chassis)
- chassis->nodecount++;
- else {
- /* Possible new chassis */
- add_chassislist();
- mylist.current->chassisguid = get_chassisguid(node);
- mylist.current->nodecount = 1;
- }
- }
- }
- }
-
- /* now, make another pass to see which nodes are part of chassis */
- /* (defined as chassis->nodecount > 1) */
- for (dist = 0; dist <= MAXHOPS; ) {
- for (node = nodesdist[dist]; node; node = node->dnext) {
- if (node->vendid == VTR_VENDOR_ID)
- continue;
- if (node->sysimgguid) {
- chassis = find_chassisguid(node);
- if (chassis && chassis->nodecount > 1) {
- if (!chassis->chassisnum)
- chassis->chassisnum = ++chassisnum;
- if (!node->chrecord) {
- if (!(node->chrecord = calloc(1, sizeof(ChassisRecord))))
- IBPANIC("out of mem");
- node->chrecord->chassisnum = chassis->chassisnum;
- }
- }
- }
- }
- if (dist == maxhops_discovered)
- dist = MAXHOPS; /* skip to CAs */
- else
- dist++;
- }
-
- return (mylist.first);
-}
diff --git a/infiniband-diags/src/ibnetdiscover.c b/infiniband-diags/src/ibnetdiscover.c
index 25c1f7f..99750f0 100644
--- a/infiniband-diags/src/ibnetdiscover.c
+++ b/infiniband-diags/src/ibnetdiscover.c
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2004-2008 Voltaire Inc. All rights reserved.
* Copyright (c) 2007 Xsigo Systems Inc. All rights reserved.
+ * Copyright (c) 2008 Lawrence Livermore National Lab. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -48,445 +49,108 @@
#include <infiniband/umad.h>
#include <infiniband/mad.h>
#include <complib/cl_nodenamemap.h>
+#include <infiniband/ibnetdisc.h>
#include "ibnetdiscover.h"
-#include "grouping.h"
#include "ibdiag_common.h"
struct ibmad_port *srcport;
-static char *node_type_str[] = {
- "???",
- "ca",
- "switch",
- "router",
- "iwarp rnic"
-};
-
-static char *linkwidth_str[] = {
- "??",
- "1x",
- "4x",
- "??",
- "8x",
- "??",
- "??",
- "??",
- "12x"
-};
-
-static char *linkspeed_str[] = {
- "???",
- "SDR",
- "DDR",
- "???",
- "QDR"
-};
-
static int timeout = 2000; /* ms */
-static int dumplevel = 0;
static FILE *f;
static char *node_name_map_file = NULL;
static nn_map_t *node_name_map = NULL;
-Node *nodesdist[MAXHOPS+1]; /* last is Ca list */
-Node *mynode;
-int maxhops_discovered = 0;
-
-struct ChassisList *chassis = NULL;
-
-static char *
-get_linkwidth_str(int linkwidth)
+/**
+ * Define our own conversion functions to maintain compatibility with the old
+ * ibnetdiscover which did not use the ibmad conversion functions.
+ */
+char *dump_linkspeed_compat(uint32_t speed)
{
- if (linkwidth > 8)
- return linkwidth_str[0];
- else
- return linkwidth_str[linkwidth];
+ switch (speed) {
+ case 1:
+ return ("SDR");
+ break;
+ case 2:
+ return ("DDR");
+ break;
+ case 4:
+ return ("QDR");
+ break;
+ }
+ return ("???");
}
-static char *
-get_linkspeed_str(int linkspeed)
+char *dump_linkwidth_compat(uint32_t width)
{
- if (linkspeed > 4)
- return linkspeed_str[0];
- else
- return linkspeed_str[linkspeed];
+ switch (width) {
+ case 1:
+ return ("1x");
+ break;
+ case 2:
+ return ("4x");
+ break;
+ case 4:
+ return ("8x");
+ break;
+ case 8:
+ return ("12x");
+ break;
+ }
+ return ("??");
}
static inline const char*
-node_type_str2(Node *node)
+ports_nt_str_compat(ibnd_node_t *node)
{
switch(node->type) {
- case SWITCH_NODE: return "SW";
- case CA_NODE: return "CA";
- case ROUTER_NODE: return "RT";
+ case IB_NODE_SWITCH: return "SW";
+ case IB_NODE_CA: return "CA";
+ case IB_NODE_ROUTER: return "RT";
}
return "??";
}
-void
-decode_port_info(void *pi, Port *port)
-{
- mad_decode_field(pi, IB_PORT_LID_F, &port->lid);
- mad_decode_field(pi, IB_PORT_LMC_F, &port->lmc);
- mad_decode_field(pi, IB_PORT_STATE_F, &port->state);
- mad_decode_field(pi, IB_PORT_PHYS_STATE_F, &port->physstate);
- mad_decode_field(pi, IB_PORT_LINK_WIDTH_ACTIVE_F, &port->linkwidth);
- mad_decode_field(pi, IB_PORT_LINK_SPEED_ACTIVE_F, &port->linkspeed);
-}
-
-
-int
-get_port(Port *port, int portnum, ib_portid_t *portid)
-{
- char portinfo[64];
- void *pi = portinfo;
-
- port->portnum = portnum;
-
- if (!smp_query_via(pi, portid, IB_ATTR_PORT_INFO, portnum, timeout,
- srcport))
- return -1;
- decode_port_info(pi, port);
-
- DEBUG("portid %s portnum %d: lid %d state %d physstate %d %s %s",
- portid2str(portid), portnum, port->lid, port->state, port->physstate, get_linkwidth_str(port->linkwidth), get_linkspeed_str(port->linkspeed));
- return 1;
-}
-/*
- * Returns 0 if non switch node is found, 1 if switch is found, -1 if error.
- */
-int
-get_node(Node *node, Port *port, ib_portid_t *portid)
-{
- char portinfo[64];
- char switchinfo[64];
- void *pi = portinfo, *ni = node->nodeinfo, *nd = node->nodedesc;
- void *si = switchinfo;
-
- if (!smp_query_via(ni, portid, IB_ATTR_NODE_INFO, 0, timeout, srcport))
- return -1;
-
- mad_decode_field(ni, IB_NODE_GUID_F, &node->nodeguid);
- mad_decode_field(ni, IB_NODE_TYPE_F, &node->type);
- mad_decode_field(ni, IB_NODE_NPORTS_F, &node->numports);
- mad_decode_field(ni, IB_NODE_DEVID_F, &node->devid);
- mad_decode_field(ni, IB_NODE_VENDORID_F, &node->vendid);
- mad_decode_field(ni, IB_NODE_SYSTEM_GUID_F, &node->sysimgguid);
- mad_decode_field(ni, IB_NODE_PORT_GUID_F, &node->portguid);
- mad_decode_field(ni, IB_NODE_LOCAL_PORT_F, &node->localport);
- port->portnum = node->localport;
- port->portguid = node->portguid;
-
- if (!smp_query_via(nd, portid, IB_ATTR_NODE_DESC, 0, timeout, srcport))
- return -1;
-
- if (!smp_query_via(pi, portid, IB_ATTR_PORT_INFO, 0, timeout, srcport))
- return -1;
- decode_port_info(pi, port);
-
- if (node->type != SWITCH_NODE)
- return 0;
-
- node->smalid = port->lid;
- node->smalmc = port->lmc;
-
- /* after we have the sma information find out the real PortInfo for this port */
- if (!smp_query_via(pi, portid, IB_ATTR_PORT_INFO, node->localport,
- timeout, srcport))
- return -1;
- decode_port_info(pi, port);
-
- port->lid = node->smalid; /* LID is still defined by port 0 */
- port->lmc = node->smalmc;
-
- if (!smp_query_via(si, portid, IB_ATTR_SWITCH_INFO, 0, timeout, srcport))
- node->smaenhsp0 = 0; /* assume base SP0 */
- else
- mad_decode_field(si, IB_SW_ENHANCED_PORT0_F, &node->smaenhsp0);
-
- DEBUG("portid %s: got switch node %" PRIx64 " '%s'",
- portid2str(portid), node->nodeguid, node->nodedesc);
- return 1;
-}
-
-static int
-extend_dpath(ib_dr_path_t *path, int nextport)
-{
- if (path->cnt+2 >= sizeof(path->p))
- return -1;
- ++path->cnt;
- if (path->cnt > maxhops_discovered)
- maxhops_discovered = path->cnt;
- path->p[path->cnt] = (uint8_t) nextport;
- return path->cnt;
-}
-
-static void
-dump_endnode(ib_portid_t *path, char *prompt, Node *node, Port *port)
-{
- if (!dumplevel)
- return;
-
- fprintf(f, "%s -> %s %s {%016" PRIx64 "} portnum %d lid %d-%d\"%s\"\n",
- portid2str(path), prompt,
- (node->type <= IB_NODE_MAX ? node_type_str[node->type] : "???"),
- node->nodeguid, node->type == SWITCH_NODE ? 0 : port->portnum,
- port->lid, port->lid + (1 << port->lmc) - 1,
- clean_nodedesc(node->nodedesc));
-}
-
-#define HASHGUID(guid) ((uint32_t)(((uint32_t)(guid) * 101) ^ ((uint32_t)((guid) >> 32) * 103)))
-#define HTSZ 137
-
-static Node *nodestbl[HTSZ];
-
-static Node *
-find_node(Node *new)
-{
- int hash = HASHGUID(new->nodeguid) % HTSZ;
- Node *node;
-
- for (node = nodestbl[hash]; node; node = node->htnext)
- if (node->nodeguid == new->nodeguid)
- return node;
-
- return NULL;
-}
-
-static Node *
-create_node(Node *temp, ib_portid_t *path, int dist)
-{
- Node *node;
- int hash = HASHGUID(temp->nodeguid) % HTSZ;
-
- node = malloc(sizeof(*node));
- if (!node)
- return NULL;
-
- memcpy(node, temp, sizeof(*node));
- node->dist = dist;
- node->path = *path;
-
- node->htnext = nodestbl[hash];
- nodestbl[hash] = node;
-
- if (node->type != SWITCH_NODE)
- dist = MAXHOPS; /* special Ca list */
-
- node->dnext = nodesdist[dist];
- nodesdist[dist] = node;
-
- return node;
-}
-
-static Port *
-find_port(Node *node, Port *port)
-{
- Port *old;
-
- for (old = node->ports; old; old = old->next)
- if (old->portnum == port->portnum)
- return old;
-
- return NULL;
-}
-
-static Port *
-create_port(Node *node, Port *temp)
-{
- Port *port;
-
- port = malloc(sizeof(*port));
- if (!port)
- return NULL;
-
- memcpy(port, temp, sizeof(*port));
- port->node = node;
- port->next = node->ports;
- node->ports = port;
-
- return port;
-}
-
-static void
-link_ports(Node *node, Port *port, Node *remotenode, Port *remoteport)
-{
- DEBUG("linking: 0x%" PRIx64 " %p->%p:%u and 0x%" PRIx64 " %p->%p:%u",
- node->nodeguid, node, port, port->portnum,
- remotenode->nodeguid, remotenode, remoteport, remoteport->portnum);
- if (port->remoteport)
- port->remoteport->remoteport = NULL;
- if (remoteport->remoteport)
- remoteport->remoteport->remoteport = NULL;
- port->remoteport = remoteport;
- remoteport->remoteport = port;
-}
-
-static int
-handle_port(Node *node, Port *port, ib_portid_t *path, int portnum, int dist)
-{
- Node node_buf;
- Port port_buf;
- Node *remotenode, *oldnode;
- Port *remoteport, *oldport;
-
- memset(&node_buf, 0, sizeof(node_buf));
- memset(&port_buf, 0, sizeof(port_buf));
-
- DEBUG("handle node %p port %p:%d dist %d", node, port, portnum, dist);
- if (port->physstate != 5) /* LinkUp */
- return -1;
-
- if (extend_dpath(&path->drpath, portnum) < 0)
- return -1;
-
- if (get_node(&node_buf, &port_buf, path) < 0) {
- IBWARN("NodeInfo on %s failed, skipping port",
- portid2str(path));
- path->drpath.cnt--; /* restore path */
- return -1;
- }
-
- oldnode = find_node(&node_buf);
- if (oldnode)
- remotenode = oldnode;
- else if (!(remotenode = create_node(&node_buf, path, dist + 1)))
- IBERROR("no memory");
-
- oldport = find_port(remotenode, &port_buf);
- if (oldport) {
- remoteport = oldport;
- if (node != remotenode || port != remoteport)
- IBWARN("port moving...");
- } else if (!(remoteport = create_port(remotenode, &port_buf)))
- IBERROR("no memory");
-
- dump_endnode(path, oldnode ? "known remote" : "new remote",
- remotenode, remoteport);
-
- link_ports(node, port, remotenode, remoteport);
-
- path->drpath.cnt--; /* restore path */
- return 0;
-}
-
-/*
- * Return 1 if found, 0 if not, -1 on errors.
- */
-static int
-discover(ib_portid_t *from)
-{
- Node node_buf;
- Port port_buf;
- Node *node;
- Port *port;
- int i;
- int dist = 0;
- ib_portid_t *path;
-
- DEBUG("from %s", portid2str(from));
-
- memset(&node_buf, 0, sizeof(node_buf));
- memset(&port_buf, 0, sizeof(port_buf));
-
- if (get_node(&node_buf, &port_buf, from) < 0) {
- IBWARN("can't reach node %s", portid2str(from));
- return -1;
- }
-
- node = create_node(&node_buf, from, 0);
- if (!node)
- IBERROR("out of memory");
-
- mynode = node;
-
- port = create_port(node, &port_buf);
- if (!port)
- IBERROR("out of memory");
-
- if (node->type != SWITCH_NODE &&
- handle_port(node, port, from, node->localport, 0) < 0)
- return 0;
-
- for (dist = 0; dist < MAXHOPS; dist++) {
-
- for (node = nodesdist[dist]; node; node = node->dnext) {
-
- path = &node->path;
-
- DEBUG("dist %d node %p", dist, node);
- dump_endnode(path, "processing", node, port);
-
- for (i = 1; i <= node->numports; i++) {
- if (i == node->localport)
- continue;
-
- if (get_port(&port_buf, i, path) < 0) {
- IBWARN("can't reach node %s port %d", portid2str(path), i);
- continue;
- }
-
- port = find_port(node, &port_buf);
- if (port)
- continue;
-
- port = create_port(node, &port_buf);
- if (!port)
- IBERROR("out of memory");
-
- /* If switch, set port GUID to node GUID */
- if (node->type == SWITCH_NODE)
- port->portguid = node->portguid;
-
- handle_port(node, port, path, i, dist);
- }
- }
- }
-
- return 0;
-}
-
char *
-node_name(Node *node)
+node_name(ibnd_node_t *node)
{
static char buf[256];
switch(node->type) {
- case SWITCH_NODE:
+ case IB_NODE_SWITCH:
sprintf(buf, "\"%s", "S");
break;
- case CA_NODE:
+ case IB_NODE_CA:
sprintf(buf, "\"%s", "H");
break;
- case ROUTER_NODE:
+ case IB_NODE_ROUTER:
sprintf(buf, "\"%s", "R");
break;
default:
sprintf(buf, "\"%s", "?");
break;
}
- sprintf(buf+2, "-%016" PRIx64 "\"", node->nodeguid);
+ sprintf(buf+2, "-%016" PRIx64 "\"", node->guid);
return buf;
}
void
-list_node(Node *node)
+list_node(ibnd_node_t *node, void *user_data)
{
char *node_type;
- char *nodename = remap_node_name(node_name_map, node->nodeguid,
+ char *nodename = remap_node_name(node_name_map, node->guid,
node->nodedesc);
switch(node->type) {
- case SWITCH_NODE:
+ case IB_NODE_SWITCH:
node_type = "Switch";
break;
- case CA_NODE:
+ case IB_NODE_CA:
node_type = "Ca";
break;
- case ROUTER_NODE:
+ case IB_NODE_ROUTER:
node_type = "Router";
break;
default:
@@ -495,36 +159,58 @@ list_node(Node *node)
}
fprintf(f, "%s\t : 0x%016" PRIx64 " ports %d devid 0x%x vendid 0x%x \"%s\"\n",
node_type,
- node->nodeguid, node->numports, node->devid, node->vendid,
+ node->guid, node->numports,
+ mad_get_field(node->info, 0, IB_NODE_DEVID_F),
+ mad_get_field(node->info, 0, IB_NODE_VENDORID_F),
nodename);
free(nodename);
}
void
-out_ids(Node *node, int group, char *chname)
+list_nodes(ibnd_fabric_t *fabric, int list)
{
- fprintf(f, "\nvendid=0x%x\ndevid=0x%x\n", node->vendid, node->devid);
- if (node->sysimgguid)
- fprintf(f, "sysimgguid=0x%" PRIx64, node->sysimgguid);
+ if (list & LIST_CA_NODE) {
+ ibnd_iter_nodes_type(fabric, list_node, IB_NODE_CA, NULL);
+ }
+ if (list & LIST_SWITCH_NODE) {
+ ibnd_iter_nodes_type(fabric, list_node, IB_NODE_SWITCH, NULL);
+ }
+ if (list & LIST_ROUTER_NODE) {
+ ibnd_iter_nodes_type(fabric, list_node, IB_NODE_ROUTER, NULL);
+ }
+}
+
+void
+out_ids(ibnd_node_t *node, int group, char *chname)
+{
+ uint64_t sysimgguid = mad_get_field64(node->info, 0, IB_NODE_SYSTEM_GUID_F);
+
+ fprintf(f, "\nvendid=0x%x\ndevid=0x%x\n",
+ mad_get_field(node->info, 0, IB_NODE_VENDORID_F),
+ mad_get_field(node->info, 0, IB_NODE_DEVID_F));
+ if (sysimgguid)
+ fprintf(f, "sysimgguid=0x%" PRIx64, sysimgguid);
if (group
- && node->chrecord && node->chrecord->chassisnum) {
- fprintf(f, "\t\t# Chassis %d", node->chrecord->chassisnum);
+ && node->chassis && node->chassis->chassisnum) {
+ fprintf(f, "\t\t# Chassis %d", node->chassis->chassisnum);
if (chname)
- fprintf(f, " (%s)", chname);
- if (is_xsigo_tca(node->nodeguid) && node->ports->remoteport)
- fprintf(f, " slot %d", node->ports->remoteport->portnum);
+ fprintf(f, " (%s)", clean_nodedesc(chname));
+ if (ibnd_is_xsigo_tca(node->guid)
+ && node->ports[1]
+ && node->ports[1]->remoteport)
+ fprintf(f, " slot %d", node->ports[1]->remoteport->portnum);
}
fprintf(f, "\n");
}
uint64_t
-out_chassis(unsigned char chassisnum)
+out_chassis(ibnd_fabric_t *fabric, int chassisnum)
{
uint64_t guid;
fprintf(f, "\nChassis %d", chassisnum);
- guid = get_chassis_guid(chassisnum);
+ guid = ibnd_get_chassis_guid(fabric, chassisnum);
if (guid)
fprintf(f, " (guid 0x%" PRIx64 ")", guid);
fprintf(f, "\n");
@@ -532,29 +218,25 @@ out_chassis(unsigned char chassisnum)
}
void
-out_switch(Node *node, int group, char *chname)
+out_switch(ibnd_node_t *node, int group, char *chname)
{
char *str;
+ char str2[256];
char *nodename = NULL;
out_ids(node, group, chname);
- fprintf(f, "switchguid=0x%" PRIx64, node->nodeguid);
- fprintf(f, "(%" PRIx64 ")", node->portguid);
- /* Currently, only if Voltaire chassis */
- if (group
- && node->chrecord && node->chrecord->chassisnum
- && node->vendid == VTR_VENDOR_ID) {
- str = get_chassis_type(node->chrecord->chassistype);
+ fprintf(f, "switchguid=0x%" PRIx64, node->guid);
+ fprintf(f, "(%" PRIx64 ")", mad_get_field64(node->info, 0, IB_NODE_PORT_GUID_F));
+ if (group) {
+ str = ibnd_get_chassis_type(node);
if (str)
fprintf(f, "%s ", str);
- str = get_chassis_slot(node->chrecord->chassisslot);
+ str = ibnd_get_chassis_slot_str(node, str2, 256);
if (str)
- fprintf(f, "%s ", str);
- fprintf(f, "%d Chip %d", node->chrecord->slotnum, node->chrecord->anafanum);
+ fprintf(f, "%s", str);
}
- nodename = remap_node_name(node_name_map, node->nodeguid,
- node->nodedesc);
+ nodename = remap_node_name(node_name_map, node->guid, node->nodedesc);
fprintf(f, "\nSwitch\t%d %s\t\t# \"%s\" %s port 0 lid %d lmc %d\n",
node->numports, node_name(node),
@@ -566,20 +248,18 @@ out_switch(Node *node, int group, char *chname)
}
void
-out_ca(Node *node, int group, char *chname)
+out_ca(ibnd_node_t *node, int group, char *chname)
{
char *node_type;
char *node_type2;
- char *nodename = remap_node_name(node_name_map, node->nodeguid,
- node->nodedesc);
out_ids(node, group, chname);
switch(node->type) {
- case CA_NODE:
+ case IB_NODE_CA:
node_type = "ca";
node_type2 = "Ca";
break;
- case ROUTER_NODE:
+ case IB_NODE_ROUTER:
node_type = "rt";
node_type2 = "Rt";
break;
@@ -589,37 +269,41 @@ out_ca(Node *node, int group, char *chname)
break;
}
- fprintf(f, "%sguid=0x%" PRIx64 "\n", node_type, node->nodeguid);
+ fprintf(f, "%sguid=0x%" PRIx64 "\n", node_type, node->guid);
fprintf(f, "%s\t%d %s\t\t# \"%s\"",
node_type2, node->numports, node_name(node),
- nodename);
- if (group && is_xsigo_hca(node->nodeguid))
+ clean_nodedesc(node->nodedesc));
+ if (group && ibnd_is_xsigo_hca(node->guid))
fprintf(f, " (scp)");
fprintf(f, "\n");
-
- free(nodename);
}
+#define OUT_BUFFER_SIZE 16
static char *
-out_ext_port(Port *port, int group)
+out_ext_port(ibnd_port_t *port, int group)
{
- char *str = NULL;
+ static char mapping[OUT_BUFFER_SIZE];
- /* Currently, only if Voltaire chassis */
- if (group
- && port->node->chrecord && port->node->vendid == VTR_VENDOR_ID)
- str = portmapstring(port);
+ if (group && port->ext_portnum != 0) {
+ snprintf(mapping, OUT_BUFFER_SIZE,
+ "[ext %d]", port->ext_portnum);
+ return (mapping);
+ }
- return (str);
+ return (NULL);
}
void
-out_switch_port(Port *port, int group)
+out_switch_port(ibnd_port_t *port, int group)
{
char *ext_port_str = NULL;
char *rem_nodename = NULL;
+ uint32_t iwidth = mad_get_field(port->info, 0,
+ IB_PORT_LINK_WIDTH_ACTIVE_F);
+ uint32_t ispeed = mad_get_field(port->info, 0,
+ IB_PORT_LINK_SPEED_ACTIVE_F);
- DEBUG("port %p:%d remoteport %p", port, port->portnum, port->remoteport);
+ DEBUG("port %p:%d remoteport %p\n", port, port->portnum, port->remoteport);
fprintf(f, "[%d]", port->portnum);
ext_port_str = out_ext_port(port, group);
@@ -627,7 +311,7 @@ out_switch_port(Port *port, int group)
fprintf(f, "%s", ext_port_str);
rem_nodename = remap_node_name(node_name_map,
- port->remoteport->node->nodeguid,
+ port->remoteport->node->guid,
port->remoteport->node->nodedesc);
ext_port_str = out_ext_port(port->remoteport, group);
@@ -635,17 +319,19 @@ out_switch_port(Port *port, int group)
node_name(port->remoteport->node),
port->remoteport->portnum,
ext_port_str ? ext_port_str : "");
- if (port->remoteport->node->type != SWITCH_NODE)
- fprintf(f, "(%" PRIx64 ") ", port->remoteport->portguid);
+ if (port->remoteport->node->type != IB_NODE_SWITCH)
+ fprintf(f, "(%" PRIx64 ") ", port->remoteport->guid);
fprintf(f, "\t\t# \"%s\" lid %d %s%s",
rem_nodename,
- port->remoteport->node->type == SWITCH_NODE ? port->remoteport->node->smalid : port->remoteport->lid,
- get_linkwidth_str(port->linkwidth),
- get_linkspeed_str(port->linkspeed));
+ port->remoteport->node->type == IB_NODE_SWITCH ?
+ port->remoteport->node->smalid :
+ port->remoteport->base_lid,
+ dump_linkwidth_compat(iwidth),
+ dump_linkspeed_compat(ispeed));
- if (is_xsigo_tca(port->remoteport->portguid))
+ if (ibnd_is_xsigo_tca(port->remoteport->guid))
fprintf(f, " slot %d", port->portnum);
- else if (is_xsigo_hca(port->remoteport->portguid))
+ else if (ibnd_is_xsigo_hca(port->remoteport->guid))
fprintf(f, " (scp)");
fprintf(f, "\n");
@@ -653,281 +339,275 @@ out_switch_port(Port *port, int group)
}
void
-out_ca_port(Port *port, int group)
+out_ca_port(ibnd_port_t *port, int group)
{
char *str = NULL;
char *rem_nodename = NULL;
+ uint32_t iwidth = mad_get_field(port->info, 0,
+ IB_PORT_LINK_WIDTH_ACTIVE_F);
+ uint32_t ispeed = mad_get_field(port->info, 0,
+ IB_PORT_LINK_SPEED_ACTIVE_F);
fprintf(f, "[%d]", port->portnum);
- if (port->node->type != SWITCH_NODE)
- fprintf(f, "(%" PRIx64 ") ", port->portguid);
+ if (port->node->type != IB_NODE_SWITCH)
+ fprintf(f, "(%" PRIx64 ") ", port->guid);
fprintf(f, "\t%s[%d]",
node_name(port->remoteport->node),
port->remoteport->portnum);
str = out_ext_port(port->remoteport, group);
if (str)
fprintf(f, "%s", str);
- if (port->remoteport->node->type != SWITCH_NODE)
- fprintf(f, " (%" PRIx64 ") ", port->remoteport->portguid);
+ if (port->remoteport->node->type != IB_NODE_SWITCH)
+ fprintf(f, " (%" PRIx64 ") ", port->remoteport->guid);
rem_nodename = remap_node_name(node_name_map,
- port->remoteport->node->nodeguid,
+ port->remoteport->node->guid,
port->remoteport->node->nodedesc);
fprintf(f, "\t\t# lid %d lmc %d \"%s\" lid %d %s%s\n",
- port->lid, port->lmc, rem_nodename,
- port->remoteport->node->type == SWITCH_NODE ? port->remoteport->node->smalid : port->remoteport->lid,
- get_linkwidth_str(port->linkwidth),
- get_linkspeed_str(port->linkspeed));
+ port->base_lid, port->lmc, rem_nodename,
+ port->remoteport->node->type == IB_NODE_SWITCH ?
+ port->remoteport->node->smalid :
+ port->remoteport->base_lid,
+ dump_linkwidth_compat(iwidth),
+ dump_linkspeed_compat(ispeed));
free(rem_nodename);
}
+
+struct iter_user_data {
+ int group;
+ int skip_chassis_nodes;
+};
+
+static void
+switch_iter_func(ibnd_node_t *node, void *iter_user_data)
+{
+ ibnd_port_t *port;
+ int p = 0;
+ struct iter_user_data *data = (struct iter_user_data *)iter_user_data;
+
+ DEBUG("SWITCH: node %p\n", node);
+
+ /* skip chassis based switches if flagged */
+ if (data->skip_chassis_nodes && node->chassis && node->chassis->chassisnum)
+ return;
+
+ out_switch(node, data->group, NULL);
+ for (p = 1; p <= node->numports; p++) {
+ port = node->ports[p];
+ if (port && port->remoteport)
+ out_switch_port(port, data->group);
+ }
+}
+
+static void
+ca_iter_func(ibnd_node_t *node, void *iter_user_data)
+{
+ ibnd_port_t *port;
+ int p = 0;
+ struct iter_user_data *data = (struct iter_user_data *)iter_user_data;
+
+ DEBUG("CA: node %p\n", node);
+ /* Now, skip chassis based CAs */
+ if (data->group && node->chassis && node->chassis->chassisnum)
+ return;
+ out_ca(node, data->group, NULL);
+
+ for (p = 1; p <= node->numports; p++) {
+ port = node->ports[p];
+ if (port && port->remoteport)
+ out_ca_port(port, data->group);
+ }
+}
+
+static void
+router_iter_func(ibnd_node_t *node, void *iter_user_data)
+{
+ ibnd_port_t *port;
+ int p = 0;
+ struct iter_user_data *data = (struct iter_user_data *)iter_user_data;
+
+ DEBUG("RT: node %p\n", node);
+ /* Now, skip chassis based RTs */
+ if (data->group && node->chassis &&
+ node->chassis->chassisnum)
+ return;
+ out_ca(node, data->group, NULL);
+ for (p = 1; p <= node->numports; p++) {
+ port = node->ports[p];
+ if (port && port->remoteport)
+ out_ca_port(port, data->group);
+ }
+}
+
int
-dump_topology(int listtype, int group)
+dump_topology(int group, ibnd_fabric_t *fabric)
{
- Node *node;
- Port *port;
- int i = 0, dist = 0;
+ ibnd_node_t *node;
+ ibnd_port_t *port;
+ int i = 0, p = 0;
time_t t = time(0);
uint64_t chguid;
char *chname = NULL;
+ struct iter_user_data iter_user_data;
- if (!listtype) {
- fprintf(f, "#\n# Topology file: generated on %s#\n", ctime(&t));
- fprintf(f, "# Max of %d hops discovered\n", maxhops_discovered);
- fprintf(f, "# Initiated from node %016" PRIx64 " port %016" PRIx64 "\n", mynode->nodeguid, mynode->portguid);
- }
+ fprintf(f, "#\n# Topology file: generated on %s#\n", ctime(&t));
+ fprintf(f, "# Max of %d hops discovered\n", fabric->maxhops_discovered);
+ fprintf(f, "# Initiated from node %016" PRIx64 " port %016" PRIx64 "\n",
+ fabric->from_node->guid,
+ mad_get_field64(fabric->from_node->info, 0, IB_NODE_PORT_GUID_F));
/* Make pass on switches */
- if (group && !listtype) {
- ChassisList *ch = NULL;
+ if (group) {
+ ibnd_chassis_t *ch = NULL;
/* Chassis based switches first */
- for (ch = chassis; ch; ch = ch->next) {
+ for (ch = fabric->chassis; ch; ch = ch->next) {
int n = 0;
if (!ch->chassisnum)
continue;
- chguid = out_chassis(ch->chassisnum);
- if (chname)
- free(chname);
+ chguid = out_chassis(fabric, ch->chassisnum);
+
chname = NULL;
- if (is_xsigo_guid(chguid)) {
- for (node = nodesdist[MAXHOPS]; node; node = node->dnext) {
- if (!node->chrecord ||
- !node->chrecord->chassisnum)
- continue;
-
- if (node->chrecord->chassisnum != ch->chassisnum)
- continue;
-
- if (is_xsigo_hca(node->nodeguid)) {
- chname = remap_node_name(node_name_map,
- node->nodeguid,
- node->nodedesc);
- fprintf(f, "Hostname: %s\n", chname);
+/**
+ * Will this work for Xsigo?
+ */
+ if (ibnd_is_xsigo_guid(chguid)) {
+ for (node = ch->nodes; node;
+ node = node->next_chassis_node) {
+ if (ibnd_is_xsigo_hca(node->guid)) {
+ chname = node->nodedesc;
+ fprintf(f, "Hostname: %s\n", clean_nodedesc(node->nodedesc));
}
}
}
fprintf(f, "\n# Spine Nodes");
- for (n = 1; n <= (SPINES_MAX_NUM+1); n++) {
+ for (n = 1; n <= SPINES_MAX_NUM; n++) {
if (ch->spinenode[n]) {
out_switch(ch->spinenode[n], group, chname);
- for (port = ch->spinenode[n]->ports; port; port = port->next, i++)
- if (port->remoteport)
+ for (p = 1; p <= ch->spinenode[n]->numports; p++) {
+ port = ch->spinenode[n]->ports[p];
+ if (port && port->remoteport)
out_switch_port(port, group);
+ }
}
}
fprintf(f, "\n# Line Nodes");
- for (n = 1; n <= (LINES_MAX_NUM+1); n++) {
+ for (n = 1; n <= LINES_MAX_NUM; n++) {
if (ch->linenode[n]) {
out_switch(ch->linenode[n], group, chname);
- for (port = ch->linenode[n]->ports; port; port = port->next, i++)
- if (port->remoteport)
+ for (p = 1; p <= ch->linenode[n]->numports; p++) {
+ port = ch->linenode[n]->ports[p];
+ if (port && port->remoteport)
out_switch_port(port, group);
+ }
}
}
fprintf(f, "\n# Chassis Switches");
- for (dist = 0; dist <= maxhops_discovered; dist++) {
-
- for (node = nodesdist[dist]; node; node = node->dnext) {
-
- /* Non Voltaire chassis */
- if (node->vendid == VTR_VENDOR_ID)
- continue;
- if (!node->chrecord ||
- !node->chrecord->chassisnum)
- continue;
-
- if (node->chrecord->chassisnum != ch->chassisnum)
- continue;
-
+ for (node = ch->nodes; node;
+ node = node->next_chassis_node) {
+ if (node->type == IB_NODE_SWITCH) {
out_switch(node, group, chname);
- for (port = node->ports; port; port = port->next, i++)
- if (port->remoteport)
+ for (p = 1; p <= node->numports; p++) {
+ port = node->ports[p];
+ if (port && port->remoteport)
out_switch_port(port, group);
-
+ }
}
}
fprintf(f, "\n# Chassis CAs");
- for (node = nodesdist[MAXHOPS]; node; node = node->dnext) {
- if (!node->chrecord ||
- !node->chrecord->chassisnum)
- continue;
-
- if (node->chrecord->chassisnum != ch->chassisnum)
- continue;
-
- out_ca(node, group, chname);
- for (port = node->ports; port; port = port->next, i++)
- if (port->remoteport)
- out_ca_port(port, group);
-
+ for (node = ch->nodes; node;
+ node = node->next_chassis_node) {
+ if (node->type == IB_NODE_CA) {
+ out_ca(node, group, chname);
+ for (p = 1; p <= node->numports; p++) {
+ port = node->ports[p];
+ if (port && port->remoteport)
+ out_ca_port(port, group);
+ }
+ }
}
}
- } else {
- for (dist = 0; dist <= maxhops_discovered; dist++) {
-
- for (node = nodesdist[dist]; node; node = node->dnext) {
- DEBUG("SWITCH: dist %d node %p", dist, node);
- if (!listtype)
- out_switch(node, group, chname);
- else {
- if (listtype & LIST_SWITCH_NODE)
- list_node(node);
- continue;
- }
-
- for (port = node->ports; port; port = port->next, i++)
- if (port->remoteport)
- out_switch_port(port, group);
- }
- }
+ } else { /* !group */
+ iter_user_data.group = group;
+ iter_user_data.skip_chassis_nodes = 0;
+ ibnd_iter_nodes_type(fabric, switch_iter_func,
+ IB_NODE_SWITCH, &iter_user_data);
}
- if (chname)
- free(chname);
chname = NULL;
- if (group && !listtype) {
+ if (group) {
+ iter_user_data.group = group;
+ iter_user_data.skip_chassis_nodes = 1;
fprintf(f, "\nNon-Chassis Nodes\n");
- for (dist = 0; dist <= maxhops_discovered; dist++) {
-
- for (node = nodesdist[dist]; node; node = node->dnext) {
-
- DEBUG("SWITCH: dist %d node %p", dist, node);
- /* Now, skip chassis based switches */
- if (node->chrecord &&
- node->chrecord->chassisnum)
- continue;
- out_switch(node, group, chname);
-
- for (port = node->ports; port; port = port->next, i++)
- if (port->remoteport)
- out_switch_port(port, group);
- }
-
- }
-
+ ibnd_iter_nodes_type(fabric, switch_iter_func,
+ IB_NODE_SWITCH, &iter_user_data);
}
+ iter_user_data.group = group;
+ iter_user_data.skip_chassis_nodes = 0;
/* Make pass on CAs */
- for (node = nodesdist[MAXHOPS]; node; node = node->dnext) {
+ ibnd_iter_nodes_type(fabric, ca_iter_func, IB_NODE_CA,
+ &iter_user_data);
- DEBUG("CA: dist %d node %p", dist, node);
- if (!listtype) {
- /* Now, skip chassis based CAs */
- if (group && node->chrecord &&
- node->chrecord->chassisnum)
- continue;
- out_ca(node, group, chname);
- } else {
- if (((listtype & LIST_CA_NODE) && (node->type == CA_NODE)) ||
- ((listtype & LIST_ROUTER_NODE) && (node->type == ROUTER_NODE)))
- list_node(node);
- continue;
- }
-
- for (port = node->ports; port; port = port->next, i++)
- if (port->remoteport)
- out_ca_port(port, group);
- }
-
- if (chname)
- free(chname);
+ /* make pass on routers */
+ ibnd_iter_nodes_type(fabric, router_iter_func, IB_NODE_ROUTER,
+ &iter_user_data);
return i;
}
-void dump_ports_report ()
+void dump_ports_report (ibnd_node_t *node, void *user_data)
{
- int b, n = 0, p;
- Node *node;
- Port *port;
-
- /*
- * If switch and LID == 0, search of other switch ports with
- * valid LID and assign it to all ports of that switch
- */
- for (b = 0; b <= MAXHOPS; b++)
- for (node = nodesdist[b]; node; node = node->dnext)
- if (node->type == SWITCH_NODE) {
- int swlid = 0;
- for (p = 0, port = node->ports;
- p < node->numports && port && !swlid;
- port = port->next)
- if (port->lid != 0)
- swlid = port->lid;
- for (p = 0, port = node->ports;
- p < node->numports && port;
- port = port->next)
- port->lid = swlid;
- }
-
- for (b = 0; b <= MAXHOPS; b++)
- for (node = nodesdist[b]; node; node = node->dnext) {
- for (p = 0, port = node->ports;
- p < node->numports && port;
- p++, port = port->next) {
- fprintf(stdout,
- "%2s %5d %2d 0x%016" PRIx64 " %s %s",
- node_type_str2(port->node), port->lid,
- port->portnum,
- port->portguid,
- get_linkwidth_str(port->linkwidth),
- get_linkspeed_str(port->linkspeed));
- if (port->remoteport)
- fprintf(stdout,
- " - %2s %5d %2d 0x%016" PRIx64
- " ( '%s' - '%s' )\n",
- node_type_str2(port->remoteport->node),
- port->remoteport->lid,
- port->remoteport->portnum,
- port->remoteport->portguid,
- remap_node_name(node_name_map,
- port->node->nodeguid,
- port->node->nodedesc),
- remap_node_name(node_name_map,
- port->remoteport->node->nodeguid,
- port->remoteport->node->nodedesc));
- else
- fprintf(stdout, "%36s'%s'\n", "",
- remap_node_name(node_name_map,
- port->node->nodeguid,
- port->node->nodedesc));
-
- }
- n++;
- }
+ int p = 0;
+ ibnd_port_t *port = NULL;
+
+ /* for each port */
+ for (p = node->numports, port = node->ports[p];
+ p > 0;
+ port = node->ports[--p]) {
+ uint32_t iwidth, ispeed;
+ if (port == NULL)
+ continue;
+ 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);
+ fprintf(stdout,
+ "%2s %5d %2d 0x%016" PRIx64 " %s %s",
+ ports_nt_str_compat(node),
+ node->type == IB_NODE_SWITCH ?
+ node->smalid : port->base_lid,
+ port->portnum,
+ port->guid,
+ dump_linkwidth_compat(iwidth),
+ dump_linkspeed_compat(ispeed));
+ if (port->remoteport)
+ fprintf(stdout,
+ " - %2s %5d %2d 0x%016" PRIx64
+ " ( '%s' - '%s' )\n",
+ ports_nt_str_compat(port->remoteport->node),
+ port->remoteport->node->type == IB_NODE_SWITCH ?
+ port->remoteport->node->smalid :
+ port->remoteport->base_lid,
+ port->remoteport->portnum,
+ port->remoteport->guid,
+ port->node->nodedesc,
+ port->remoteport->node->nodedesc);
+ else
+ fprintf(stdout, "%36s'%s'\n", "",
+ port->node->nodedesc);
+ }
}
static int list, group, ports_report;
@@ -939,7 +619,7 @@ static int process_opt(void *context, int ch, char *optarg)
node_name_map_file = strdup(optarg);
break;
case 's':
- dumplevel = 1;
+ ibnd_show_progress(1);
break;
case 'l':
list = LIST_CA_NODE | LIST_SWITCH_NODE | LIST_ROUTER_NODE;
@@ -968,8 +648,7 @@ static int process_opt(void *context, int ch, char *optarg)
int main(int argc, char **argv)
{
- int mgmt_classes[2] = {IB_SMI_CLASS, IB_SMI_DIRECT_CLASS};
- ib_portid_t my_portid = {0};
+ ibnd_fabric_t *fabric = NULL;
const struct ibdiag_opt opts[] = {
{ "show", 's', 0, NULL, "show more information" },
@@ -996,29 +675,28 @@ int main(int argc, char **argv)
timeout = ibd_timeout;
if (ibverbose)
- dumplevel = 1;
+ ibnd_debug(1);
if (argc && !(f = fopen(argv[0], "w")))
IBERROR("can't open file %s for writing", argv[0]);
- srcport = mad_rpc_open_port(ibd_ca, ibd_ca_port, mgmt_classes, 2);
- if (!srcport)
- IBERROR("Failed to open '%s' port '%d'", ibd_ca, ibd_ca_port);
-
node_name_map = open_node_name_map(node_name_map_file);
- if (discover(&my_portid) < 0)
- IBERROR("discover");
-
- if (group)
- chassis = group_nodes();
+ if ((fabric = ibnd_discover_fabric(ibd_ca, ibd_ca_port, ibd_timeout, NULL, -1)) == NULL) {
+ fprintf(stderr, "discover failed\n");
+ exit(1);
+ }
if (ports_report)
- dump_ports_report();
+ ibnd_iter_nodes(fabric,
+ dump_ports_report,
+ NULL);
+ else if (list)
+ list_nodes(fabric, list);
else
- dump_topology(list, group);
+ dump_topology(group, fabric);
+ ibnd_destroy_fabric(fabric);
close_node_name_map(node_name_map);
- mad_rpc_close_port(srcport);
exit(0);
}
--
1.5.4.5
More information about the general
mailing list