summaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorMike Marciniszyn2016-04-12 19:45:51 +0200
committerDoug Ledford2016-04-28 22:32:26 +0200
commitf39cc34df7ed919c5c7630a8a7a701939356c37c (patch)
tree92c1e5159ea9caf825f5c9954a7375a2a1a69b14 /include/rdma
parentMerge branch 'k.o/for-4.6-rc' into testing/4.6 (diff)
downloadkernel-qcow2-linux-f39cc34df7ed919c5c7630a8a7a701939356c37c.tar.gz
kernel-qcow2-linux-f39cc34df7ed919c5c7630a8a7a701939356c37c.tar.xz
kernel-qcow2-linux-f39cc34df7ed919c5c7630a8a7a701939356c37c.zip
IB/rdmavt: Fix adaptive pio hang
The RVT_S_WAIT_PIO_DRAIN flag was missing from the set of flags indicating a qp is waiting on a resource. This caused the sleep/wakeup for adaptive pio drain to lose a wakeup "hanging" a QP. Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/rdma')
-rw-r--r--include/rdma/rdmavt_qp.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index 497e59065c2c..0e1ff2abfe92 100644
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -117,8 +117,9 @@
/*
* Wait flags that would prevent any packet type from being sent.
*/
-#define RVT_S_ANY_WAIT_IO (RVT_S_WAIT_PIO | RVT_S_WAIT_TX | \
- RVT_S_WAIT_DMA_DESC | RVT_S_WAIT_KMEM)
+#define RVT_S_ANY_WAIT_IO \
+ (RVT_S_WAIT_PIO | RVT_S_WAIT_PIO_DRAIN | RVT_S_WAIT_TX | \
+ RVT_S_WAIT_DMA_DESC | RVT_S_WAIT_KMEM)
/*
* Wait flags that would prevent send work requests from making progress.