From: Long Li <longli@microsoft.com>
To: Simon Horman <horms@kernel.org>,
"longli@linuxonhyperv.com" <longli@linuxonhyperv.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>, Leon Romanovsky <leon@kernel.org>,
Ajay Sharma <sharmaajay@microsoft.com>,
Dexuan Cui <decui@microsoft.com>,
KY Srinivasan <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Wei Liu <wei.liu@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
"linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [Patch v2 3/3] RDMA/mana_ib: Add CQ interrupt support for RAW QP
Date: Tue, 12 Dec 2023 02:50:17 +0000 [thread overview]
Message-ID: <PH7PR21MB32630ABF9D63B726FC64A78DCE8EA@PH7PR21MB3263.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20231209173352.GC5817@kernel.org>
> Hi Long Li,
>
> some minor feedback from my side.
>
> ...
>
> > diff --git a/drivers/infiniband/hw/mana/qp.c
> > b/drivers/infiniband/hw/mana/qp.c index 4667b18ec1dd..186d9829bb93
> > 100644
> > --- a/drivers/infiniband/hw/mana/qp.c
> > +++ b/drivers/infiniband/hw/mana/qp.c
> > @@ -99,25 +99,34 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp,
> struct ib_pd *pd,
> > struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);
> > struct mana_ib_dev *mdev =
> > container_of(pd->device, struct mana_ib_dev, ib_dev);
> > + struct ib_ucontext *ib_ucontext = pd->uobject->context;
> > struct ib_rwq_ind_table *ind_tbl = attr->rwq_ind_tbl;
> > struct mana_ib_create_qp_rss_resp resp = {};
> > struct mana_ib_create_qp_rss ucmd = {};
> > + struct mana_ib_ucontext *mana_ucontext;
> > + struct gdma_queue **gdma_cq_allocated;
> > mana_handle_t *mana_ind_table;
> > struct mana_port_context *mpc;
> > + struct gdma_queue *gdma_cq;
> > unsigned int ind_tbl_size;
> > struct mana_context *mc;
> > struct net_device *ndev;
> > + struct gdma_context *gc;
> > struct mana_ib_cq *cq;
> > struct mana_ib_wq *wq;
> > struct gdma_dev *gd;
> > + struct mana_eq *eq;
> > struct ib_cq *ibcq;
> > struct ib_wq *ibwq;
> > int i = 0;
> > u32 port;
> > int ret;
> >
> > - gd = &mdev->gdma_dev->gdma_context->mana;
> > + gc = mdev->gdma_dev->gdma_context;
> > + gd = &gc->mana;
> > mc = gd->driver_data;
> > + mana_ucontext =
> > + container_of(ib_ucontext, struct mana_ib_ucontext, ibucontext);
> >
> > if (!udata || udata->inlen < sizeof(ucmd))
> > return -EINVAL;
>
> nit: mana_ucontext appears to be set but unused.
Thank you, will fix this in v3.
>
> Flagged by W=1 builds.
>
> > @@ -179,6 +188,13 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp,
> struct ib_pd *pd,
> > goto fail;
> > }
> >
> > + gdma_cq_allocated = kcalloc(ind_tbl_size, sizeof(*gdma_cq_allocated),
> > + GFP_KERNEL);
> > + if (!gdma_cq_allocated) {
> > + ret = -ENOMEM;
> > + goto fail;
> > + }
> > +
> > qp->port = port;
> >
> > for (i = 0; i < ind_tbl_size; i++) {
>
> ...
>
> > @@ -219,6 +236,21 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp,
> struct ib_pd *pd,
> > resp.entries[i].wqid = wq->id;
> >
> > mana_ind_table[i] = wq->rx_object;
> > +
> > + /* Create CQ table entry */
> > + WARN_ON(gc->cq_table[cq->id]);
> > + gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL);
> > + if (!gdma_cq) {
> > + ret = -ENOMEM;
> > + goto fail;
> > + }
> > + gdma_cq_allocated[i] = gdma_cq;
> > +
> > + gdma_cq->cq.context = cq;
> > + gdma_cq->type = GDMA_CQ;
> > + gdma_cq->cq.callback = mana_ib_cq_handler;
> > + gdma_cq->id = cq->id;
> > + gc->cq_table[cq->id] = gdma_cq;
> > }
> > resp.num_entries = i;
> >
> > @@ -238,6 +270,7 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp,
> struct ib_pd *pd,
> > goto fail;
> > }
> >
> > + kfree(gdma_cq_allocated);
> > kfree(mana_ind_table);
> >
> > return 0;
> > @@ -247,8 +280,15 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp,
> struct ib_pd *pd,
> > ibwq = ind_tbl->ind_tbl[i];
> > wq = container_of(ibwq, struct mana_ib_wq, ibwq);
> > mana_destroy_wq_obj(mpc, GDMA_RQ, wq->rx_object);
> > +
> > + if (gdma_cq_allocated[i]) {
>
> nit: It is not clear to me that condition can ever be false.
> If we get here then gdma_cq_allocated[i] is a valid pointer.
I'm removing this check.
I spotted another bug here: mana_create_wq_obj() could fail and break the loop early. I will do a proper cleanup and send v3.
Thanks,
Long
>
> > + gc->cq_table[gdma_cq_allocated[i]->id] =
> > + NULL;
> > + kfree(gdma_cq_allocated[i]);
> > + }
> > }
> >
> > + kfree(gdma_cq_allocated);
> > kfree(mana_ind_table);
> >
> > return ret;
>
> ...
prev parent reply other threads:[~2023-12-12 2:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 23:02 [Patch v2 0/3] Register with RDMA SOC interface and support for CQ longli
2023-12-04 23:02 ` [Patch v2 1/3] RDMA/mana_ib: register RDMA device with GDMA longli
2023-12-04 23:02 ` [Patch v2 2/3] RDMA/mana_ib: query device capabilities longli
2023-12-04 23:02 ` [Patch v2 3/3] RDMA/mana_ib: Add CQ interrupt support for RAW QP longli
2023-12-09 17:33 ` Simon Horman
2023-12-12 2:50 ` Long Li [this message]
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=PH7PR21MB32630ABF9D63B726FC64A78DCE8EA@PH7PR21MB3263.namprd21.prod.outlook.com \
--to=longli@microsoft.com \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=edumazet@google.com \
--cc=haiyangz@microsoft.com \
--cc=horms@kernel.org \
--cc=jgg@ziepe.ca \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=leon@kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=longli@linuxonhyperv.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sharmaajay@microsoft.com \
--cc=wei.liu@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).