[infiniband-diags] support diffing nodedesc on remoteports in ibnetdiscover

[infiniband-diags] support diffing nodedesc on remoteports in ibnetdiscover

[Al Chu]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

Hey Sasha,

This patch supports diffing node descriptions on remote ports
(previously diffing of just the "local" node description was supported).

Al

-- 
Albert Chu
chu11-i2BcT+NCU+M@public.gmane.org
Computer Scientist
High Performance Systems Division
Lawrence Livermore National Laboratory

[-- Attachment #2: 0001-support-diffing-nodedesc-on-remoteports-in-ibnetdisc.patch --]
[-- Type: message/rfc822, Size: 1312 bytes --]

From: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
Subject: [PATCH] support diffing nodedesc on remoteports in ibnetdiscover
Date: Tue, 20 Apr 2010 15:09:59 -0700
Message-ID: <1271802596.17987.229.camel-X2zTWyBD0EhliZ7u+bvwcg@public.gmane.org>


Signed-off-by: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
---
 infiniband-diags/src/ibnetdiscover.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/infiniband-diags/src/ibnetdiscover.c b/infiniband-diags/src/ibnetdiscover.c
index 57f9625..eeb1b9f 100644
--- a/infiniband-diags/src/ibnetdiscover.c
+++ b/infiniband-diags/src/ibnetdiscover.c
@@ -720,6 +720,17 @@ static void diff_ports(ibnd_node_t * fabric1_node, ibnd_node_t * fabric2_node,
 			fabric2_out++;
 		}
 
+		if (data->diff_flags & DIFF_FLAG_PORT_CONNECTION
+		    && data->diff_flags & DIFF_FLAG_NODE_DESCRIPTION
+		    && fabric1_port && fabric2_port
+		    && fabric1_port->remoteport && fabric2_port->remoteport
+		    && memcmp(fabric1_port->remoteport->node->nodedesc,
+			      fabric2_port->remoteport->node->nodedesc,
+			      IB_SMP_DATA_SIZE)) {
+			fabric1_out++;
+			fabric2_out++;
+		}
+
 		if (fabric1_out) {
 			diff_iter_out_header(fabric1_node, data,
 					     out_header_flag);
-- 
1.5.4.5

Re: [infiniband-diags] support diffing lids and nodedesc on remoteports in ibnetdiscover

[Al Chu]

[-- Attachment #1: Type: text/plain, Size: 1926 bytes --]

Hey Sasha,

A slight tweak to the patch.  Support diffing lids and node descriptions
on remote ports (previously it diffed only "local" lids and node
descriptions).  Also add appropriate manpage notes.

Al

On Tue, 2010-04-20 at 15:30 -0700, Al Chu wrote:
> Hey Sasha,
> 
> This patch supports diffing node descriptions on remote ports
> (previously diffing of just the "local" node description was supported).
> 
> Al
> 
> email message attachment
> > -------- Forwarded Message --------
> > From: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
> > Subject: [PATCH] support diffing nodedesc on remoteports in
> > ibnetdiscover
> > Date: Tue, 20 Apr 2010 15:09:59 -0700
> > 
> > Signed-off-by: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
> > ---
> >  infiniband-diags/src/ibnetdiscover.c |   11 +++++++++++
> >  1 files changed, 11 insertions(+), 0 deletions(-)
> > 
> > diff --git a/infiniband-diags/src/ibnetdiscover.c b/infiniband-diags/src/ibnetdiscover.c
> > index 57f9625..eeb1b9f 100644
> > --- a/infiniband-diags/src/ibnetdiscover.c
> > +++ b/infiniband-diags/src/ibnetdiscover.c
> > @@ -720,6 +720,17 @@ static void diff_ports(ibnd_node_t * fabric1_node, ibnd_node_t * fabric2_node,
> >  			fabric2_out++;
> >  		}
> >  
> > +		if (data->diff_flags & DIFF_FLAG_PORT_CONNECTION
> > +		    && data->diff_flags & DIFF_FLAG_NODE_DESCRIPTION
> > +		    && fabric1_port && fabric2_port
> > +		    && fabric1_port->remoteport && fabric2_port->remoteport
> > +		    && memcmp(fabric1_port->remoteport->node->nodedesc,
> > +			      fabric2_port->remoteport->node->nodedesc,
> > +			      IB_SMP_DATA_SIZE)) {
> > +			fabric1_out++;
> > +			fabric2_out++;
> > +		}
> > +
> >  		if (fabric1_out) {
> >  			diff_iter_out_header(fabric1_node, data,
> >  					     out_header_flag);
-- 
Albert Chu
chu11-i2BcT+NCU+M@public.gmane.org
Computer Scientist
High Performance Systems Division
Lawrence Livermore National Laboratory

[-- Attachment #2: 0001-support-diffing-lids-and-nodedesc-on-remoteports-in.patch --]
[-- Type: message/rfc822, Size: 2478 bytes --]

From: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
Subject: [PATCH] support diffing lids and nodedesc on remoteports in ibnetdiscover
Date: Tue, 20 Apr 2010 15:09:59 -0700
Message-ID: <1271873984.17987.245.camel-X2zTWyBD0EhliZ7u+bvwcg@public.gmane.org>


Signed-off-by: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
---
 infiniband-diags/man/ibnetdiscover.8 |    5 ++++-
 infiniband-diags/src/ibnetdiscover.c |   20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/infiniband-diags/man/ibnetdiscover.8 b/infiniband-diags/man/ibnetdiscover.8
index 76cfbc8..3beb70b 100644
--- a/infiniband-diags/man/ibnetdiscover.8
+++ b/infiniband-diags/man/ibnetdiscover.8
@@ -71,7 +71,10 @@ are: \fIsw\fR = switches, \fIca\fR = channel adapters, \fIrouter\fR = routers,
 \fIport\fR = port connections, \fIlid\fR = lids, \fInodedesc\fR = node
 descriptions.  Note that \fIport\fR, \fIlid\fR, and \fInodedesc\fR are
 checked only for the node types that are specified (e.g. \fIsw\fR,
-\fIca\fR, \fIrouter\fR).
+\fIca\fR, \fIrouter\fR).  If \fIport\fR is specified alongside \fIlid\fR
+or \fInodedesc\fR, remote port lids and node descriptions will also be compared.
+
+
 .TP
 \fB\-p\fR, \fB\-\-ports\fR
 Obtain a ports report which is a
diff --git a/infiniband-diags/src/ibnetdiscover.c b/infiniband-diags/src/ibnetdiscover.c
index 57f9625..23e6dd4 100644
--- a/infiniband-diags/src/ibnetdiscover.c
+++ b/infiniband-diags/src/ibnetdiscover.c
@@ -720,6 +720,26 @@ static void diff_ports(ibnd_node_t * fabric1_node, ibnd_node_t * fabric2_node,
 			fabric2_out++;
 		}
 
+		if (data->diff_flags & DIFF_FLAG_PORT_CONNECTION
+		    && data->diff_flags & DIFF_FLAG_NODE_DESCRIPTION
+		    && fabric1_port && fabric2_port
+		    && fabric1_port->remoteport && fabric2_port->remoteport
+		    && memcmp(fabric1_port->remoteport->node->nodedesc,
+			      fabric2_port->remoteport->node->nodedesc,
+			      IB_SMP_DATA_SIZE)) {
+			fabric1_out++;
+			fabric2_out++;
+		}
+
+		if (data->diff_flags & DIFF_FLAG_PORT_CONNECTION
+		    && data->diff_flags & DIFF_FLAG_LID
+		    && fabric1_port && fabric2_port
+		    && fabric1_port->remoteport && fabric2_port->remoteport
+		    && fabric1_port->remoteport->base_lid != fabric2_port->remoteport->base_lid) {
+			fabric1_out++;
+			fabric2_out++;
+		}
+
 		if (fabric1_out) {
 			diff_iter_out_header(fabric1_node, data,
 					     out_header_flag);
-- 
1.5.4.5

Re: [infiniband-diags] support diffing lids and nodedesc on remoteports in ibnetdiscover

[Sasha Khapyorsky]

On 11:19 Wed 21 Apr     , Al Chu wrote:
> Hey Sasha,
> 
> A slight tweak to the patch.  Support diffing lids and node descriptions
> on remote ports (previously it diffed only "local" lids and node
> descriptions).  Also add appropriate manpage notes.
> 
> Al
> 
> On Tue, 2010-04-20 at 15:30 -0700, Al Chu wrote:
> > Hey Sasha,
> > 
> > This patch supports diffing node descriptions on remote ports
> > (previously diffing of just the "local" node description was supported).
> > 
> > Al
> > 
> > email message attachment
> > > -------- Forwarded Message --------
> > > From: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
> > > Subject: [PATCH] support diffing nodedesc on remoteports in
> > > ibnetdiscover
> > > Date: Tue, 20 Apr 2010 15:09:59 -0700
> > > 
> > > Signed-off-by: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
> > > ---
> > >  infiniband-diags/src/ibnetdiscover.c |   11 +++++++++++
> > >  1 files changed, 11 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/infiniband-diags/src/ibnetdiscover.c b/infiniband-diags/src/ibnetdiscover.c
> > > index 57f9625..eeb1b9f 100644
> > > --- a/infiniband-diags/src/ibnetdiscover.c
> > > +++ b/infiniband-diags/src/ibnetdiscover.c
> > > @@ -720,6 +720,17 @@ static void diff_ports(ibnd_node_t * fabric1_node, ibnd_node_t * fabric2_node,
> > >  			fabric2_out++;
> > >  		}
> > >  
> > > +		if (data->diff_flags & DIFF_FLAG_PORT_CONNECTION
> > > +		    && data->diff_flags & DIFF_FLAG_NODE_DESCRIPTION
> > > +		    && fabric1_port && fabric2_port
> > > +		    && fabric1_port->remoteport && fabric2_port->remoteport
> > > +		    && memcmp(fabric1_port->remoteport->node->nodedesc,
> > > +			      fabric2_port->remoteport->node->nodedesc,
> > > +			      IB_SMP_DATA_SIZE)) {
> > > +			fabric1_out++;
> > > +			fabric2_out++;
> > > +		}
> > > +
> > >  		if (fabric1_out) {
> > >  			diff_iter_out_header(fabric1_node, data,
> > >  					     out_header_flag);
> -- 
> Albert Chu
> chu11-i2BcT+NCU+M@public.gmane.org
> Computer Scientist
> High Performance Systems Division
> Lawrence Livermore National Laboratory

> Date: Tue, 20 Apr 2010 15:09:59 -0700
> From: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>
> Subject: [PATCH] support diffing lids and nodedesc on remoteports in
> 	ibnetdiscover
> Message-Id: <1271873984.17987.245.camel-X2zTWyBD0EhliZ7u+bvwcg@public.gmane.org>
> Mime-Version: 1.0
> Content-Transfer-Encoding: 7bit
> 
> 
> Signed-off-by: Albert Chu <chu11-i2BcT+NCU+M@public.gmane.org>

Both applied. Thanks.

Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html