Commit 942ce74a authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Steve French
Browse files

smb: server: make use of ib_alloc_cq_any() instead of ib_alloc_cq() 



commit 20cf4e02 ("rdma: Enable ib_alloc_cq to spread work over a
device's comp_vectors") happened before ksmbd was upstreamed,
but after the out of tree ksmbd (a.k.a. cifsd) was developed.
So we still used ib_alloc_cq().

Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 8aa23bae

fs/smb/server/transport_rdma.c

+7 −5
Original line number Diff line number Diff line
@@ -2037,9 +2037,10 @@ static int smb_direct_create_qpair(struct smbdirect_socket *sc, 
		return ret;

	}



	sc->ib.send_cq = ib_alloc_cq(sc->ib.dev, sc,

				 sp->send_credit_target + cap->max_rdma_ctxs,

				 0, IB_POLL_WORKQUEUE);

	sc->ib.send_cq = ib_alloc_cq_any(sc->ib.dev, sc,

					 sp->send_credit_target +

					 cap->max_rdma_ctxs,

					 IB_POLL_WORKQUEUE);

	if (IS_ERR(sc->ib.send_cq)) {

		pr_err("Can't create RDMA send CQ\n");

		ret = PTR_ERR(sc->ib.send_cq);
@@ -2047,8 +2048,9 @@ static int smb_direct_create_qpair(struct smbdirect_socket *sc, 
		goto err;

	}



	sc->ib.recv_cq = ib_alloc_cq(sc->ib.dev, sc,

				     sp->recv_credit_max, 0, IB_POLL_WORKQUEUE);

	sc->ib.recv_cq = ib_alloc_cq_any(sc->ib.dev, sc,

					 sp->recv_credit_max,

					 IB_POLL_WORKQUEUE);

	if (IS_ERR(sc->ib.recv_cq)) {

		pr_err("Can't create RDMA recv CQ\n");

		ret = PTR_ERR(sc->ib.recv_cq);