diff --git a/dapl-2.0.30-dat-ia-open-hang.patch b/dapl-2.0.30-dat-ia-open-hang.patch index b446c1e..2ed99b8 100644 --- a/dapl-2.0.30-dat-ia-open-hang.patch +++ b/dapl-2.0.30-dat-ia-open-hang.patch @@ -1,19 +1,8 @@ -From: Pradeep Satyanarayana -Subject: [PATCH] Hang in dat_ia_open() - -Fixes hang due to erroneous invocation of rdma_destroy_id() twice -in a row - -Acked-by: John Jolly ---- - dapl/openib_cma/device.c | 1 - - 1 file changed, 1 deletion(-) - -Index: dapl/openib_cma/device.c -=================================================================== ---- dapl/openib_cma/device.c.orig 2016-03-10 15:08:38.037462973 +0100 -+++ dapl/openib_cma/device.c 2016-03-10 15:10:39.068801915 +0100 -@@ -313,7 +313,6 @@ DAT_RETURN dapls_ib_open_hca(IN IB_HCA_N +diff --git dapl/openib_cma/device.c dapl/openib_cma/device.c +index 326df62..f1a253d 100644 +--- dapl/openib_cma/device.c ++++ dapl/openib_cma/device.c +@@ -305,7 +305,6 @@ DAT_RETURN dapls_ib_open_hca(IN IB_HCA_NAME hca_name, } ret = rdma_bind_addr(cm_id, (struct sockaddr *)&hca_ptr->hca_address); if ((ret) || (cm_id->verbs == NULL)) { diff --git a/dapl-2.1.10.tar.gz b/dapl-2.1.10.tar.gz new file mode 100644 index 0000000..5542840 --- /dev/null +++ b/dapl-2.1.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eb6df3b47fcaad8ea6d35453ffc884b1ef2148f7a0984a3556795bab650fa9b +size 1071002 diff --git a/dapl-2.1.8-git6316f83.tar.xz b/dapl-2.1.8-git6316f83.tar.xz deleted file mode 100644 index a038b5a..0000000 --- a/dapl-2.1.8-git6316f83.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:040f25124182af299c65e0c3117c0d6bafd8cdc5eade11abd8a114d60c6be592 -size 702700 diff --git a/dapl-debug.changes b/dapl-debug.changes index e7e11fd..0db935d 100644 --- a/dapl-debug.changes +++ b/dapl-debug.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Jul 20 08:25:04 UTC 2017 - nmoreychaisemartin@suse.com + +- Update to 2.1.10 + * dtest_suite: add option to pause the test. + * dtestcm: add client retry, give server time to queue up all listens + * dtest: Add new man pages. (dtestx dtestcm dtestsrq) + * cma: fix open_query mode, initialize attributes + * ucm: up level CM timer logging, increase drep time at scale + * dtest: fix return value check on do_rdma_write_with_msg + * dtestx: check device capabilities and do atomic tests only if supported by HW + * common: set atomic attributes based on provider/device capabilities + * build: dtest_suite.sh was moved to test/scripts + * mpxyd: let TX thread sleep if no open devices are referenced + * mcm: when mmap req from MIC return with fail stat print WARN. + * dtest_suite: remove duplicate dtest_suite.sh + * dtest: enable -D option (data check) to work with scif provider + * dtest_suite: fix typo in user_string var + * mcm: remove logs from post send speed path + * mcm proxy: push WR from MIC to host with scif mmap memory instead of scif_send. + * dtest: the default size in pingpong test is set to 1 byte regardless to user input. + * dtest: cleanup 4 printfs from the middle of performance test, may reduce performance. +- Refresh patches against 2.1.10 + ------------------------------------------------------------------- Mon Jun 12 09:28:22 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/dapl-debug.spec b/dapl-debug.spec index 89b6772..bc2c736 100644 --- a/dapl-debug.spec +++ b/dapl-debug.spec @@ -16,14 +16,14 @@ # -%define git_version -git6316f83 +%define git_version %nil Name: dapl-debug Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs License: BSD-3-Clause or GPL-2.0+ or CPL-1.0 Group: Productivity/Networking/System -Version: 2.1.8 +Version: 2.1.10 Release: 0 -Source0: dapl-%{version}%{git_version}.tar.xz +Source0: https://www.openfabrics.org/downloads/dapl/dapl-%version.tar.gz Source1: dapl-rpmlintrc Source2: baselibs.conf Patch1: dapl-2.0.30-dat-ia-open-hang.patch @@ -166,12 +166,15 @@ mv %{buildroot}%{_bindir}/dtestcm %{buildroot}%{_bindir}/dapl-testcm mv %{buildroot}%{_bindir}/dtestsrq %{buildroot}%{_bindir}/dapl-testsrx mv %{buildroot}%{_bindir}/dtestx %{buildroot}%{_bindir}/dapl-testx +%define man_regexp -e s/dapltest/dapl-test/g -e s/dtestcm/dapl-testcm/g -e s/dtestsrq/dapl-testsrq/g -e s/dtestx/dapl-testx/g -e s/dtest/dapl-utest/g + %if "%{name}" != "dapl-debug" # Fix man pages accordingly -sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dtest.1 > %{buildroot}%{_mandir}/man1/dapl-utest.1 -rm %{buildroot}%{_mandir}/man1/dtest.1 -sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dapltest.1 > %{buildroot}%{_mandir}/man1/dapl-test.1 -rm %{buildroot}%{_mandir}/man1/dapltest.1 +for manpage in dapltest dtest dtestcm dtestsrq dtestx; do + new_name=$(echo $manpage | sed %man_regexp) + sed %man_regexp %{buildroot}%{_mandir}/man1/$manpage.1 > %{buildroot}%{_mandir}/man1/$new_name.1 + rm %{buildroot}%{_mandir}/man1/$manpage.1 +done %endif %post -n %lname -p /sbin/ldconfig @@ -276,6 +279,9 @@ fi %if "%{name}" != "dapl-debug" %_mandir/man1/dapl-test.1* %_mandir/man1/dapl-utest.1* +%_mandir/man1/dapl-testcm.1* +%_mandir/man1/dapl-testsrq.1* +%_mandir/man1/dapl-testx.1* %endif %changelog diff --git a/dapl-define_NULL.patch b/dapl-define_NULL.patch index 35a01a2..c548e3e 100644 --- a/dapl-define_NULL.patch +++ b/dapl-define_NULL.patch @@ -1,7 +1,7 @@ -Index: dat/common/dat_strerror.c -=================================================================== ---- dat/common/dat_strerror.c.orig 2011-08-19 19:09:23.000000000 +0200 -+++ dat/common/dat_strerror.c 2012-06-28 18:01:00.330122282 +0200 +diff --git dat/common/dat_strerror.c dat/common/dat_strerror.c +index 915dfb0..5f26383 100644 +--- dat/common/dat_strerror.c ++++ dat/common/dat_strerror.c @@ -37,6 +37,10 @@ * $Id: dat_strerror.c,v 1.10 2005/03/24 05:58:28 jlentini Exp $ **********************************************************************/ diff --git a/dapl-man_page_fixes.patch b/dapl-man_page_fixes.patch index fa63de5..4eee812 100644 --- a/dapl-man_page_fixes.patch +++ b/dapl-man_page_fixes.patch @@ -1,22 +1,17 @@ ---- - man/dapltest.1 | 1 - - man/dat.conf.5 | 6 +++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -Index: man/dapltest.1 -=================================================================== ---- man/dapltest.1.orig 2014-01-21 18:05:33.163795906 +0100 -+++ man/dapltest.1 2014-01-21 18:06:00.011174084 +0100 +diff --git man/dapltest.1 man/dapltest.1 +index 90fd6d2..0cbee31 100644 +--- man/dapltest.1 ++++ man/dapltest.1 @@ -1,4 +1,3 @@ -." Text automatically generated by txt2man - .TH dapltest 1 "July 16, 2013" "uDAPL 2.0" "USER COMMANDS" + .TH dapltest 1 "November 15, 2016" "uDAPL 2.1" "USER COMMANDS" .SH NAME -Index: man/dat.conf.5 -=================================================================== ---- man/dat.conf.5.orig 2013-06-07 02:42:48.000000000 +0200 -+++ man/dat.conf.5 2014-01-21 18:05:33.164795883 +0100 -@@ -25,7 +25,7 @@ entries in the \fIdat.conf\fR file. The +diff --git man/dat.conf.5 man/dat.conf.5 +index e3f11a4..2fc1d32 100644 +--- man/dat.conf.5 ++++ man/dat.conf.5 +@@ -25,7 +25,7 @@ entries in the \fIdat.conf\fR file. The process of adding a provider entry is termed Static Registration. .PP .SH "Registry File Format" @@ -31,15 +26,15 @@ Index: man/dat.conf.5 .SH OpenFabrics RDMA providers: -\br +\br - Provider options for both 1.2 and 2.0, each using different CM services + Provider options for different CM services 1. cma - OpenFabrics rdma_cm - uses rdma_cm services for connections @@ -68,7 +68,7 @@ entry is termed Static Registration. - - libdaplucm.so (1.2), libdaploucm (2.0) + - libdaploucm (2.0) .PP .SH Example entries for each OpenFabrics provider -\br +\br - 1. cma - OpenFarbrics rdma_cm (v1.2 and v2.0 examples) + 1. cma - OpenFarbrics rdma_cm examples diff --git a/dapl-s390.patch b/dapl-s390.patch index 739f3bb..395ed08 100644 --- a/dapl-s390.patch +++ b/dapl-s390.patch @@ -1,11 +1,7 @@ ---- - dapl/udapl/linux/dapl_osd.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -Index: dapl/udapl/linux/dapl_osd.h -=================================================================== ---- dapl/udapl/linux/dapl_osd.h.orig 2016-03-10 14:56:57.000000000 +0100 -+++ dapl/udapl/linux/dapl_osd.h 2016-03-10 18:28:46.909424533 +0100 +diff --git dapl/udapl/linux/dapl_osd.h dapl/udapl/linux/dapl_osd.h +index 2b255d0..d9362f5 100644 +--- dapl/udapl/linux/dapl_osd.h ++++ dapl/udapl/linux/dapl_osd.h @@ -51,7 +51,7 @@ #if !defined (__i386__) && !defined (__ia64__) && !defined(__x86_64__) && \ diff --git a/dapl.changes b/dapl.changes index e7e11fd..0db935d 100644 --- a/dapl.changes +++ b/dapl.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Jul 20 08:25:04 UTC 2017 - nmoreychaisemartin@suse.com + +- Update to 2.1.10 + * dtest_suite: add option to pause the test. + * dtestcm: add client retry, give server time to queue up all listens + * dtest: Add new man pages. (dtestx dtestcm dtestsrq) + * cma: fix open_query mode, initialize attributes + * ucm: up level CM timer logging, increase drep time at scale + * dtest: fix return value check on do_rdma_write_with_msg + * dtestx: check device capabilities and do atomic tests only if supported by HW + * common: set atomic attributes based on provider/device capabilities + * build: dtest_suite.sh was moved to test/scripts + * mpxyd: let TX thread sleep if no open devices are referenced + * mcm: when mmap req from MIC return with fail stat print WARN. + * dtest_suite: remove duplicate dtest_suite.sh + * dtest: enable -D option (data check) to work with scif provider + * dtest_suite: fix typo in user_string var + * mcm: remove logs from post send speed path + * mcm proxy: push WR from MIC to host with scif mmap memory instead of scif_send. + * dtest: the default size in pingpong test is set to 1 byte regardless to user input. + * dtest: cleanup 4 printfs from the middle of performance test, may reduce performance. +- Refresh patches against 2.1.10 + ------------------------------------------------------------------- Mon Jun 12 09:28:22 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/dapl.spec b/dapl.spec index b99ed4d..b08e08c 100644 --- a/dapl.spec +++ b/dapl.spec @@ -16,14 +16,14 @@ # -%define git_version -git6316f83 +%define git_version %nil Name: dapl Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs License: BSD-3-Clause or GPL-2.0+ or CPL-1.0 Group: Productivity/Networking/System -Version: 2.1.8 +Version: 2.1.10 Release: 0 -Source0: dapl-%{version}%{git_version}.tar.xz +Source0: https://www.openfabrics.org/downloads/dapl/dapl-%version.tar.gz Source1: dapl-rpmlintrc Source2: baselibs.conf Patch1: dapl-2.0.30-dat-ia-open-hang.patch @@ -166,12 +166,15 @@ mv %{buildroot}%{_bindir}/dtestcm %{buildroot}%{_bindir}/dapl-testcm mv %{buildroot}%{_bindir}/dtestsrq %{buildroot}%{_bindir}/dapl-testsrx mv %{buildroot}%{_bindir}/dtestx %{buildroot}%{_bindir}/dapl-testx +%define man_regexp -e s/dapltest/dapl-test/g -e s/dtestcm/dapl-testcm/g -e s/dtestsrq/dapl-testsrq/g -e s/dtestx/dapl-testx/g -e s/dtest/dapl-utest/g + %if "%{name}" != "dapl-debug" # Fix man pages accordingly -sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dtest.1 > %{buildroot}%{_mandir}/man1/dapl-utest.1 -rm %{buildroot}%{_mandir}/man1/dtest.1 -sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dapltest.1 > %{buildroot}%{_mandir}/man1/dapl-test.1 -rm %{buildroot}%{_mandir}/man1/dapltest.1 +for manpage in dapltest dtest dtestcm dtestsrq dtestx; do + new_name=$(echo $manpage | sed %man_regexp) + sed %man_regexp %{buildroot}%{_mandir}/man1/$manpage.1 > %{buildroot}%{_mandir}/man1/$new_name.1 + rm %{buildroot}%{_mandir}/man1/$manpage.1 +done %endif %post -n %lname -p /sbin/ldconfig @@ -276,6 +279,9 @@ fi %if "%{name}" != "dapl-debug" %_mandir/man1/dapl-test.1* %_mandir/man1/dapl-utest.1* +%_mandir/man1/dapl-testcm.1* +%_mandir/man1/dapl-testsrq.1* +%_mandir/man1/dapl-testx.1* %endif %changelog