summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2016-04-26 17:55:38 +0300
committerDoug Ledford <dledford@redhat.com>2016-04-26 12:40:50 -0400
commit42235f80ab205bf5020cf33cb3e94455410abe36 (patch)
tree6c268d22e51a547ce9d145125368e18d36556cb3
parentf4e7de63ab273b6a5e35c82eb4fc6363c855ddd4 (diff)
downloadop-kernel-dev-42235f80ab205bf5020cf33cb3e94455410abe36.zip
op-kernel-dev-42235f80ab205bf5020cf33cb3e94455410abe36.tar.gz
IB/core: Don't drain non-existent rq queue-pair
The drain_rq function expects a normal receive qp to drain. A qp can only have either a normal rq or an srq. If there is an srq, there is no rq to drain. Until the API supports draining SRQs, simply skip draining the rq when the qp has an srq attached. Fixes: 765d67748bcf ("IB: new common API for draining queues") Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--drivers/infiniband/core/verbs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 15b8adb..b65b354 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1860,6 +1860,7 @@ EXPORT_SYMBOL(ib_drain_rq);
void ib_drain_qp(struct ib_qp *qp)
{
ib_drain_sq(qp);
- ib_drain_rq(qp);
+ if (!qp->srq)
+ ib_drain_rq(qp);
}
EXPORT_SYMBOL(ib_drain_qp);
OpenPOWER on IntegriCloud