| Message ID | 9d418664-1f67-c705-19a0-80fc9dc5a12b@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] xprtrdma: Make sure Send CQ is allocated on an existing compvec | expand |
> On Feb 5, 2019, at 12:21 PM, Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> wrote: > > Make sure the device has at least 2 completion vectors > before allocating to compvec#1 > > Fixes: a4699f5647f3 (xprtrdma: Put Send CQ in IB_POLL_WORKQUEUE mode) > Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Anna, can you see that this fix gets into v5.0-rc ? Thanks! > --- > Changes since v2: > - Split line for checkpatch to be happy > > net/sunrpc/xprtrdma/verbs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c > index b725911c0f3f..5fe727a7db82 100644 > --- a/net/sunrpc/xprtrdma/verbs.c > +++ b/net/sunrpc/xprtrdma/verbs.c > @@ -546,7 +546,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, > > sendcq = ib_alloc_cq(ia->ri_device, NULL, > ep->rep_attr.cap.max_send_wr + 1, > - 1, IB_POLL_WORKQUEUE); > + ia->ri_device->num_comp_vectors > 1 ? 1 : 0, > + IB_POLL_WORKQUEUE); > if (IS_ERR(sendcq)) { > rc = PTR_ERR(sendcq); > dprintk("RPC: %s: failed to create send CQ: %i\n", > -- > 2.18.0 -- Chuck Lever
On 2/5/19 6:23 PM, Chuck Lever wrote: > >> On Feb 5, 2019, at 12:21 PM, Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> wrote: >> >> Make sure the device has at least 2 completion vectors >> before allocating to compvec#1 >> >> Fixes: a4699f5647f3 (xprtrdma: Put Send CQ in IB_POLL_WORKQUEUE mode) >> Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> > Reviewed-by: Chuck Lever <chuck.lever@oracle.com> > > Anna, can you see that this fix gets into v5.0-rc ? Thanks! > > Ping. Haven't seen this upstream nor in the nfs repo (maybe I'm not checking the right one :) ) Any chance this gets picked up for 5.0 ? Nicolas
On Tue, 2019-02-12 at 15:35 +0100, Nicolas Morey-Chaisemartin wrote: > NetApp Security WARNING: This is an external email. Do not click links or open > attachments unless you recognize the sender and know the content is safe. > > > > > On 2/5/19 6:23 PM, Chuck Lever wrote: > > > On Feb 5, 2019, at 12:21 PM, Nicolas Morey-Chaisemartin < > > > nmoreychaisemartin@suse.com> wrote: > > > > > > Make sure the device has at least 2 completion vectors > > > before allocating to compvec#1 > > > > > > Fixes: a4699f5647f3 (xprtrdma: Put Send CQ in IB_POLL_WORKQUEUE mode) > > > Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> > > Reviewed-by: Chuck Lever <chuck.lever@oracle.com> > > > > Anna, can you see that this fix gets into v5.0-rc ? Thanks! > > > > > Ping. > > Haven't seen this upstream nor in the nfs repo (maybe I'm not checking the > right one :) ) > Any chance this gets picked up for 5.0 ? Thanks for the reminder! I'll plan on pushing it out for 5.0 this week. Thanks, Anna > > Nicolas
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index b725911c0f3f..5fe727a7db82 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -546,7 +546,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, sendcq = ib_alloc_cq(ia->ri_device, NULL, ep->rep_attr.cap.max_send_wr + 1, - 1, IB_POLL_WORKQUEUE); + ia->ri_device->num_comp_vectors > 1 ? 1 : 0, + IB_POLL_WORKQUEUE); if (IS_ERR(sendcq)) { rc = PTR_ERR(sendcq); dprintk("RPC: %s: failed to create send CQ: %i\n",
Make sure the device has at least 2 completion vectors before allocating to compvec#1 Fixes: a4699f5647f3 (xprtrdma: Put Send CQ in IB_POLL_WORKQUEUE mode) Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> --- Changes since v2: - Split line for checkpatch to be happy net/sunrpc/xprtrdma/verbs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)