[Pkg-ofed-commits] [libcxgb3] 07/09: Imported Upstream version 1.3.1
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Wed Jul 2 13:22:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository libcxgb3.
commit e416513fe8692391b216af3c063dbe037d1f4076
Author: Ana Guerrero López <ana at ekaia.org>
Date: Wed Jul 2 15:22:21 2014 +0200
Imported Upstream version 1.3.1
---
ChangeLog | 26 ++++++++++++++++++++++++--
Makefile.in | 2 +-
configure | 20 ++++++++++----------
configure.in | 4 ++--
libcxgb3.spec | 4 ++--
libcxgb3.spec.in | 2 +-
src/cxio_wr.h | 1 +
src/qp.c | 14 ++++++++++----
8 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e1fc2d8..6e3de60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,28 @@
-commit aa01ae66b6b9d83b570631456bf03b6b42b90931
+commit 49507d0a9d75a146be39e5fd89e749aba89fc23d
Author: Steve Wise <swise at opengridcomputing.com>
-Date: Mon Oct 25 10:06:54 2010 -0500
+Date: Mon Oct 10 09:52:43 2011 -0500
+
+ Spin 1.3.1 release.
+
+ Signed-off-by: Steve Wise <swise at opengridcomputing.com>
+
+commit f2aed2ca2ede359f04b43e482c8e0cd6e035aa9d
+Author: Kumar Sanghvi <kumaras at chelsio.com>
+Date: Mon Oct 10 09:51:43 2011 -0500
+
+ From 20c71f269c2b9abbab9a0b3333dd15aaf8c0de0f Mon Sep 17 00:00:00 2001
+ Subject: [PATCH] qp.c: Track qp flush status
+
+ Track qp flush status, and don't re-flush a qp if its already
+ flushed once.
+
+ This resolves segfaults observed with dapltest.
+
+ Signed-off-by: Kumar Sanghvi <kumaras at chelsio.com>
+
+commit 0bbd607c53059e12d6a020332b0cb6f1a1435350
+Author: Steve Wise <swise at opengridcomputing.com>
+Date: Mon Oct 25 10:07:00 2010 -0500
Spin release 1.3.0.
diff --git a/Makefile.in b/Makefile.in
index 8c1cdd6..8e35827 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -472,7 +472,7 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -find $(distdir) -type d ! -perm -755 -exec chmod a+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
diff --git a/configure b/configure
index 9e4cc00..df506ef 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libcxgb3 1.3.0.
+# Generated by GNU Autoconf 2.59 for libcxgb3 1.3.1.
#
# Report bugs to <linux-rdma at vger.kernel.org>.
#
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libcxgb3'
PACKAGE_TARNAME='libcxgb3'
-PACKAGE_VERSION='1.3.0'
-PACKAGE_STRING='libcxgb3 1.3.0'
+PACKAGE_VERSION='1.3.1'
+PACKAGE_STRING='libcxgb3 1.3.1'
PACKAGE_BUGREPORT='linux-rdma at vger.kernel.org'
ac_unique_file="src/iwch.h"
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
# 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 libcxgb3 1.3.0 to adapt to many kinds of systems.
+\`configure' configures libcxgb3 1.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libcxgb3 1.3.0:";;
+ short | recursive ) echo "Configuration of libcxgb3 1.3.1:";;
esac
cat <<\_ACEOF
@@ -1160,7 +1160,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libcxgb3 configure 1.3.0
+libcxgb3 configure 1.3.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1174,7 +1174,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libcxgb3 $as_me 1.3.0, which was
+It was created by libcxgb3 $as_me 1.3.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1820,7 +1820,7 @@ fi
# Define the identity of the package.
PACKAGE=libcxgb3
- VERSION=1.3.0
+ VERSION=1.3.1
cat >>confdefs.h <<_ACEOF
@@ -21075,7 +21075,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by libcxgb3 $as_me 1.3.0, which was
+This file was extended by libcxgb3 $as_me 1.3.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21138,7 +21138,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libcxgb3 config.status 1.3.0
+libcxgb3 config.status 1.3.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index ebf6a1e..9efc82d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libcxgb3, 1.3.0, linux-rdma at vger.kernel.org)
+AC_INIT(libcxgb3, 1.3.1, linux-rdma at vger.kernel.org)
AC_CONFIG_SRCDIR([src/iwch.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libcxgb3, 1.3.0)
+AM_INIT_AUTOMAKE(libcxgb3, 1.3.1)
AM_PROG_LIBTOOL
AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presence of ib libraries],
diff --git a/libcxgb3.spec b/libcxgb3.spec
index a60b3e5..d282c15 100644
--- a/libcxgb3.spec
+++ b/libcxgb3.spec
@@ -1,7 +1,7 @@
-%define ver 1.3.0
+%define ver 1.3.1
Name: libcxgb3
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Chelsio T3 RNIC Open Fabrics Userspace Library
diff --git a/libcxgb3.spec.in b/libcxgb3.spec.in
index 7cf405d..1ae72d7 100644
--- a/libcxgb3.spec.in
+++ b/libcxgb3.spec.in
@@ -1,7 +1,7 @@
%define ver @VERSION@
Name: libcxgb3
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Chelsio T3 RNIC Open Fabrics Userspace Library
diff --git a/src/cxio_wr.h b/src/cxio_wr.h
index 7396610..ece06bd 100644
--- a/src/cxio_wr.h
+++ b/src/cxio_wr.h
@@ -603,6 +603,7 @@ struct t3_wq {
uint32_t rq_rptr; /* pending wrs */
uint32_t rq_size_log2; /* rq size */
volatile uint32_t *doorbell; /* mapped adapter doorbell register */
+ int flushed;
};
struct t3_cq {
diff --git a/src/qp.c b/src/qp.c
index 262e305..34b6fa9 100644
--- a/src/qp.c
+++ b/src/qp.c
@@ -478,10 +478,14 @@ void iwch_flush_qp(struct iwch_qp *qhp)
struct iwch_cq *rchp, *schp;
int count;
+ if (qhp->wq.flushed)
+ return;
+
rchp = qhp->rhp->cqid2ptr[to_iwch_cq(qhp->ibv_qp.recv_cq)->cq.cqid];
schp = qhp->rhp->cqid2ptr[to_iwch_cq(qhp->ibv_qp.send_cq)->cq.cqid];
PDBG("%s qhp %p rchp %p schp %p\n", __FUNCTION__, qhp, rchp, schp);
+ qhp->wq.flushed = 1;
#ifdef notyet
/* take a ref on the qhp since we must release the lock */
@@ -522,10 +526,12 @@ void iwch_flush_qps(struct iwch_device *dev)
pthread_spin_lock(&dev->lock);
for (i=0; i < T3_MAX_NUM_QP; i++) {
struct iwch_qp *qhp = dev->qpid2ptr[i];
- if (qhp && t3_wq_in_error(&qhp->wq)) {
- pthread_spin_lock(&qhp->lock);
- iwch_flush_qp(qhp);
- pthread_spin_unlock(&qhp->lock);
+ if (qhp) {
+ if (!qhp->wq.flushed && t3_wq_in_error(&qhp->wq)) {
+ pthread_spin_lock(&qhp->lock);
+ iwch_flush_qp(qhp);
+ pthread_spin_unlock(&qhp->lock);
+ }
}
}
pthread_spin_unlock(&dev->lock);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libcxgb3.git
More information about the Pkg-ofed-commits
mailing list