From: Christoph Hellwig <hch@lst.de>
To: linux-rdma@vger.kernel.org
Cc: swise@opengridcomputing.com, sagig@mellanox.com,
target-devel@vger.kernel.org
Subject: [PATCH 04/13] IB/core: refactor ib_create_qp
Date: Sat, 27 Feb 2016 19:10:22 +0100 [thread overview]
Message-ID: <1456596631-19418-5-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1456596631-19418-1-git-send-email-hch@lst.de>
Split the XRC magic into a separate function, and return early on failure
to make the initialization code readable.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/infiniband/core/verbs.c | 103 +++++++++++++++++++++-------------------
1 file changed, 54 insertions(+), 49 deletions(-)
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 5aa1e0b..61131f8 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -723,62 +723,67 @@ struct ib_qp *ib_open_qp(struct ib_xrcd *xrcd,
}
EXPORT_SYMBOL(ib_open_qp);
+static struct ib_qp *ib_create_xrc_qp(struct ib_qp *qp,
+ struct ib_qp_init_attr *qp_init_attr)
+{
+ struct ib_qp *real_qp = qp;
+
+ qp->event_handler = __ib_shared_qp_event_handler;
+ qp->qp_context = qp;
+ qp->pd = NULL;
+ qp->send_cq = qp->recv_cq = NULL;
+ qp->srq = NULL;
+ qp->xrcd = qp_init_attr->xrcd;
+ atomic_inc(&qp_init_attr->xrcd->usecnt);
+ INIT_LIST_HEAD(&qp->open_list);
+
+ qp = __ib_open_qp(real_qp, qp_init_attr->event_handler,
+ qp_init_attr->qp_context);
+ if (IS_ERR(qp))
+ real_qp->device->destroy_qp(real_qp);
+ else
+ __ib_insert_xrcd_qp(qp_init_attr->xrcd, real_qp);
+ return qp;
+}
+
struct ib_qp *ib_create_qp(struct ib_pd *pd,
struct ib_qp_init_attr *qp_init_attr)
{
- struct ib_qp *qp, *real_qp;
- struct ib_device *device;
+ struct ib_device *device = pd ? pd->device : qp_init_attr->xrcd->device;
+ struct ib_qp *qp;
- device = pd ? pd->device : qp_init_attr->xrcd->device;
qp = device->create_qp(pd, qp_init_attr, NULL);
-
- if (!IS_ERR(qp)) {
- qp->device = device;
- qp->real_qp = qp;
- qp->uobject = NULL;
- qp->qp_type = qp_init_attr->qp_type;
-
- atomic_set(&qp->usecnt, 0);
- if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {
- qp->event_handler = __ib_shared_qp_event_handler;
- qp->qp_context = qp;
- qp->pd = NULL;
- qp->send_cq = qp->recv_cq = NULL;
- qp->srq = NULL;
- qp->xrcd = qp_init_attr->xrcd;
- atomic_inc(&qp_init_attr->xrcd->usecnt);
- INIT_LIST_HEAD(&qp->open_list);
-
- real_qp = qp;
- qp = __ib_open_qp(real_qp, qp_init_attr->event_handler,
- qp_init_attr->qp_context);
- if (!IS_ERR(qp))
- __ib_insert_xrcd_qp(qp_init_attr->xrcd, real_qp);
- else
- real_qp->device->destroy_qp(real_qp);
- } else {
- qp->event_handler = qp_init_attr->event_handler;
- qp->qp_context = qp_init_attr->qp_context;
- if (qp_init_attr->qp_type == IB_QPT_XRC_INI) {
- qp->recv_cq = NULL;
- qp->srq = NULL;
- } else {
- qp->recv_cq = qp_init_attr->recv_cq;
- atomic_inc(&qp_init_attr->recv_cq->usecnt);
- qp->srq = qp_init_attr->srq;
- if (qp->srq)
- atomic_inc(&qp_init_attr->srq->usecnt);
- }
-
- qp->pd = pd;
- qp->send_cq = qp_init_attr->send_cq;
- qp->xrcd = NULL;
-
- atomic_inc(&pd->usecnt);
- atomic_inc(&qp_init_attr->send_cq->usecnt);
- }
+ if (IS_ERR(qp))
+ return qp;
+
+ qp->device = device;
+ qp->real_qp = qp;
+ qp->uobject = NULL;
+ qp->qp_type = qp_init_attr->qp_type;
+
+ atomic_set(&qp->usecnt, 0);
+ if (qp_init_attr->qp_type == IB_QPT_XRC_TGT)
+ return ib_create_xrc_qp(qp, qp_init_attr);
+
+ qp->event_handler = qp_init_attr->event_handler;
+ qp->qp_context = qp_init_attr->qp_context;
+ if (qp_init_attr->qp_type == IB_QPT_XRC_INI) {
+ qp->recv_cq = NULL;
+ qp->srq = NULL;
+ } else {
+ qp->recv_cq = qp_init_attr->recv_cq;
+ atomic_inc(&qp_init_attr->recv_cq->usecnt);
+ qp->srq = qp_init_attr->srq;
+ if (qp->srq)
+ atomic_inc(&qp_init_attr->srq->usecnt);
}
+ qp->pd = pd;
+ qp->send_cq = qp_init_attr->send_cq;
+ qp->xrcd = NULL;
+
+ atomic_inc(&pd->usecnt);
+ atomic_inc(&qp_init_attr->send_cq->usecnt);
return qp;
}
EXPORT_SYMBOL(ib_create_qp);
--
2.1.4
next prev parent reply other threads:[~2016-02-27 18:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 18:10 RFC: a first draft of a generic RDMA READ/WRITE API Christoph Hellwig
2016-02-27 18:10 ` Christoph Hellwig [this message]
[not found] ` <1456596631-19418-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2016-02-27 18:10 ` [PATCH 01/13] IB/cma: pass the port number to ib_create_qp Christoph Hellwig
2016-02-27 18:10 ` [PATCH 02/13] IB/core: allow passing mapping an offset into the SG in ib_map_mr_sg Christoph Hellwig
[not found] ` <1456596631-19418-3-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2016-02-28 14:57 ` Sagi Grimberg
2016-02-28 16:20 ` Christoph Hellwig
2016-02-28 17:50 ` Sagi Grimberg
[not found] ` <56D33356.1020707-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2016-02-29 22:22 ` Steve Wise
2016-02-29 11:15 ` Christoph Hellwig
[not found] ` <20160229111557.GA11499-jcswGhMUV9g@public.gmane.org>
2016-02-29 11:35 ` Sagi Grimberg
2016-02-29 11:56 ` Christoph Hellwig
2016-02-29 12:08 ` Sagi Grimberg
2016-02-27 18:10 ` [PATCH 03/13] IB/core: add a helper to check for READ WITH INVALIDATE support Christoph Hellwig
2016-02-27 18:10 ` [PATCH 05/13] IB/core: add a simple MR pool Christoph Hellwig
2016-03-02 2:48 ` Parav Pandit
2016-03-02 9:15 ` Christoph Hellwig
2016-03-02 15:22 ` Bart Van Assche
[not found] ` <56D70543.1000506-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2016-03-03 8:30 ` Christoph Hellwig
2016-02-27 18:10 ` [PATCH 07/13] IB/core: generic RDMA READ/WRITE API Christoph Hellwig
2016-02-28 15:05 ` Sagi Grimberg
2016-02-27 18:10 ` [PATCH 08/13] IB/isert: properly type the login buffer Christoph Hellwig
2016-02-27 18:10 ` [PATCH 09/13] IB/isert: convert to new CQ API Christoph Hellwig
2016-02-27 18:10 ` [PATCH 10/13] IB/isert: kill struct isert_rdma_wr Christoph Hellwig
2016-02-27 18:10 ` [PATCH 12/13] IB/core: add a MR pool for signature MRs Christoph Hellwig
2016-02-27 18:10 ` [PATCH 06/13] IB/core: add a need_inval flag to struct ib_mr Christoph Hellwig
2016-02-28 15:10 ` Sagi Grimberg
2016-02-28 16:05 ` Christoph Hellwig
2016-02-27 18:10 ` [PATCH 11/13] IB/isert: the kill ->isert_cmd back pointer in the struct iser_tx_desc Christoph Hellwig
2016-02-27 18:10 ` [PATCH 13/13] IB/isert: RW API WIP Christoph Hellwig
2016-02-28 13:57 ` Sagi Grimberg
2016-02-28 16:04 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456596631-19418-5-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=linux-rdma@vger.kernel.org \
--cc=sagig@mellanox.com \
--cc=swise@opengridcomputing.com \
--cc=target-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox