Hello community,
here is the log from the commit of package libocrdma-rdmav2 for openSUSE:Factory checked in at 2015-02-14 13:57:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libocrdma-rdmav2 (Old)
and /work/SRC/openSUSE:Factory/.libocrdma-rdmav2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libocrdma-rdmav2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libocrdma-rdmav2/libocrdma-rdmav2.changes 2014-07-23 22:06:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libocrdma-rdmav2.new/libocrdma-rdmav2.changes 2015-02-14 13:57:07.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 12 16:17:22 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 1.0.5
+ * No changelog available
+- Use download Url as source
+
+-------------------------------------------------------------------
Old:
----
libocrdma-1.0.2.tar.gz
New:
----
libocrdma-1.0.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libocrdma-rdmav2.spec ++++++
--- /var/tmp/diff_new_pack.NrIHOR/_old 2015-02-14 13:57:08.000000000 +0100
+++ /var/tmp/diff_new_pack.NrIHOR/_new 2015-02-14 13:57:08.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libocrdma (Version 1.0.1)
+# spec file for package libocrdma
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: libocrdma-rdmav2
Summary: Userspace Library for Emulex ROCEE Device
-Version: 1.0.2
+Version: 1.0.5
Release: 1
License: GPL-2.0 or BSD-2-Clause
Group: System/Libraries
-Source0: libocrdma-%{version}.tar.gz
+Source0: https://www.openfabrics.org/downloads/libocrdma/libocrdma-%{version}.tar.gz
Url: http://www.openfabrics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libibverbs-devel
++++++ libocrdma-1.0.2.tar.gz -> libocrdma-1.0.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libocrdma-1.0.2/configure new/libocrdma-1.0.5/configure
--- old/libocrdma-1.0.2/configure 2014-02-25 17:10:06.000000000 +0100
+++ new/libocrdma-1.0.5/configure 2015-01-17 11:11:26.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libocrdma 1.0.2.
+# Generated by GNU Autoconf 2.63 for libocrdma 1.0.5.
#
# Report bugs to .
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='libocrdma'
PACKAGE_TARNAME='libocrdma'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='libocrdma 1.0.2'
+PACKAGE_VERSION='1.0.5'
+PACKAGE_STRING='libocrdma 1.0.5'
PACKAGE_BUGREPORT='linux-rdma@vger.kernel.org'
ac_unique_file="src/ocrdma_main.h"
@@ -1472,7 +1472,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 libocrdma 1.0.2 to adapt to many kinds of systems.
+\`configure' configures libocrdma 1.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1542,7 +1542,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libocrdma 1.0.2:";;
+ short | recursive ) echo "Configuration of libocrdma 1.0.5:";;
esac
cat <<\_ACEOF
@@ -1642,7 +1642,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libocrdma configure 1.0.2
+libocrdma configure 1.0.5
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1656,7 +1656,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libocrdma $as_me 1.0.2, which was
+It was created by libocrdma $as_me 1.0.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2508,7 +2508,7 @@
# Define the identity of the package.
PACKAGE=libocrdma
- VERSION=1.0.2
+ VERSION=1.0.5
cat >>confdefs.h <<_ACEOF
@@ -13520,7 +13520,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libocrdma $as_me 1.0.2, which was
+This file was extended by libocrdma $as_me 1.0.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13583,7 +13583,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libocrdma config.status 1.0.2
+libocrdma config.status 1.0.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libocrdma-1.0.2/configure.in new/libocrdma-1.0.5/configure.in
--- old/libocrdma-1.0.2/configure.in 2014-02-25 17:09:46.000000000 +0100
+++ new/libocrdma-1.0.5/configure.in 2015-01-17 10:24:06.000000000 +0100
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libocrdma, 1.0.2, linux-rdma@vger.kernel.org)
+AC_INIT(libocrdma, 1.0.5, linux-rdma@vger.kernel.org)
AC_CONFIG_SRCDIR([src/ocrdma_main.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libocrdma, 1.0.2)
+AM_INIT_AUTOMAKE(libocrdma, 1.0.5)
AM_PROG_LIBTOOL
AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for the presence of ib libraries],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libocrdma-1.0.2/libocrdma.spec new/libocrdma-1.0.5/libocrdma.spec
--- old/libocrdma-1.0.2/libocrdma.spec 2014-02-25 17:10:20.000000000 +0100
+++ new/libocrdma-1.0.5/libocrdma.spec 2015-01-17 11:12:36.000000000 +0100
@@ -1,5 +1,5 @@
Name: libocrdma
-Version: 1.0.2
+Version: 1.0.5
Release: 1%{?dist}
Summary: Userspace Library for Emulex ROCEE Device.
Group: System Environment/Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libocrdma-1.0.2/src/ocrdma_abi.h new/libocrdma-1.0.5/src/ocrdma_abi.h
--- old/libocrdma-1.0.2/src/ocrdma_abi.h 2014-02-25 17:03:46.000000000 +0100
+++ new/libocrdma-1.0.5/src/ocrdma_abi.h 2015-01-17 10:24:06.000000000 +0100
@@ -74,7 +74,7 @@
uint32_t ah_tbl_len;
uint32_t rqe_size;
uint8_t fw_ver[32];
- uint32_t rsvd1;
+ uint64_t rsvd1;
uint64_t rsvd2;
};
@@ -153,8 +153,7 @@
uint32_t db_sq_offset;
uint32_t db_rq_offset;
uint32_t db_shift;
- uint64_t rsvd2;
- uint64_t rsvd3;
+ uint64_t rsvd[11]; /* 8*8 + 4*4 + 8 */
};
struct ocrdma_create_srq_cmd {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libocrdma-1.0.2/src/ocrdma_verbs.c new/libocrdma-1.0.5/src/ocrdma_verbs.c
--- old/libocrdma-1.0.2/src/ocrdma_verbs.c 2014-02-25 17:03:46.000000000 +0100
+++ new/libocrdma-1.0.5/src/ocrdma_verbs.c 2015-01-17 10:24:06.000000000 +0100
@@ -209,10 +209,11 @@
struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
status = ibv_cmd_dealloc_pd(ibpd);
- if (pd->dpp_va)
- munmap((void *)pd->dpp_va, OCRDMA_DPP_PAGE_SIZE);
if (status)
return status;
+
+ if (pd->dpp_va)
+ munmap((void *)pd->dpp_va, OCRDMA_DPP_PAGE_SIZE);
free(pd);
return 0;
}
@@ -356,8 +357,12 @@
int ocrdma_destroy_cq(struct ibv_cq *ibv_cq)
{
struct ocrdma_cq *cq = get_ocrdma_cq(ibv_cq);
+ int status;
+
+ status = ibv_cmd_destroy_cq(ibv_cq);
+ if (status)
+ return status;
- ibv_cmd_destroy_cq(ibv_cq);
if (cq->db_va)
munmap((void *)cq->db_va, cq->db_size);
if (cq->va)
@@ -484,6 +489,9 @@
id = dev->id;
status = ibv_cmd_destroy_srq(ibsrq);
+ if (status)
+ return status;
+
if (srq->idx_bit_fields)
free(srq->idx_bit_fields);
if (srq->rqe_wr_id_tbl)
@@ -778,7 +786,7 @@
ocrdma_del_flush_qp(qp);
break;
default:
- status = -EINVAL;
+ status = EINVAL;
break;
};
break;
@@ -794,7 +802,7 @@
break;
default:
/* invalid state change. */
- status = -EINVAL;
+ status = EINVAL;
break;
};
break;
@@ -808,7 +816,7 @@
break;
default:
/* invalid state change. */
- status = -EINVAL;
+ status = EINVAL;
break;
};
break;
@@ -823,7 +831,7 @@
break;
default:
/* invalid state change. */
- status = -EINVAL;
+ status = EINVAL;
break;
};
break;
@@ -836,7 +844,7 @@
break;
default:
/* invalid state change. */
- status = -EINVAL;
+ status = EINVAL;
break;
};
break;
@@ -847,7 +855,7 @@
break;
default:
/* invalid state change. */
- status = -EINVAL;
+ status = EINVAL;
break;
};
break;
@@ -857,12 +865,12 @@
case OCRDMA_QPS_RST:
break;
default:
- status = -EINVAL;
+ status = EINVAL;
break;
};
break;
default:
- status = -EINVAL;
+ status = EINVAL;
break;
};
if (!status)
@@ -1226,7 +1234,7 @@
ocrdma_err
("%s() supported_len=0x%x, unspported len req=0x%x\n",
__func__, qp->max_inline_data, hdr->total_len);
- return -EINVAL;
+ return EINVAL;
}
dpp_addr = (char *)sge;
@@ -1391,14 +1399,22 @@
if (qp->state != OCRDMA_QPS_RTS && qp->state != OCRDMA_QPS_SQD) {
pthread_spin_unlock(&qp->q_lock);
*bad_wr = wr;
- return -EINVAL;
+ return EINVAL;
}
while (wr) {
+
+ if (qp->qp_type == IBV_QPT_UD && (wr->opcode != IBV_WR_SEND &&
+ wr->opcode != IBV_WR_SEND_WITH_IMM)) {
+ *bad_wr = wr;
+ status = EINVAL;
+ break;
+ }
+
if (ocrdma_hwq_free_cnt(&qp->sq) == 0 ||
wr->num_sge > qp->sq.max_sges) {
*bad_wr = wr;
- status = -ENOMEM;
+ status = ENOMEM;
break;
}
hdr = ocrdma_hwq_head(&qp->sq);
@@ -1433,7 +1449,7 @@
ocrdma_build_read(qp, hdr, wr);
break;
default:
- status = -EINVAL;
+ status = EINVAL;
break;
}
if (status) {
@@ -1501,13 +1517,13 @@
if (qp->state == OCRDMA_QPS_RST || qp->state == OCRDMA_QPS_ERR) {
pthread_spin_unlock(&qp->q_lock);
*bad_wr = wr;
- return -EINVAL;
+ return EINVAL;
}
while (wr) {
if (ocrdma_hwq_free_cnt(&qp->rq) == 0 ||
wr->num_sge > qp->rq.max_sges) {
- status = -ENOMEM;
+ status = ENOMEM;
*bad_wr = wr;
break;
}
@@ -1731,6 +1747,11 @@
*stop = 1;
expand = 0;
}
+ } else if (is_hw_sq_empty(qp)) {
+ /* Do nothing */
+ expand = 0;
+ *polled = 0;
+ *stop = 0;
} else {
*polled = 1;
expand = ocrdma_update_err_scqe(ibwc, cqe, qp, status);
@@ -1840,6 +1861,11 @@
*stop = 1;
expand = 0;
}
+ } else if (is_hw_rq_empty(qp)) {
+ /* Do nothing */
+ expand = 0;
+ *polled = 0;
+ *stop = 0;
} else {
*polled = 1;
expand = ocrdma_update_err_rcqe(ibwc, cqe, qp, status);
@@ -2054,12 +2080,9 @@
if (cq->first_arm) {
ocrdma_ring_cq_db(cq, 1, solicited, 0);
cq->first_arm = 0;
- goto skip_defer;
}
cq->deferred_arm = 1;
-
-skip_defer:
cq->deferred_sol = solicited;
pthread_spin_unlock(&cq->cq_lock);
@@ -2083,7 +2106,7 @@
while (wr) {
if (ocrdma_hwq_free_cnt(&srq->rq) == 0 ||
wr->num_sge > srq->rq.max_sges) {
- status = -ENOMEM;
+ status = ENOMEM;
*bad_wr = wr;
break;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
