[Pkg-ofed-commits] r727 - in /branches/ofed-1.5.1lenny/dapl/trunk: ./ dapl/commo...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Wed May 5 15:41:28 UTC 2010
Author: gmpc-guest
Date: Wed May 5 15:41:28 2010
New Revision: 727
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=727
Log:
New upstream release (OFED 1.5.1)
Added:
branches/ofed-1.5.1lenny/dapl/trunk/LICENSE.txt
- copied unchanged from r726, branches/ofed-1.5.1lenny/dapl/branches/upstream/current/LICENSE.txt
branches/ofed-1.5.1lenny/dapl/trunk/LICENSE2.txt
- copied unchanged from r726, branches/ofed-1.5.1lenny/dapl/branches/upstream/current/LICENSE2.txt
branches/ofed-1.5.1lenny/dapl/trunk/LICENSE3.txt
- copied unchanged from r726, branches/ofed-1.5.1lenny/dapl/branches/upstream/current/LICENSE3.txt
Modified:
branches/ofed-1.5.1lenny/dapl/trunk/COPYING
branches/ofed-1.5.1lenny/dapl/trunk/ChangeLog
branches/ofed-1.5.1lenny/dapl/trunk/Makefile.am
branches/ofed-1.5.1lenny/dapl/trunk/Makefile.in
branches/ofed-1.5.1lenny/dapl/trunk/configure
branches/ofed-1.5.1lenny/dapl/trunk/configure.in
branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec
branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec.in
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_adapter_util.h
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_callback.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_util.h
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_connect.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_util.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_connection_callb.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_util.h
branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ia_query.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/cm.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/dapl_ib_util.h
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/device.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/linux/openib_osd.h
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/mem.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/qp.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/cm.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/dapl_ib_util.h
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/device.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/cm.c
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/dapl_ib_util.h
branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/device.c
branches/ofed-1.5.1lenny/dapl/trunk/debian/changelog
Modified: branches/ofed-1.5.1lenny/dapl/trunk/COPYING
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/COPYING?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/COPYING (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/COPYING Wed May 5 15:41:28 2010
@@ -1,7 +1,7 @@
#
# Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
# Copyright (c) 2005 Voltaire Inc. All rights reserved.
-# Copyright (c) 2005 Intel Corporation. All rights reserved.
+# Copyright (c) 2005-2010 Intel Corporation. All rights reserved.
# Copyright (c) 2004-2005, Mellanox Technologies, Inc. All rights reserved.
# Copyright (c) 2003 Topspin Corporation. All rights reserved.
# Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
@@ -9,19 +9,13 @@
# This Software is licensed under one of the following licenses:
#
# 1) under the terms of the "Common Public License 1.0" a copy of which is
-# in the file LICENSE.txt in the root directory. The license is also
-# available from the Open Source Initiative, see
-# http://www.opensource.org/licenses/cpl.php.
+# in the file LICENSE.txt in the root directory.
#
# 2) under the terms of the "The BSD License" a copy of which is in the file
-# LICENSE2.txt in the root directory. The license is also available from
-# the Open Source Initiative, see
-# http://www.opensource.org/licenses/bsd-license.php.
+# LICENSE2.txt in the root directory.
#
# 3) under the terms of the "GNU General Public License (GPL) Version 2" a
-# copy of which is in the file LICENSE3.txt in the root directory. The
-# license is also available from the Open Source Initiative, see
-# http://www.opensource.org/licenses/gpl-license.php.
+# copy of which is in the file LICENSE3.txt in the root directory.
#
# Licensee has the right to choose one of the above licenses.
#
@@ -32,5 +26,3 @@
# notice, one of the license notices in the documentation
# and/or other materials provided with the distribution.
#
-
-
Modified: branches/ofed-1.5.1lenny/dapl/trunk/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/ChangeLog?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/ChangeLog (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/ChangeLog Wed May 5 15:41:28 2010
@@ -1,3 +1,186 @@
+commit 454c27b1f357c7c3070e459b25d12929f86304ca
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Mon Feb 22 09:42:17 2010 -0800
+
+ windows: add scm makefile
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 66ac48d5280bcf0453760c6e22909de6b8519b6d
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Mon Feb 22 09:41:13 2010 -0800
+
+ Windows does not require rdma_cma_abi.h, move the include from common code and to OSD file.
+
+ Signed-off-by: stan smith <stan.smith at intel.com>
+
+commit c05c41c31f01e1ddef91e92998ca66d258fafe3d
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Fri Feb 19 14:52:01 2010 -0800
+
+ Windows patch to fix IB_INVALID_HANDLE name collision
+
+ signed-off-by: stan smith <stan.smith at intel.com>
+
+commit 712e7e5ba71f8a4344dfff481a9be870eefefe25
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Mon Feb 8 13:49:35 2010 -0800
+
+ scm: dat_ep_connect fails on 32bit servers
+
+ memcpy for remote IA address uses incorrect sizeof for a pointer type.
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 3040fa78d7d22c8f76c88dc77cedde09f016eb67
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Fri Feb 5 11:51:16 2010 -0800
+
+ undefined symbol: dapls_print_cm_list
+
+ call prototype should be dependent on DAPL_COUNTERS.
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit cbeebe422b952d679f49429be8ba045a62d7f4ac
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Fri Feb 5 11:39:21 2010 -0800
+
+ Cleanup CM object lock before freeing CM object memory
+
+ Running windows application verifiier for uDAPL validation
+ for all 3 providers. Cleanup memory lock leaks found
+ by verifier.
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 855a8e4aa83fa2e4f7847122415106f49286f4ca
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Wed Feb 3 16:21:30 2010 -0800
+
+ destroy verbs completion channels created via ia_open or ep_create.
+
+ Completion channels are created with ia_open for CNO events and
+ with ep_create in cases where DAT allows EP(qp) to be created with
+ no EVD(cq) and IB doesn't. These completion channels need to be
+ destroyed at close along with a CQ for the EP without CQ case.
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 4da540591148e47dd912851cc7314776f2f7622e
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Wed Feb 3 11:06:45 2010 -0800
+
+ Update Copyright file and include the 3 license files in distribution
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 9011abd4b1470c65bfe81eef5a2f3a81060cec81
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Tue Feb 2 14:43:03 2010 -0800
+
+ When copying private_data out of rdma_cm events, use the
+ reported private_data_len for the size, and not IB maximums.
+ This fixes a bug running over the librdmacm on windows, where
+ DAPL accessed invalid memory.
+
+ Signed-off-by: Sean Hefty <sean.hefty at intel.com>
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 5da33bb3b9c230c08492f85d13caa330ce65906e
+Author: Sean Hefty <sean.hefty at intel.com>
+Date: Thu Jan 28 10:19:20 2010 -0800
+
+ dapl/cma: fix referencing freed address
+
+ DAPL uses a pointer to reference the local and remote addresses
+ of an endpoint. It expects that those addresses are located
+ in memory that is always accessible. Typically, for the local
+ address, the pointer references the address stored with the DAPL
+ HCA device. However, for the cma provider, it changes this pointer
+ to reference the address stored with the rdma_cm_id.
+
+ This causes a problem when that endpoint is connected on the
+ passive side of a connection. When connect requests are given
+ to DAPL, a new rdma_cm_id is associated with the request. The
+ DAPL code replaces the current rdma_cm_id associated with a
+ user's endpoint with the new rdma_cm_id. The old rdma_cm_id is
+ then deleted. But the endpoint's local address pointer still
+ references the address stored with the old rdma_cm_id. The
+ result is that any reference to the address will access freed
+ memory.
+
+ Fix this by keeping the local address pointer always pointing
+ to the address associated with the DAPL HCA device. This is about
+ the best that can be done given the DAPL interface design.
+
+ Signed-off-by: Sean Hefty <sean.hefty at intel.com>
+
+commit 66dbb5f20bf494eb3f5041655b478059165c5f1b
+Author: Sean Hefty <sean.hefty at intel.com>
+Date: Tue Jan 26 15:13:03 2010 -0800
+
+ dapl: move close device after async thread is done
+
+ using it
+
+ Before calling ibv_close_device, wait for the asynchronous
+ processing thread to finish using the device. This prevents
+ a use after free error.
+
+ Signed-off-by: Sean Hefty <sean.hefty at intel.com>
+
+commit 560b235adc799fa710571ca63cbc3e4fa6374ff2
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Mon Jan 11 09:03:10 2010 -0800
+
+ Release 2.0.26-1
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 73dfb32ace6aff2fdb21e54689342fd551822286
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Tue Dec 22 14:00:33 2009 -0800
+
+ openib_common: add check for both gid and global routing in RTR
+
+ check for valid gid pointer along with global route setting
+ during transition to RTR. Add more GID information to
+ debug print statement in qp modify call.
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 7aab18fd8ff3f201b0a4b6c76896667b29f103c4
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Fri Dec 4 12:31:22 2009 -0800
+
+ openib_common: remote memory read privilege set multi times
+
+ duplicate setting of read privilege in dapls_convert_privileges
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 016e2c40b8ac2fe18993e9fb7122ecb9b439e5eb
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Fri Dec 4 12:25:30 2009 -0800
+
+ ucm, scm: DAPL_GLOBAL_ROUTING enabled causes segv
+
+ socket cm and ud cm providers support QP modify with is_global
+ set and GRH. New v2 providers didn't pass GID information
+ in modify_qp RTR call and incorrectly byte swapped the already
+ network order GID. Add debug print of GID during global modify.
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
+commit 7b0c596c7b4ad619f65da9f79dcbc4376e651dde
+Author: Arlin Davis <arlin.r.davis at intel.com>
+Date: Tue Nov 24 22:16:58 2009 -0800
+
+ Release 2.0.25-1
+
+ Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
+
commit 3197bffff478ad7ff5eff9220fa0528e42e6b56e
Author: Arlin Davis <arlin.r.davis at intel.com>
Date: Tue Nov 24 22:15:46 2009 -0800
Modified: branches/ofed-1.5.1lenny/dapl/trunk/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/Makefile.am?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/Makefile.am (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/Makefile.am Wed May 5 15:41:28 2010
@@ -505,6 +505,9 @@
dapl/udapl/libdaplofa.map \
dapl/udapl/libdaploscm.map \
dapl/udapl/libdaploucm.map \
+ LICENSE.txt \
+ LICENSE2.txt \
+ LICENSE3.txt \
dapl.spec.in \
$(man_MANS) \
test/dapltest/include/dapl_bpool.h \
Modified: branches/ofed-1.5.1lenny/dapl/trunk/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/Makefile.in?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/Makefile.in (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/Makefile.in Wed May 5 15:41:28 2010
@@ -1259,6 +1259,9 @@
dapl/udapl/libdaplofa.map \
dapl/udapl/libdaploscm.map \
dapl/udapl/libdaploucm.map \
+ LICENSE.txt \
+ LICENSE2.txt \
+ LICENSE3.txt \
dapl.spec.in \
$(man_MANS) \
test/dapltest/include/dapl_bpool.h \
Modified: branches/ofed-1.5.1lenny/dapl/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/configure?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/configure (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/configure Wed May 5 15:41:28 2010
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dapl 2.0.25.
+# Generated by GNU Autoconf 2.59 for dapl 2.0.27.
#
# Report bugs to <linux-rdma at vger.kernel.org>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dapl'
PACKAGE_TARNAME='dapl'
-PACKAGE_VERSION='2.0.25'
-PACKAGE_STRING='dapl 2.0.25'
+PACKAGE_VERSION='2.0.27'
+PACKAGE_STRING='dapl 2.0.27'
PACKAGE_BUGREPORT='linux-rdma at vger.kernel.org'
ac_unique_file="dat/udat/udat.c"
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dapl 2.0.25 to adapt to many kinds of systems.
+\`configure' configures dapl 2.0.27 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dapl 2.0.25:";;
+ short | recursive ) echo "Configuration of dapl 2.0.27:";;
esac
cat <<\_ACEOF
@@ -1162,7 +1162,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dapl configure 2.0.25
+dapl configure 2.0.27
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1176,7 +1176,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dapl $as_me 2.0.25, which was
+It was created by dapl $as_me 2.0.27, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1822,7 +1822,7 @@
# Define the identity of the package.
PACKAGE=dapl
- VERSION=2.0.25
+ VERSION=2.0.27
cat >>confdefs.h <<_ACEOF
@@ -20284,7 +20284,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dapl $as_me 2.0.25, which was
+This file was extended by dapl $as_me 2.0.27, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20347,7 +20347,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dapl config.status 2.0.25
+dapl config.status 2.0.27
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/ofed-1.5.1lenny/dapl/trunk/configure.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/configure.in?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/configure.in (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/configure.in Wed May 5 15:41:28 2010
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(dapl, 2.0.25, linux-rdma at vger.kernel.org)
+AC_INIT(dapl, 2.0.27, linux-rdma at vger.kernel.org)
AC_CONFIG_SRCDIR([dat/udat/udat.c])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dapl, 2.0.25)
+AM_INIT_AUTOMAKE(dapl, 2.0.27)
AM_PROG_LIBTOOL
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec Wed May 5 15:41:28 2010
@@ -32,7 +32,7 @@
#
# $Id: $
Name: dapl
-Version: 2.0.25
+Version: 2.0.27
Release: 1%{?dist}
Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs.
@@ -121,7 +121,7 @@
%files
%defattr(-,root,root,-)
%{_libdir}/libda*.so.*
-%doc AUTHORS README ChangeLog
+%doc AUTHORS README COPYING ChangeLog LICENSE.txt LICENSE2.txt LICENSE3.txt
%files devel
%defattr(-,root,root,-)
@@ -140,6 +140,12 @@
%{_mandir}/man5/*.5*
%changelog
+* Tue Feb 23 2010 Arlin Davis <ardavis at ichips.intel.com> - 2.0.27
+- DAT/DAPL Version 2.0.27 Release 1, OFED 1.5.1
+
+* Tue Jan 11 2010 Arlin Davis <ardavis at ichips.intel.com> - 2.0.26
+- DAT/DAPL Version 2.0.26 Release 1, OFED 1.5, OFED 1.5-RDMAoE
+
* Tue Nov 24 2009 Arlin Davis <ardavis at ichips.intel.com> - 2.0.25
- DAT/DAPL Version 2.0.25 Release 1, OFED 1.5 RC3
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec.in?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec.in (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl.spec.in Wed May 5 15:41:28 2010
@@ -121,7 +121,7 @@
%files
%defattr(-,root,root,-)
%{_libdir}/libda*.so.*
-%doc AUTHORS README ChangeLog
+%doc AUTHORS README COPYING ChangeLog LICENSE.txt LICENSE2.txt LICENSE3.txt
%files devel
%defattr(-,root,root,-)
@@ -140,6 +140,12 @@
%{_mandir}/man5/*.5*
%changelog
+* Tue Feb 23 2010 Arlin Davis <ardavis at ichips.intel.com> - 2.0.27
+- DAT/DAPL Version 2.0.27 Release 1, OFED 1.5.1
+
+* Tue Jan 11 2010 Arlin Davis <ardavis at ichips.intel.com> - 2.0.26
+- DAT/DAPL Version 2.0.26 Release 1, OFED 1.5, OFED 1.5-RDMAoE
+
* Tue Nov 24 2009 Arlin Davis <ardavis at ichips.intel.com> - 2.0.25
- DAT/DAPL Version 2.0.25 Release 1, OFED 1.5 RC3
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_adapter_util.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_adapter_util.h?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_adapter_util.h (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_adapter_util.h Wed May 5 15:41:28 2010
@@ -239,10 +239,8 @@
IN DAT_HANDLE dat_handle,
OUT DAT_SOCK_ADDR6 *remote_ia_address);
-int dapls_ib_private_data_size (
- IN DAPL_PRIVATE *prd_ptr,
- IN DAPL_PDATA_OP conn_op,
- IN DAPL_HCA *hca_ptr);
+int dapls_ib_private_data_size(
+ IN DAPL_HCA *hca_ptr);
void
dapls_query_provider_specific_attr(
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_callback.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_callback.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_callback.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_callback.c Wed May 5 15:41:28 2010
@@ -51,6 +51,7 @@
DAT_RETURN dapli_connection_request(IN dp_ib_cm_handle_t ib_cm_handle,
IN DAPL_SP * sp_ptr,
IN DAPL_PRIVATE * prd_ptr,
+ IN int private_data_size,
IN DAPL_EVD * evd_ptr);
DAPL_EP *dapli_get_sp_ep(IN dp_ib_cm_handle_t ib_cm_handle,
@@ -74,8 +75,9 @@
* None
*
*/
-void dapls_cr_callback(IN dp_ib_cm_handle_t ib_cm_handle, IN const ib_cm_events_t ib_cm_event, IN const void *private_data_ptr, /* event data */
- IN const void *context)
+void dapls_cr_callback(IN dp_ib_cm_handle_t ib_cm_handle, IN const ib_cm_events_t ib_cm_event,
+ IN const void *private_data_ptr, IN const int private_data_size,
+ IN const void *context)
{
DAPL_EP *ep_ptr;
DAPL_EVD *evd_ptr;
@@ -174,8 +176,7 @@
* event if appropriate.
*/
dat_status = dapli_connection_request(ib_cm_handle,
- sp_ptr,
- prd_ptr, evd_ptr);
+ sp_ptr, prd_ptr, private_data_size, evd_ptr);
/* Set evd_ptr = NULL so we don't generate an event below */
evd_ptr = NULL;
@@ -308,7 +309,8 @@
DAT_RETURN
dapli_connection_request(IN dp_ib_cm_handle_t ib_cm_handle,
IN DAPL_SP * sp_ptr,
- IN DAPL_PRIVATE * prd_ptr, IN DAPL_EVD * evd_ptr)
+ IN DAPL_PRIVATE * prd_ptr, IN int private_data_size,
+ IN DAPL_EVD * evd_ptr)
{
DAT_RETURN dat_status;
@@ -346,14 +348,7 @@
/* Private data size will be determined by the provider layer */
cr_ptr->param.private_data = cr_ptr->private_data;
- if (prd_ptr == NULL) {
- cr_ptr->param.private_data_size = 0;
- } else {
- cr_ptr->param.private_data_size =
- dapls_ib_private_data_size(prd_ptr, DAPL_PDATA_CONN_REQ,
- sp_ptr->header.owner_ia->
- hca_ptr);
- }
+ cr_ptr->param.private_data_size = private_data_size;
if (cr_ptr->param.private_data_size > 0) {
dapl_os_memcpy(cr_ptr->private_data,
prd_ptr->private_data,
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_util.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_util.h?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_util.h (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_cr_util.h Wed May 5 15:41:28 2010
@@ -52,7 +52,8 @@
dapls_cr_callback (
IN dp_ib_cm_handle_t ib_cm_handle,
IN const ib_cm_events_t ib_cm_event,
- IN const void *instant_data_p,
+ IN const void *private_data_ptr,
+ IN const int private_data_size,
IN const void *context);
#endif /* _DAPL_CR_UTIL_H_ */
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_connect.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_connect.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_connect.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_connect.c Wed May 5 15:41:28 2010
@@ -79,7 +79,6 @@
DAPL_EP alloc_ep;
DAT_RETURN dat_status;
DAT_COUNT req_hdr_size;
- DAT_UINT32 max_req_pdata_size;
void *private_data_ptr;
dapl_dbg_log(DAPL_DBG_TYPE_API | DAPL_DBG_TYPE_CM,
@@ -258,16 +257,6 @@
*/
req_hdr_size = (sizeof(DAPL_PRIVATE) - DAPL_MAX_PRIVATE_DATA_SIZE);
- max_req_pdata_size =
- dapls_ib_private_data_size(NULL, DAPL_PDATA_CONN_REQ,
- ep_ptr->header.owner_ia->hca_ptr);
-
- if (private_data_size + req_hdr_size > (DAT_COUNT) max_req_pdata_size) {
- dapl_os_unlock(&ep_ptr->header.lock);
- dat_status = DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG5);
- goto bail;
- }
-
/* transition the state before requesting a connection to avoid
* race conditions
*/
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_util.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_util.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_util.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ep_util.c Wed May 5 15:41:28 2010
@@ -565,11 +565,11 @@
ep_ptr, cr_ptr->ib_cm_handle);
dapls_cr_callback(cr_ptr->ib_cm_handle,
- ib_cm_event, NULL, cr_ptr->sp_ptr);
+ ib_cm_event, NULL, 0, cr_ptr->sp_ptr);
} else {
dapl_evd_connection_callback(ep_ptr->cm_handle,
ib_cm_event,
- NULL, (void *)ep_ptr);
+ NULL, 0, (void *)ep_ptr);
}
} else {
dapl_os_unlock(&ep_ptr->header.lock);
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_connection_callb.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_connection_callb.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_connection_callb.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_connection_callb.c Wed May 5 15:41:28 2010
@@ -65,6 +65,7 @@
dapl_evd_connection_callback(IN dp_ib_cm_handle_t ib_cm_handle,
IN const ib_cm_events_t ib_cm_event,
IN const void *private_data_ptr,
+ IN const int private_data_size,
IN const void *context)
{
DAPL_EP *ep_ptr;
@@ -72,7 +73,6 @@
DAPL_PRIVATE *prd_ptr;
DAT_EVENT_NUMBER dat_event_num;
DAT_RETURN dat_status;
- int private_data_size;
dapl_dbg_log(DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK,
"--> dapl_evd_connection_callback: ctxt: %p event: %x cm_handle %p\n",
@@ -96,7 +96,6 @@
DAPL_CNTR(evd_ptr, DCNT_EVD_CONN_CALLBACK);
prd_ptr = (DAPL_PRIVATE *) private_data_ptr;
- private_data_size = 0;
/*
* All operations effect the EP, so lock it once and unlock
* when necessary
@@ -132,16 +131,6 @@
}
ep_ptr->param.ep_state = DAT_EP_STATE_CONNECTED;
ep_ptr->cm_handle = ib_cm_handle;
- if (prd_ptr == NULL) {
- private_data_size = 0;
- } else {
- private_data_size =
- dapls_ib_private_data_size(prd_ptr,
- DAPL_PDATA_CONN_REP,
- ep_ptr->header.
- owner_ia->
- hca_ptr);
- }
if (private_data_size > 0) {
/* copy in the private data */
@@ -157,13 +146,6 @@
case DAT_CONNECTION_EVENT_PEER_REJECTED:
{
/* peer reject may include private data */
- if (prd_ptr != NULL)
- private_data_size =
- dapls_ib_private_data_size(prd_ptr,
- DAPL_PDATA_CONN_REJ,
- ep_ptr->header.
- owner_ia->
- hca_ptr);
if (private_data_size > 0)
dapl_os_memcpy(ep_ptr->private.private_data,
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_util.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_util.h?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_util.h (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_evd_util.h Wed May 5 15:41:28 2010
@@ -137,7 +137,8 @@
extern void dapl_evd_connection_callback (
IN dp_ib_cm_handle_t ib_cm_handle,
IN const ib_cm_events_t ib_cm_events,
- IN const void *instant_data_p,
+ IN const void *private_data_ptr,
+ IN const int private_data_size,
IN const void * context );
/* dto verb callback */
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ia_query.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ia_query.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ia_query.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/common/dapl_ia_query.c Wed May 5 15:41:28 2010
@@ -150,8 +150,7 @@
* to 0 unless IBHOSTS_NAMING is enabled.
*/
provider_attr->max_private_data_size =
- dapls_ib_private_data_size(NULL, DAPL_PDATA_CONN_REQ,
- ia_ptr->hca_ptr) -
+ dapls_ib_private_data_size(ia_ptr->hca_ptr) -
(sizeof(DAPL_PRIVATE) - DAPL_MAX_PRIVATE_DATA_SIZE);
provider_attr->supports_multipath = DAT_FALSE;
provider_attr->ep_creator = DAT_PSP_CREATES_EP_NEVER;
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/cm.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/cm.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/cm.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/cm.c Wed May 5 15:41:28 2010
@@ -95,7 +95,7 @@
ret, strerror(errno));
dapl_evd_connection_callback(conn,
IB_CME_LOCAL_FAILURE,
- NULL, conn->ep);
+ NULL, 0, conn->ep);
}
}
@@ -149,7 +149,7 @@
bail:
dapl_evd_connection_callback(conn,
- IB_CME_LOCAL_FAILURE, NULL, conn->ep);
+ IB_CME_LOCAL_FAILURE, NULL, 0, conn->ep);
}
dp_ib_cm_handle_t dapls_ib_cm_create(DAPL_EP *ep)
@@ -167,6 +167,7 @@
/* create CM_ID, bind to local device, create QP */
if (rdma_create_id(g_cm_events, &cm_id, (void *)conn, RDMA_PS_TCP)) {
+ dapl_os_lock_destroy(&conn->lock);
dapl_os_free(conn, sizeof(*conn));
return NULL;
}
@@ -221,6 +222,7 @@
rdma_destroy_id(conn->cm_id);
}
+ dapl_os_lock_destroy(&conn->lock);
dapl_os_free(conn, sizeof(*conn));
}
@@ -416,7 +418,8 @@
dapl_os_unlock(lock);
if (conn)
- dapl_evd_connection_callback(conn, ib_cm_event, pdata, conn->ep);
+ dapl_evd_connection_callback(conn, ib_cm_event, pdata,
+ event->param.conn.private_data_len, conn->ep);
}
static void dapli_cm_passive_cb(struct dapl_cm_id *conn,
@@ -496,7 +499,8 @@
dapl_os_unlock(&conn->lock);
if (conn_recv)
- dapls_cr_callback(conn_recv, ib_cm_event, pdata, conn_recv->sp);
+ dapls_cr_callback(conn_recv, ib_cm_event, pdata,
+ event->param.conn.private_data_len, conn_recv->sp);
}
/************************ DAPL provider entry points **********************/
@@ -684,6 +688,7 @@
/* create CM_ID, bind to local device, create QP */
if (rdma_create_id
(g_cm_events, &conn->cm_id, (void *)conn, RDMA_PS_TCP)) {
+ dapl_os_lock_destroy(&conn->lock);
dapl_os_free(conn, sizeof(*conn));
return (dapl_convert_errno(errno, "setup_listener"));
}
@@ -732,6 +737,7 @@
bail:
rdma_destroy_id(conn->cm_id);
+ dapl_os_lock_destroy(&conn->lock);
dapl_os_free(conn, sizeof(*conn));
return dat_status;
}
@@ -922,11 +928,6 @@
return DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_CR);
}
- if (private_data_size >
- dapls_ib_private_data_size(NULL, DAPL_PDATA_CONN_REJ,
- cm_handle->hca))
- return DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG3);
-
/* setup pdata_hdr and users data, in CR pdata buffer */
dapl_os_memcpy(cm_handle->p_data, &pdata_hdr, offset);
if (private_data_size)
@@ -1001,57 +1002,21 @@
/*
* dapls_ib_private_data_size
*
- * Return the size of private data given a connection op type
+ * Return the size of max private data
*
* Input:
- * prd_ptr private data pointer
- * conn_op connection operation type
* hca_ptr hca pointer, needed for transport type
- *
- * If prd_ptr is NULL, this is a query for the max size supported by
- * the provider, otherwise it is the actual size of the private data
- * contained in prd_ptr.
- *
*
* Output:
* None
*
* Returns:
- * length of private data
- *
- */
-int dapls_ib_private_data_size(IN DAPL_PRIVATE * prd_ptr,
- IN DAPL_PDATA_OP conn_op, IN DAPL_HCA * hca_ptr)
-{
- int size;
-
- if (hca_ptr->ib_hca_handle->device->transport_type
- == IBV_TRANSPORT_IWARP)
- return (IWARP_MAX_PDATA_SIZE - sizeof(struct dapl_pdata_hdr));
-
- switch (conn_op) {
-
- case DAPL_PDATA_CONN_REQ:
- size = IB_MAX_REQ_PDATA_SIZE;
- break;
- case DAPL_PDATA_CONN_REP:
- size = IB_MAX_REP_PDATA_SIZE;
- break;
- case DAPL_PDATA_CONN_REJ:
- size = IB_MAX_REJ_PDATA_SIZE - sizeof(struct dapl_pdata_hdr);
- break;
- case DAPL_PDATA_CONN_DREQ:
- size = IB_MAX_DREQ_PDATA_SIZE;
- break;
- case DAPL_PDATA_CONN_DREP:
- size = IB_MAX_DREP_PDATA_SIZE;
- break;
- default:
- size = 0;
-
- } /* end case */
-
- return size;
+ * maximum private data rdma_cm will supply from transport.
+ *
+ */
+int dapls_ib_private_data_size(IN DAPL_HCA * hca_ptr)
+{
+ return RDMA_MAX_PRIVATE_DATA;
}
/*
@@ -1238,7 +1203,7 @@
dapl_evd_connection_callback(conn,
IB_CME_DESTINATION_UNREACHABLE,
- NULL, conn->ep);
+ NULL, 0, conn->ep);
break;
case RDMA_CM_EVENT_ROUTE_ERROR:
@@ -1267,14 +1232,14 @@
dapl_evd_connection_callback(conn,
IB_CME_DESTINATION_UNREACHABLE,
- NULL, conn->ep);
+ NULL, 0, conn->ep);
}
break;
case RDMA_CM_EVENT_DEVICE_REMOVAL:
dapl_evd_connection_callback(conn,
IB_CME_LOCAL_FAILURE,
- NULL, conn->ep);
+ NULL, 0, conn->ep);
break;
case RDMA_CM_EVENT_CONNECT_REQUEST:
case RDMA_CM_EVENT_CONNECT_ERROR:
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/dapl_ib_util.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/dapl_ib_util.h?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/dapl_ib_util.h (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/dapl_ib_util.h Wed May 5 15:41:28 2010
@@ -33,7 +33,6 @@
#define _OPENIB_CMA_
#include <infiniband/verbs.h>
-#include <rdma/rdma_cma.h>
#include "openib_osd.h"
#include "dapl_ib_common.h"
@@ -47,14 +46,14 @@
#define IB_ROUTE_RETRY_COUNT 15 /* 60 sec total */
#define IB_MAX_AT_RETRY 3
-/* CMA private data areas */
+/* CMA private data areas, use CMA max with known transport definitions */
#define CMA_PDATA_HDR 36
-#define IB_MAX_REQ_PDATA_SIZE (92-CMA_PDATA_HDR)
-#define IB_MAX_REP_PDATA_SIZE (196-CMA_PDATA_HDR)
-#define IB_MAX_REJ_PDATA_SIZE (148-CMA_PDATA_HDR)
-#define IB_MAX_DREQ_PDATA_SIZE (220-CMA_PDATA_HDR)
-#define IB_MAX_DREP_PDATA_SIZE (224-CMA_PDATA_HDR)
-#define IWARP_MAX_PDATA_SIZE (512-CMA_PDATA_HDR)
+#define IB_MAX_REQ_PDATA_SIZE DAPL_MIN((92-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
+#define IB_MAX_REP_PDATA_SIZE DAPL_MIN((196-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
+#define IB_MAX_REJ_PDATA_SIZE DAPL_MIN((148-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
+#define IB_MAX_DREQ_PDATA_SIZE DAPL_MIN((220-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
+#define IB_MAX_DREP_PDATA_SIZE DAPL_MIN((224-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
+#define IWARP_MAX_PDATA_SIZE DAPL_MIN((512-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
struct dapl_cm_id {
DAPL_OS_LOCK lock;
@@ -124,9 +123,11 @@
dp_ib_cm_handle_t dapls_ib_cm_create(DAPL_EP *ep);
void dapls_ib_cm_free(dp_ib_cm_handle_t cm, DAPL_EP *ep);
+#ifdef DAPL_COUNTERS
STATIC _INLINE_ void dapls_print_cm_list(IN DAPL_IA * ia_ptr)
{
return;
}
+#endif
#endif /* _DAPL_IB_UTIL_H_ */
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/device.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/device.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/device.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/device.c Wed May 5 15:41:28 2010
@@ -474,12 +474,6 @@
dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " close_hca: %p->%p\n",
hca_ptr, hca_ptr->ib_hca_handle);
- if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
- if (rdma_destroy_id(hca_ptr->ib_trans.cm_id))
- return (dapl_convert_errno(errno, "ib_close_device"));
- hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
- }
-
dapl_os_lock(&g_hca_lock);
if (g_ib_thread_state != IB_THREAD_RUN) {
dapl_os_unlock(&g_hca_lock);
@@ -508,6 +502,23 @@
dapl_os_sleep_usec(1000);
}
bail:
+
+ if (hca_ptr->ib_trans.ib_cq)
+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq);
+
+ if (hca_ptr->ib_trans.ib_cq_empty) {
+ struct ibv_comp_channel *channel;
+ channel = hca_ptr->ib_trans.ib_cq_empty->channel;
+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty);
+ ibv_destroy_comp_channel(channel);
+ }
+
+ if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
+ if (rdma_destroy_id(hca_ptr->ib_trans.cm_id))
+ return (dapl_convert_errno(errno, "ib_close_device"));
+ hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
+ }
+
return (DAT_SUCCESS);
}
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/linux/openib_osd.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/linux/openib_osd.h?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/linux/openib_osd.h (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_cma/linux/openib_osd.h Wed May 5 15:41:28 2010
@@ -1,6 +1,8 @@
#ifndef OPENIB_OSD_H
#define OPENIB_OSD_H
+#include <rdma/rdma_cma.h>
+#include <rdma/rdma_cma_abi.h>
#include <byteswap.h>
#include <sys/poll.h>
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/mem.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/mem.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/mem.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/mem.c Wed May 5 15:41:28 2010
@@ -55,10 +55,6 @@
access |= IBV_ACCESS_REMOTE_WRITE;
if (DAT_MEM_PRIV_REMOTE_READ_FLAG & privileges)
access |= IBV_ACCESS_REMOTE_READ;
- if (DAT_MEM_PRIV_REMOTE_READ_FLAG & privileges)
- access |= IBV_ACCESS_REMOTE_READ;
- if (DAT_MEM_PRIV_REMOTE_READ_FLAG & privileges)
- access |= IBV_ACCESS_REMOTE_READ;
#ifdef DAT_EXTENSIONS
if (DAT_IB_MEM_PRIV_REMOTE_ATOMIC & privileges)
access |= IBV_ACCESS_REMOTE_ATOMIC;
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/qp.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/qp.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/qp.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_common/qp.c Wed May 5 15:41:28 2010
@@ -164,10 +164,7 @@
ep_ptr->qp_handle = conn->cm_id->qp;
ep_ptr->cm_handle = conn;
ep_ptr->qp_state = IBV_QPS_INIT;
-
- /* setup up ep->param to reference the bound local address and port */
- ep_ptr->param.local_ia_address_ptr =
- &conn->cm_id->route.addr.src_addr;
+
ep_ptr->param.local_port_qual = rdma_get_src_port(conn->cm_id);
#else
ep_ptr->qp_handle = ibv_create_qp(ib_pd_handle, &qp_create);
@@ -375,11 +372,11 @@
switch (qp_state) {
case IBV_QPS_RTR:
dapl_dbg_log(DAPL_DBG_TYPE_EP,
- " QPS_RTR: type %d qpn 0x%x lid 0x%x"
+ " QPS_RTR: type %d qpn 0x%x gid %p (%d) lid 0x%x"
" port %d ep %p qp_state %d \n",
- qp_handle->qp_type,
- ntohl(qpn), ntohs(lid),
- ia_ptr->hca_ptr->port_num,
+ qp_handle->qp_type, ntohl(qpn), gid,
+ ia_ptr->hca_ptr->ib_trans.global,
+ ntohs(lid), ia_ptr->hca_ptr->port_num,
ep_ptr, ep_ptr->qp_state);
mask |= IBV_QP_AV |
@@ -398,12 +395,17 @@
/* address handle. RC and UD */
qp_attr.ah_attr.dlid = ntohs(lid);
- if (ia_ptr->hca_ptr->ib_trans.global) {
+ if (gid && ia_ptr->hca_ptr->ib_trans.global) {
+ dapl_dbg_log(DAPL_DBG_TYPE_EP,
+ " QPS_RTR: GID Subnet 0x" F64x " ID 0x" F64x "\n",
+ (unsigned long long)htonll(gid->global.subnet_prefix),
+ (unsigned long long)htonll(gid->global.interface_id));
+
qp_attr.ah_attr.is_global = 1;
qp_attr.ah_attr.grh.dgid.global.subnet_prefix =
- ntohll(gid->global.subnet_prefix);
+ gid->global.subnet_prefix;
qp_attr.ah_attr.grh.dgid.global.interface_id =
- ntohll(gid->global.interface_id);
+ gid->global.interface_id;
qp_attr.ah_attr.grh.hop_limit =
ia_ptr->hca_ptr->ib_trans.hop_limit;
qp_attr.ah_attr.grh.traffic_class =
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/cm.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/cm.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/cm.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/cm.c Wed May 5 15:41:28 2010
@@ -317,6 +317,7 @@
closesocket(cm_ptr->socket);
}
dapl_os_unlock(&cm_ptr->lock);
+ dapl_os_lock_destroy(&cm_ptr->lock);
dapl_os_free(cm_ptr, sizeof(*cm_ptr));
return;
}
@@ -430,12 +431,12 @@
if (ep_ptr->cr_ptr) {
dapls_cr_callback(cm_ptr,
IB_CME_DISCONNECTED,
- NULL,
+ NULL, 0,
((DAPL_CR *) ep_ptr->cr_ptr)->sp_ptr);
} else {
dapl_evd_connection_callback(ep_ptr->cm_handle,
IB_CME_DISCONNECTED,
- NULL, ep_ptr);
+ NULL, 0, ep_ptr);
}
}
@@ -506,7 +507,7 @@
bail:
/* close socket, free cm structure and post error event */
dapls_ib_cm_free(cm_ptr, cm_ptr->ep);
- dapl_evd_connection_callback(NULL, IB_CME_LOCAL_FAILURE, NULL, ep_ptr);
+ dapl_evd_connection_callback(NULL, IB_CME_LOCAL_FAILURE, NULL, 0, ep_ptr);
}
/*
@@ -549,7 +550,7 @@
}
/* save remote address */
- dapl_os_memcpy(&cm_ptr->addr, r_addr, sizeof(r_addr));
+ dapl_os_memcpy(&cm_ptr->addr, r_addr, sizeof(*r_addr));
#ifdef DAPL_DBG
/* DBG: Active PID [0], PASSIVE PID [2]*/
@@ -732,7 +733,7 @@
IBV_QPS_RTR,
cm_ptr->msg.saddr.ib.qpn,
cm_ptr->msg.saddr.ib.lid,
- NULL) != DAT_SUCCESS) {
+ (ib_gid_handle_t)cm_ptr->msg.saddr.ib.gid) != DAT_SUCCESS) {
dapl_log(DAPL_DBG_TYPE_ERR,
" CONN_RTU: QPS_RTR ERR %s (%d,%d,%x,%x,%x) -> %s %x\n",
strerror(errno), ep_ptr->qp_handle->qp_type,
@@ -833,7 +834,8 @@
#endif
{
ep_ptr->cm_handle = cm_ptr; /* only RC, multi CR's on UD */
- dapl_evd_connection_callback(cm_ptr, event, cm_ptr->msg.p_data, ep_ptr);
+ dapl_evd_connection_callback(cm_ptr, event, cm_ptr->msg.p_data,
+ DCM_MAX_PDATA_SIZE, ep_ptr);
}
return;
@@ -847,7 +849,8 @@
dapls_modify_qp_state(ep_ptr->qp_handle, IBV_QPS_ERR, 0, 0, 0);
closesocket(cm_ptr->socket);
cm_ptr->socket = DAPL_INVALID_SOCKET;
- dapl_evd_connection_callback(NULL, event, cm_ptr->msg.p_data, ep_ptr);
+ dapl_evd_connection_callback(NULL, event, cm_ptr->msg.p_data,
+ DCM_MAX_PDATA_SIZE, ep_ptr);
}
/*
@@ -1044,7 +1047,7 @@
/* trigger CR event and return SUCCESS */
dapls_cr_callback(acm_ptr,
IB_CME_CONNECTION_REQUEST_PENDING,
- p_data, acm_ptr->sp);
+ p_data, exp, acm_ptr->sp);
return;
bail:
/* close socket, free cm structure, active will see close as rej */
@@ -1107,7 +1110,7 @@
IBV_QPS_RTR,
cm_ptr->msg.saddr.ib.qpn,
cm_ptr->msg.saddr.ib.lid,
- NULL) != DAT_SUCCESS) {
+ (ib_gid_handle_t)cm_ptr->msg.saddr.ib.gid) != DAT_SUCCESS) {
dapl_log(DAPL_DBG_TYPE_ERR,
" ACCEPT_USR: QPS_RTR ERR %s -> %s\n",
strerror(errno),
@@ -1274,7 +1277,7 @@
#endif
{
cm_ptr->ep->cm_handle = cm_ptr; /* only RC, multi CR's on UD */
- dapls_cr_callback(cm_ptr, event, NULL, cm_ptr->sp);
+ dapls_cr_callback(cm_ptr, event, NULL, 0, cm_ptr->sp);
}
return;
@@ -1285,7 +1288,7 @@
#endif
dapls_modify_qp_state(cm_ptr->ep->qp_handle, IBV_QPS_ERR, 0, 0, 0);
dapls_ib_cm_free(cm_ptr, cm_ptr->ep);
- dapls_cr_callback(cm_ptr, event, NULL, cm_ptr->sp);
+ dapls_cr_callback(cm_ptr, event, NULL, 0, cm_ptr->sp);
}
/*
@@ -1604,44 +1607,10 @@
return DAT_SUCCESS;
}
-/*
- * dapls_ib_private_data_size
- *
- * Return the size of private data given a connection op type
- *
- * Input:
- * prd_ptr private data pointer
- * conn_op connection operation type
- *
- * If prd_ptr is NULL, this is a query for the max size supported by
- * the provider, otherwise it is the actual size of the private data
- * contained in prd_ptr.
- *
- *
- * Output:
- * None
- *
- * Returns:
- * length of private data
- *
- */
-int dapls_ib_private_data_size(IN DAPL_PRIVATE * prd_ptr,
- IN DAPL_PDATA_OP conn_op, IN DAPL_HCA * hca_ptr)
-{
- int size;
-
- switch (conn_op) {
- case DAPL_PDATA_CONN_REQ:
- case DAPL_PDATA_CONN_REP:
- case DAPL_PDATA_CONN_REJ:
- case DAPL_PDATA_CONN_DREQ:
- case DAPL_PDATA_CONN_DREP:
- size = DCM_MAX_PDATA_SIZE;
- break;
- default:
- size = 0;
- }
- return size;
+int dapls_ib_private_data_size(
+ IN DAPL_HCA *hca_ptr)
+{
+ return DCM_MAX_PDATA_SIZE;
}
/*
@@ -1793,6 +1762,7 @@
shutdown(cr->socket, SHUT_RDWR);
closesocket(cr->socket);
}
+ dapl_os_lock_destroy(&cr->lock);
dapl_os_free(cr, sizeof(*cr));
continue;
}
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/dapl_ib_util.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/dapl_ib_util.h?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/dapl_ib_util.h (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/dapl_ib_util.h Wed May 5 15:41:28 2010
@@ -113,6 +113,9 @@
DAT_RETURN dapli_socket_disconnect(dp_ib_cm_handle_t cm_ptr);
dp_ib_cm_handle_t dapls_ib_cm_create(DAPL_EP *ep);
void dapls_ib_cm_free(dp_ib_cm_handle_t cm, DAPL_EP *ep);
+
+#ifdef DAPL_COUNTERS
void dapls_print_cm_list(IN DAPL_IA *ia_ptr);
+#endif
#endif /* _DAPL_IB_UTIL_H_ */
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/device.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/device.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/device.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_scm/device.c Wed May 5 15:41:28 2010
@@ -465,16 +465,10 @@
{
dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " close_hca: %p\n", hca_ptr);
- if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
- if (ibv_close_device(hca_ptr->ib_hca_handle))
- return (dapl_convert_errno(errno, "ib_close_device"));
- hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
- }
-
dapl_os_lock(&g_hca_lock);
if (g_ib_thread_state != IB_THREAD_RUN) {
dapl_os_unlock(&g_hca_lock);
- return (DAT_SUCCESS);
+ goto out;
}
dapl_os_unlock(&g_hca_lock);
@@ -509,6 +503,22 @@
dapl_os_sleep_usec(1000);
}
+out:
+ if (hca_ptr->ib_trans.ib_cq)
+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq);
+
+ if (hca_ptr->ib_trans.ib_cq_empty) {
+ struct ibv_comp_channel *channel;
+ channel = hca_ptr->ib_trans.ib_cq_empty->channel;
+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty);
+ ibv_destroy_comp_channel(channel);
+ }
+
+ if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
+ if (ibv_close_device(hca_ptr->ib_hca_handle))
+ return (dapl_convert_errno(errno, "ib_close_device"));
+ hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
+ }
return (DAT_SUCCESS);
}
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/cm.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/cm.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/cm.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/cm.c Wed May 5 15:41:28 2010
@@ -728,6 +728,7 @@
/* cleanup, never made it to work queue */
if (cm->state == DCM_INIT) {
dapl_os_unlock(&cm->lock);
+ dapl_os_lock_destroy(&cm->lock);
dapl_os_free(cm, sizeof(*cm));
return;
}
@@ -798,9 +799,9 @@
dapl_os_unlock(&cm->lock);
if (cm->sp)
- dapls_cr_callback(cm, IB_CME_DISCONNECTED, NULL, cm->sp);
+ dapls_cr_callback(cm, IB_CME_DISCONNECTED, NULL, 0, cm->sp);
else
- dapl_evd_connection_callback(cm, IB_CME_DISCONNECTED, NULL, cm->ep);
+ dapl_evd_connection_callback(cm, IB_CME_DISCONNECTED, NULL, 0, cm->ep);
}
/*
@@ -911,7 +912,7 @@
#endif
dapl_evd_connection_callback(cm,
IB_CME_DESTINATION_UNREACHABLE,
- NULL, ep);
+ NULL, 0, ep);
return DAT_ERROR(DAT_INVALID_ADDRESS,
DAT_INVALID_ADDRESS_UNREACHABLE);
@@ -1019,7 +1020,7 @@
IBV_QPS_RTR,
cm->msg.daddr.ib.qpn,
cm->msg.daddr.ib.lid,
- NULL) != DAT_SUCCESS) {
+ (ib_gid_handle_t)cm->msg.daddr.ib.gid) != DAT_SUCCESS) {
dapl_log(DAPL_DBG_TYPE_ERR,
" CONN_RTU: QPS_RTR ERR %s <- lid %x iqp %x\n",
strerror(errno), ntohs(cm->msg.daddr.ib.lid),
@@ -1126,14 +1127,14 @@
cm->ep->cm_handle = cm; /* only RC, multi CR's on UD */
dapl_evd_connection_callback(cm,
IB_CME_CONNECTED,
- cm->msg.p_data, cm->ep);
+ cm->msg.p_data, ntohs(cm->msg.p_size), cm->ep);
}
return;
bail:
if (cm->msg.saddr.ib.qp_type != IBV_QPT_UD)
dapls_ib_reinit_ep(cm->ep); /* reset QP state */
- dapl_evd_connection_callback(NULL, event, cm->msg.p_data, cm->ep);
+ dapl_evd_connection_callback(NULL, event, cm->msg.p_data, ntohs(cm->msg.p_size), cm->ep);
dapls_ib_cm_free(cm, NULL);
}
@@ -1204,7 +1205,7 @@
/* trigger CR event and return SUCCESS */
dapls_cr_callback(acm,
IB_CME_CONNECTION_REQUEST_PENDING,
- acm->msg.p_data, acm->sp);
+ acm->msg.p_data, ntohs(msg->p_size), acm->sp);
return;
bail:
@@ -1295,14 +1296,14 @@
} else {
#endif
cm->ep->cm_handle = cm; /* only RC, multi CR's on UD */
- dapls_cr_callback(cm, IB_CME_CONNECTED, NULL, cm->sp);
+ dapls_cr_callback(cm, IB_CME_CONNECTED, NULL, 0, cm->sp);
}
return;
bail:
if (cm->msg.saddr.ib.qp_type != IBV_QPT_UD)
dapls_ib_reinit_ep(cm->ep); /* reset QP state */
dapls_ib_cm_free(cm, cm->ep);
- dapls_cr_callback(cm, IB_CME_LOCAL_FAILURE, NULL, cm->sp);
+ dapls_cr_callback(cm, IB_CME_LOCAL_FAILURE, NULL, 0, cm->sp);
}
/*
@@ -1354,7 +1355,7 @@
} else
#endif
dapls_cr_callback(cm, IB_CME_LOCAL_FAILURE,
- NULL, cm->sp);
+ NULL, 0, cm->sp);
return -1;
}
dapl_os_get_time(&cm->timer); /* RTU expected */
@@ -1417,7 +1418,7 @@
IBV_QPS_RTR,
cm->msg.daddr.ib.qpn,
cm->msg.daddr.ib.lid,
- NULL) != DAT_SUCCESS) {
+ (ib_gid_handle_t)cm->msg.daddr.ib.gid) != DAT_SUCCESS) {
dapl_log(DAPL_DBG_TYPE_ERR,
" ACCEPT_USR: QPS_RTR ERR %s -> lid %x qpn %x\n",
strerror(errno), ntohs(cm->msg.daddr.ib.lid),
@@ -1701,6 +1702,7 @@
cm->state = DCM_DESTROY;
dapl_os_unlock(&cm->lock);
ucm_dequeue_listen(cm);
+ dapl_os_lock_destroy(&cm->lock);
dapl_os_free(cm, sizeof(*cm));
}
return DAT_SUCCESS;
@@ -1842,44 +1844,10 @@
return DAT_SUCCESS;
}
-/*
- * dapls_ib_private_data_size
- *
- * Return the size of private data given a connection op type
- *
- * Input:
- * prd_ptr private data pointer
- * conn_op connection operation type
- *
- * If prd_ptr is NULL, this is a query for the max size supported by
- * the provider, otherwise it is the actual size of the private data
- * contained in prd_ptr.
- *
- *
- * Output:
- * None
- *
- * Returns:
- * length of private data
- *
- */
-int dapls_ib_private_data_size(IN DAPL_PRIVATE * prd_ptr,
- IN DAPL_PDATA_OP conn_op, IN DAPL_HCA * hca_ptr)
-{
- int size;
-
- switch (conn_op) {
- case DAPL_PDATA_CONN_REQ:
- case DAPL_PDATA_CONN_REP:
- case DAPL_PDATA_CONN_REJ:
- case DAPL_PDATA_CONN_DREQ:
- case DAPL_PDATA_CONN_DREP:
- size = DCM_MAX_PDATA_SIZE;
- break;
- default:
- size = 0;
- }
- return size;
+int dapls_ib_private_data_size(
+ IN DAPL_HCA *hca_ptr)
+{
+ return DCM_MAX_PDATA_SIZE;
}
/*
@@ -2015,6 +1983,7 @@
dapl_llist_remove_entry(&hca->ib_trans.list,
(DAPL_LLIST_ENTRY *)&cm->entry);
dapl_os_unlock(&cm->lock);
+ dapl_os_lock_destroy(&cm->lock);
dapl_os_free(cm, sizeof(*cm));
continue;
}
@@ -2086,6 +2055,7 @@
&hca->ib_trans.list,
(DAPL_LLIST_ENTRY *)&cm->entry);
dapl_os_unlock(&cm->lock);
+ dapl_os_lock_destroy(&cm->lock);
dapl_os_free(cm, sizeof(*cm));
continue;
}
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/dapl_ib_util.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/dapl_ib_util.h?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/dapl_ib_util.h (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/dapl_ib_util.h Wed May 5 15:41:28 2010
@@ -119,7 +119,10 @@
void dapli_cq_event_cb(struct _ib_hca_transport *tp);
dp_ib_cm_handle_t dapls_ib_cm_create(DAPL_EP *ep);
void dapls_ib_cm_free(dp_ib_cm_handle_t cm, DAPL_EP *ep);
+
+#ifdef DAPL_COUNTERS
void dapls_print_cm_list(IN DAPL_IA *ia_ptr);
+#endif
#endif /* _DAPL_IB_UTIL_H_ */
Modified: branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/device.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/device.c?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/device.c (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/dapl/openib_ucm/device.c Wed May 5 15:41:28 2010
@@ -401,6 +401,16 @@
destroy_os_signal(hca_ptr);
ucm_service_destroy(hca_ptr);
+ if (hca_ptr->ib_trans.ib_cq)
+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq);
+
+ if (hca_ptr->ib_trans.ib_cq_empty) {
+ struct ibv_comp_channel *channel;
+ channel = hca_ptr->ib_trans.ib_cq_empty->channel;
+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty);
+ ibv_destroy_comp_channel(channel);
+ }
+
if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
if (ibv_close_device(hca_ptr->ib_hca_handle))
return (dapl_convert_errno(errno, "ib_close_device"));
Modified: branches/ofed-1.5.1lenny/dapl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/dapl/trunk/debian/changelog?rev=727&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/dapl/trunk/debian/changelog (original)
+++ branches/ofed-1.5.1lenny/dapl/trunk/debian/changelog Wed May 5 15:41:28 2010
@@ -1,3 +1,9 @@
+dapl (2.0.27-1) unstable; urgency=low
+
+ * New upstream release (OFED 1.5.1)
+
+ -- Guy Coates <gmpc at sanger.ac.uk> Wed, 05 May 2010 16:40:13 +0100
+
dapl (2.0.25-1) unstable; urgency=low
* New upstream release (OFED 1.5)
More information about the Pkg-ofed-commits
mailing list