[openib-general] Re: which dapl/udapl changes in trunk should be imported into OFED branch? (patch enclosed)

[Jack Morgenstein]

On Thursday 25 May 2006 01:22, James Lentini wrote:
> On Wed, 24 May 2006, Jack Morgenstein wrote:
> > Hi,
> >
> > Below is a patch file of differences between the OFED dapl library
> > and the openib main trunk dapl library.
> >
> > Please indicate which of the dapl library changes are necessary for
> > the Intel MPI to work correctly in OFED.
>
> How recent is the ucm code in OFED?

I'm not really sure what you mean when you say "ucm code", so I'll try to 
cover all the bases.

PLEASE respond ASAP, since this is holding up release of OFED RC5.  We need to 
build TODAY for testing over our weekend (which is Friday and Saturday)..

Userspace:

1. libibcm:  trunk most recent (includes "ib_xxxx" to "ibv_xxx" name changes).
2. libibrdma: trunk rev 7079 (May 10).   subsequent fixes to cmatose and rping  
    not included.  Also, the OFED librdmacm.spec.in file has REVISION 2, while 
    the trunk has REVISION 1 -- we'll fix this.

Kernel:
1. core/ucm.c :  We've taken the 2.6.17 GIT version (last updated May 11, with 
fixes for race conditions (SVN 7119).  The GIT version differs a bit from the 
trunk svn 7119 version, in that changes to cm.c for supporting SDP, which is 
not yet in the GIT. For supporting SDP, we take cm.c from the trunk.  Patch 
below gives the diff between the GIT version and the version used in OFED (a 
parameter was added to ib_cm_listen):

Index: openib_branch1.0/drivers/infiniband/core/ucm.c
===================================================================
--- openib_branch1.0.orig/drivers/infiniband/core/ucm.c
+++ openib_branch1.0/drivers/infiniband/core/ucm.c
@@ -742,7 +742,8 @@ static ssize_t ib_ucm_listen(struct ib_u
 	if (IS_ERR(ctx))
 		return PTR_ERR(ctx);
 
-	result = ib_cm_listen(ctx->cm_id, cmd.service_id, cmd.service_mask);
+	result = ib_cm_listen(ctx->cm_id, cmd.service_id, cmd.service_mask,
+			      NULL);
 	ib_ucm_ctx_put(ctx);
 	return result;
 }