infiniband-diags: Fix IB network discovery from switch node.

PATCH Applied Ira Weiny 5 participants 6 messages Sep 24, 2009 – Oct 23, 2009 4 messages not in the archive InfiniBand

lore

Share & tools

lore

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

Ira Weiny

author

2009-09-24 00:24 UTC #1 lore raw

Eli,

Quoted 1 line · On Wed, 26 Aug 2009 17:37:30 +0300 "Eli Dorfman (Voltaire)"…

Subject: [PATCH] Fix IB network discovery from switch node.

Sorry for the late inquiry on this but what exactly was the bug here?

I just found that this change introduced a bug. The problem is that if you don't do this query, even when the first found node is a switch, the port you came into the switch on will not get reported properly. Here is what I mean.

Running with the current master:

17:19:42 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:

           8    1[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
...
           8    9[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   10[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>      15   24[  ] "ISR9024D Voltaire" ( )
           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>             [  ] "" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )

...

The DR path "came in" on port 12 and is reported as Active/LinkUp but has no information on the other end. Here is what the output should look like with your change removed.

17:22:36 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:

           8    1[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
...
           8    9[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   10[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>      15   24[  ] "ISR9024D Voltaire" ( )
           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>       7    8[  ] "Cisco Switch SFS7000D" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )

...

This properly reports the other end of this link as another switch.

Could you explain the problem a bit more so we can come up with a better solution?

Thanks,
Ira

Quoted 43 lines

Signed-off-by Eli Dorfman <[email protected]>

---
 infiniband-diags/libibnetdisc/src/ibnetdisc.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

infiniband-diags/libibnetdisc/src/ibnetdisc.c +9 -7

index c69467e..779e659 100644
@@ -590,13 +590,15 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,
 	if (!port)
 		goto error;
 
-	rc = get_remote_node(ibmad_port, fabric, node, port, from,
-			     mad_get_field(node->info, 0,
-					   IB_NODE_LOCAL_PORT_F), 0);
-	if (rc < 0)
-		goto error;
-	if (rc > 0)		/* non-fatal error, nothing more to be done */
-		return ((ibnd_fabric_t *) fabric);
+	if (node->node.type != IB_NODE_SWITCH) { 
+		rc = get_remote_node(ibmad_port, fabric, node, port, from,
+				     mad_get_field(node->info, 0,
+						   IB_NODE_LOCAL_PORT_F), 0);
+		if (rc < 0)
+			goto error;
+		if (rc > 0)		/* non-fatal error, nothing more to be done */
+			return ((ibnd_fabric_t *) fabric);
+	}
 
 	for (dist = 0; dist <= max_hops; dist++) {

Signature · 8 lines

1.5.5

_______________________________________________
general mailing list
[email protected]
http://*lists.openfabrics.org/cgi-bin/mailman/listinfo/general

To unsubscribe, please visit http://*openib.org/mailman/listinfo/openib-general

Signature · 5 lines

Ira Weiny
Math Programmer/Computer Scientist
Lawrence Livermore National Lab
925-423-8008
[email protected]

Eli Dorfman (Voltaire)

2009-09-29 16:16 UTC #2 lore raw

Quoted 8 lines · Ira Weiny

Eli,
Quoted 1 line · On Wed, 26 Aug 2009 17:37:30 +0300 "Eli Dorfman (Voltaire)"…
Subject: [PATCH] Fix IB network discovery from switch node.
Sorry for the late inquiry on this but what exactly was the bug here?

Sorry for the late response.
The problem is related to wrong discovery when running from the switch. Without the patch ibnetdiscover finds only local switch

4036% ibnetdiscover

ibwarn: [2833] mad_rpc: _do_madrpc failed; dport (DR path slid 0; dlid 0; 0,0)
ibwarn: [2833] get_remote_node: NodeInfo on DR path slid 0; dlid 0; 0,0 failed, skipping port #
# Topology file: generated on Tue Sep 29 15:29:50 2009
#
# Max of 1 hops discovered
# Initiated from node 0008f1050010006e port 0008f1050010006e

vendid=0x8f1
devid=0x5a5a
sysimgguid=0x8f1050010006f
switchguid=0x8f1050010006e(8f1050010006e)
Switch 36 "S-0008f1050010006e" # "Voltaire 4036 - 36 QDR ports switch" enhanced port 0 lid 1 lmc 0

With the patch we see the switch is connected to 2 HCAs

#
# Topology file: generated on Tue Sep 29 15:19:24 2009 #
# Max of 1 hops discovered
# Initiated from node 0008f1050010006e port 0008f1050010006e

vendid=0x8f1
devid=0x5a5a
sysimgguid=0x8f1050010006f
switchguid=0x8f1050010006e(8f1050010006e)

Switch  36 "S-0008f1050010006e"         # "Voltaire 4036 - 36 QDR ports switch" enhanced port 0 lid 1 lmc 0
[24]    "H-0008f104039a0198"[2](8f104039a019a)          # "luna6 HCA-1" lid 3 4xQDR
[29]    "H-0008f1040399f444"[2](8f1040399f446)          # "localhost HCA-1" lid 2 4xQDR

vendid=0x2c9
devid=0x673c
sysimgguid=0x8f1040399f447
caguid=0x8f1040399f444
Ca 2 "H-0008f1040399f444" # "localhost HCA-1"
[2](8f1040399f446) "S-0008f1050010006e"[29] # lid 2 lmc 0 "Voltaire 4036 - 36 QDR ports switch" lid 1 4xQDR

vendid=0x2c9
devid=0x673c
sysimgguid=0x8f104039a019b
caguid=0x8f104039a0198
Ca 2 "H-0008f104039a0198" # "luna6 HCA-1"
[2](8f104039a019a) "S-0008f1050010006e"[24] # lid 3 lmc 0 "Voltaire 4036 - 36 QDR ports switch" lid 1 4xQDR

Quoted 31 lines

I just found that this change introduced a bug. The problem is that if you don't do this query, even when the first found node is a switch, the port you came into the switch on will not get reported properly. Here is what I mean.
Running with the current master:
17:19:42 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:
           8    1[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
...
           8    9[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   10[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>      15   24[  ] "ISR9024D Voltaire" ( )
           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>             [  ] "" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
...
The DR path "came in" on port 12 and is reported as Active/LinkUp but has no information on the other end. Here is what the output should look like with your change removed.
17:22:36 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:
           8    1[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
...
           8    9[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   10[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>      15   24[  ] "ISR9024D Voltaire" ( )
           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>       7    8[  ] "Cisco Switch SFS7000D" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )

Quoted 6 lines

...
This properly reports the other end of this link as another switch.
Could you explain the problem a bit more so we can come up with a better solution?

I think that the problem is related to NodeInfo:LocalPort which is 0 in case of a switch.
I see that get_remote_node() sends direct route MAD to switch with path 0,0 and that fails (at least for Mellanox IS4 switch chips). Another way to bypass this may be as follows:

infiniband-diags/libibnetdisc/src/ibnetdisc.c +1 -1

index 1e93ff8..3dd0dc6 100644
@@ -461,7 +461,7 @@ get_remote_node(struct ibnd_fabric *fabric, struct ibnd_node *node, struct ibnd_
 			!= IB_PORT_PHYS_STATE_LINKUP)
 		return -1;
 
-	if (extend_dpath(fabric, path, portnum) < 0)
+	if (portnum > 0 && extend_dpath(fabric, path, portnum) < 0)
 		return -1;
 
 	if (query_node(fabric, &node_buf, &port_buf, path)) {

Please check whether this is OK and I can send a new patch.

Thanks,
Eli

Quoted 48 lines

Thanks,
Ira

Quoted 42 lines

Signed-off-by Eli Dorfman <[email protected]>

---
 infiniband-diags/libibnetdisc/src/ibnetdisc.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

infiniband-diags/libibnetdisc/src/ibnetdisc.c +9 -7

index c69467e..779e659 100644
@@ -590,13 +590,15 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,
 	if (!port)
 		goto error;
 
-	rc = get_remote_node(ibmad_port, fabric, node, port, from,
-			     mad_get_field(node->info, 0,
-					   IB_NODE_LOCAL_PORT_F), 0);
-	if (rc < 0)
-		goto error;
-	if (rc > 0)		/* non-fatal error, nothing more to be done */
-		return ((ibnd_fabric_t *) fabric);
+	if (node->node.type != IB_NODE_SWITCH) { 
+		rc = get_remote_node(ibmad_port, fabric, node, port, from,
+				     mad_get_field(node->info, 0,
+						   IB_NODE_LOCAL_PORT_F), 0);
+		if (rc < 0)
+			goto error;
+		if (rc > 0)		/* non-fatal error, nothing more to be done */
+			return ((ibnd_fabric_t *) fabric);
+	}
 
 	for (dist = 0; dist <= max_hops; dist++) {

Signature · 8 lines

1.5.5

_______________________________________________
general mailing list
[email protected]
http://*lists.openfabrics.org/cgi-bin/mailman/listinfo/general

To unsubscribe, please visit http://*openib.org/mailman/listinfo/openib-general

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

Ira Weiny

2009-09-29 23:48 UTC #4 lore raw

Quoted 6 lines · On Tue, 29 Sep 2009 18:16:21 +0200 "Eli Dorfman (Voltaire)"…

Quoted 5 lines · Ira Weiny
Eli,
On Wed, 26 Aug 2009 17:37:30 +0300
"Eli Dorfman (Voltaire)" <[email protected]> wrote:

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
Subject: [PATCH] Fix IB network discovery from switch node.
Sorry for the late inquiry on this but what exactly was the bug here?
Sorry for the late response.
The problem is related to wrong discovery when running from the switch. Without the patch ibnetdiscover finds only local switch

Ok I see.

[snip]

Quoted 20 lines

I think that the problem is related to NodeInfo:LocalPort which is 0 in case of a switch.
I see that get_remote_node() sends direct route MAD to switch with path 0,0 and that fails (at least for Mellanox IS4 switch chips). Another way to bypass this may be as follows:
infiniband-diags/libibnetdisc/src/ibnetdisc.c +1 -1
index 1e93ff8..3dd0dc6 100644
@@ -461,7 +461,7 @@ get_remote_node(struct ibnd_fabric *fabric, struct ibnd_node *node, struct ibnd_
 			!= IB_PORT_PHYS_STATE_LINKUP)
 		return -1;
 
-	if (extend_dpath(fabric, path, portnum) < 0)
+	if (portnum > 0 && extend_dpath(fabric, path, portnum) < 0)
 		return -1;
 
 	if (query_node(fabric, &node_buf, &port_buf, path)) {

Quoted 2 lines

Please check whether this is OK and I can send a new patch.

This seems to fix my issue. Here is a patch against master which works for me. If you want to verify that would be great.

Thanks for helping me out,
Ira

From: Ira Weiny <[email protected]>
Date: Tue, 22 Sep 2009 11:08:28 -0700
Subject: [PATCH] infiniband-diags/libibnetdisc/src/ibnetdisc.c: fix bug in single node processing.

Eli fixed an issue with running ibnetdiscover from a switch but it introduced a bug in processing a single switch:

17:19:42 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:
...

           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>             [  ] "" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )

...

The port we "come in on" when discovering the switch is not reported properly.

This patch, suggested by Eli, reverses Eli's patch and fixes his original bug in a way which does not introduce the above issue.

Signed-off-by Ira Weiny <[email protected]>

---
 infiniband-diags/libibnetdisc/src/ibnetdisc.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

infiniband-diags/libibnetdisc/src/ibnetdisc.c +8 ~~-10~~

index 97e369c..96f72c5 100644
@@ -506,7 +506,7 @@ static int get_remote_node(struct ibmad_port *ibmad_port,
 	    != IB_PORT_PHYS_STATE_LINKUP)
 		return 1;	/* positive == non-fatal error */
 
-	if (extend_dpath(ibmad_port, fabric, path, portnum) < 0)
+	if (portnum > 0 && extend_dpath(ibmad_port, fabric, path, portnum) < 0)
 		return -1;
 
 	if (query_node(ibmad_port, fabric, &node_buf, &port_buf, path)) {

@@ -600,15 +600,13 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,
 	if (!port)
 		goto error;
 
-	if (node->type != IB_NODE_SWITCH) {
-		rc = get_remote_node(ibmad_port, fabric, node, port, from,
-				     mad_get_field(node->info, 0,
-						   IB_NODE_LOCAL_PORT_F), 0);
-		if (rc < 0)
-			goto error;
-		if (rc > 0)		/* non-fatal error, nothing more to be done */
-			return ((ibnd_fabric_t *) fabric);
-	}
+	rc = get_remote_node(ibmad_port, fabric, node, port, from,
+			     mad_get_field(node->info, 0,
+					   IB_NODE_LOCAL_PORT_F), 0);
+	if (rc < 0)
+		goto error;
+	if (rc > 0)		/* non-fatal error, nothing more to be done */
+		return ((ibnd_fabric_t *) fabric);
 
 	for (dist = 0; dist <= max_hops; dist++) {

Signature · 8 lines

1.5.4.5



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

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

Eli Dorfman (Voltaire)

2009-09-30 08:33 UTC #6 lore raw

Quoted 35 lines · Ira Weiny

Quoted 11 lines · On Tue, 29 Sep 2009 18:16:21 +0200 "Eli Dorfman (Voltaire)"…
Quoted 7 lines · Ira Weiny
Eli,
Quoted 1 line · On Wed, 26 Aug 2009 17:37:30 +0300 "Eli Dorfman (Voltaire)"…
Subject: [PATCH] Fix IB network discovery from switch node.
Sorry for the late inquiry on this but what exactly was the bug here?
Sorry for the late response.
The problem is related to wrong discovery when running from the switch. Without the patch ibnetdiscover finds only local switch
Ok I see.
[snip]
Quoted 16 lines
I think that the problem is related to NodeInfo:LocalPort which is 0 in case of a switch.
I see that get_remote_node() sends direct route MAD to switch with path 0,0 and that fails (at least for Mellanox IS4 switch chips). Another way to bypass this may be as follows:
infiniband-diags/libibnetdisc/src/ibnetdisc.c +1 -1
index 1e93ff8..3dd0dc6 100644
@@ -461,7 +461,7 @@ get_remote_node(struct ibnd_fabric *fabric, struct ibnd_node *node, struct ibnd_
 			!= IB_PORT_PHYS_STATE_LINKUP)
 		return -1;
 
-	if (extend_dpath(fabric, path, portnum) < 0)
+	if (portnum > 0 && extend_dpath(fabric, path, portnum) < 0)
 		return -1;
 

Quoted 8 lines

Quoted 5 lines
infiniband-diags/libibnetdisc/src/ibnetdisc.c +0 -0
 	if (query_node(fabric, &node_buf, &port_buf, path)) {
Please check whether this is OK and I can send a new patch.
This seems to fix my issue. Here is a patch against master which works for me. If you want to verify that would be great.

Verified this again and it works.
Sasha, please apply this patch.

Thanks,
Eli

Quoted 55 lines

Thanks for helping me out,
Ira
From: Ira Weiny <[email protected]>
Date: Tue, 22 Sep 2009 11:08:28 -0700
Subject: [PATCH] infiniband-diags/libibnetdisc/src/ibnetdisc.c: fix bug in single node processing.
Eli fixed an issue with running ibnetdiscover from a switch but it introduced a bug in processing a single switch:
17:19:42 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:
...
           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>             [  ] "" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
...
The port we "come in on" when discovering the switch is not reported properly.
This patch, suggested by Eli, reverses Eli's patch and fixes his original bug in a way which does not introduce the above issue.
Signed-off-by Ira Weiny <[email protected]>
---
 infiniband-diags/libibnetdisc/src/ibnetdisc.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
infiniband-diags/libibnetdisc/src/ibnetdisc.c +1 ~~-10~~
index 97e369c..96f72c5 100644
@@ -506,7 +506,7 @@ static int get_remote_node(struct ibmad_port *ibmad_port,
 	    != IB_PORT_PHYS_STATE_LINKUP)
 		return 1;	/* positive == non-fatal error */
 
-	if (extend_dpath(ibmad_port, fabric, path, portnum) < 0)
+	if (portnum > 0 && extend_dpath(ibmad_port, fabric, path, portnum) < 0)
 		return -1;
 
 	if (query_node(ibmad_port, fabric, &node_buf, &port_buf, path)) {
@@ -600,15 +600,13 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,
 	if (!port)
 		goto error;
 
-	if (node->type != IB_NODE_SWITCH) {
-		rc = get_remote_node(ibmad_port, fabric, node, port, from,
-				     mad_get_field(node->info, 0,
-						   IB_NODE_LOCAL_PORT_F), 0);
-		if (rc < 0)
-			goto error;
-		if (rc > 0)		/* non-fatal error, nothing more to be done */
-			return ((ibnd_fabric_t *) fabric);
-	}

infiniband-diags/libibnetdisc/src/ibnetdisc.c ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port, · line 612

Quoted 10 lines

infiniband-diags/libibnetdisc/src/ibnetdisc.c +7 -0

+	rc = get_remote_node(ibmad_port, fabric, node, port, from,
+			     mad_get_field(node->info, 0,
+					   IB_NODE_LOCAL_PORT_F), 0);
+	if (rc < 0)
+		goto error;
+	if (rc > 0)		/* non-fatal error, nothing more to be done */
+		return ((ibnd_fabric_t *) fabric);
 
 	for (dist = 0; dist <= max_hops; dist++) {

--
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

Ira Weiny

2009-10-07 17:35 UTC #7 lore raw

In reply to a message not in the archive

Sasha,

Perhaps you missed this patch the first time around. Eli, verified that it worked for him on the switch as well as works for me. This applies to current master as is.

Eli, I added you as signing off on this.

Thanks guys,
Ira

From: Ira Weiny <[email protected]>
Date: Tue, 22 Sep 2009 11:08:28 -0700
Subject: [PATCH] infiniband-diags/libibnetdisc/src/ibnetdisc.c: fix bug in single node processing.

Eli fixed an issue with running ibnetdiscover from a switch but it introduced a bug in processing a single switch:

17:19:42 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:
...

           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>             [  ] "" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )

...

The port we "come in on" when discovering the switch is not reported properly.

This patch reverses Eli's patch and fixes his original bug in a way which does not introduce the above issue.

Signed-off-by Ira Weiny <[email protected]>

Signed-off-by "Eli Dorfman (Voltaire)" <[email protected]>

---
 infiniband-diags/libibnetdisc/src/ibnetdisc.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

infiniband-diags/libibnetdisc/src/ibnetdisc.c +8 ~~-10~~

index 97e369c..96f72c5 100644
@@ -506,7 +506,7 @@ static int get_remote_node(struct ibmad_port *ibmad_port,
 	    != IB_PORT_PHYS_STATE_LINKUP)
 		return 1;	/* positive == non-fatal error */
 
-	if (extend_dpath(ibmad_port, fabric, path, portnum) < 0)
+	if (portnum > 0 && extend_dpath(ibmad_port, fabric, path, portnum) < 0)
 		return -1;
 
 	if (query_node(ibmad_port, fabric, &node_buf, &port_buf, path)) {

@@ -600,15 +600,13 @@ ibnd_fabric_t *ibnd_discover_fabric(struct ibmad_port * ibmad_port,
 	if (!port)
 		goto error;
 
-	if (node->type != IB_NODE_SWITCH) {
-		rc = get_remote_node(ibmad_port, fabric, node, port, from,
-				     mad_get_field(node->info, 0,
-						   IB_NODE_LOCAL_PORT_F), 0);
-		if (rc < 0)
-			goto error;
-		if (rc > 0)		/* non-fatal error, nothing more to be done */
-			return ((ibnd_fabric_t *) fabric);
-	}
+	rc = get_remote_node(ibmad_port, fabric, node, port, from,
+			     mad_get_field(node->info, 0,
+					   IB_NODE_LOCAL_PORT_F), 0);
+	if (rc < 0)
+		goto error;
+	if (rc > 0)		/* non-fatal error, nothing more to be done */
+		return ((ibnd_fabric_t *) fabric);
 
 	for (dist = 0; dist <= max_hops; dist++) {

Signature · 6 lines

1.5.4.5

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

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

Sasha Khapyorsky

Applied

2009-10-23 03:14 UTC #9 lore raw

Hi Ira,

Quoted 2 lines · Ira Weiny

Perhaps you missed this patch the first time around.

Right, I missed this masked inside this email message.

And yes, it would be better to send a patches as separate emails. And of course you can still use In-Replay-To: email header line to keep a discussion thread.

Quoted 22 lines

Eli, verified that it worked for him on the switch as well as works for me. This applies to current master as is.
Eli, I added you as signing off on this.
Thanks guys,
Ira
From: Ira Weiny <[email protected]>
Date: Tue, 22 Sep 2009 11:08:28 -0700
Subject: [PATCH] infiniband-diags/libibnetdisc/src/ibnetdisc.c: fix bug in single node processing.
Eli fixed an issue with running ibnetdiscover from a switch but it introduced a bug in processing a single switch:
17:19:42 > ./iblinkinfo -S 0x000b8cffff00490c
Switch 0x000b8cffff00490c MT47396 Infiniscale-III Mellanox Technologies:
...
           8   11[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
           8   12[  ] ==( 4X 5.0 Gbps Active/  LinkUp)==>             [  ] "" ( )
           8   13[  ] ==( 4X 2.5 Gbps   Down/ Polling)==>             [  ] "" ( )
...

Quoted 7 lines

The port we "come in on" when discovering the switch is not reported properly.
This patch reverses Eli's patch and fixes his original bug in a way which does not introduce the above issue.
Signed-off-by Ira Weiny <[email protected]>
Signed-off-by "Eli Dorfman (Voltaire)" <[email protected]>

Applied. 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