Commit 7490fd1f authored by Jack Wang's avatar Jack Wang Committed by Jason Gunthorpe
Browse files

RDMA/rtrs: Extend ibtrs_cq_qp_create 

rtrs does not have same limit for both max_send_wr and max_recv_wr,
To allow client and server set different values, export in a separate
parameter for rtrs_cq_qp_create.

Also fix the type accordingly, u32 should be used instead of u16.

Fixes: c0894b3e ("RDMA/rtrs: core: lib functions shared between client and server modules")
Link: https://lore.kernel.org/r/20201217141915.56989-2-jinpu.wang@cloud.ionos.com


Signed-off-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Reviewed-by: default avatarMd Haris Iqbal <haris.iqbal@cloud.ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 8a48ac7f

drivers/infiniband/ulp/rtrs/rtrs-clt.c

+2 −2
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static void destroy_con(struct rtrs_clt_con *con) 
static int create_con_cq_qp(struct rtrs_clt_con *con)

{

	struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);

	u16 wr_queue_size;

	u32 wr_queue_size;

	int err, cq_vector;

	struct rtrs_msg_rkey_rsp *rsp;
@@ -1573,7 +1573,7 @@ static int create_con_cq_qp(struct rtrs_clt_con *con) 
	cq_vector = con->cpu % sess->s.dev->ib_dev->num_comp_vectors;

	err = rtrs_cq_qp_create(&sess->s, &con->c, sess->max_send_sge,

				 cq_vector, wr_queue_size, wr_queue_size,

				 IB_POLL_SOFTIRQ);

				 wr_queue_size, IB_POLL_SOFTIRQ);

	/*

	 * In case of error we do not bother to clean previous allocations,

	 * since destroy_con_cq_qp() must be called.

drivers/infiniband/ulp/rtrs/rtrs-pri.h

+3 −2
Original line number Diff line number Diff line
@@ -303,8 +303,9 @@ int rtrs_post_rdma_write_imm_empty(struct rtrs_con *con, struct ib_cqe *cqe, 
				   struct ib_send_wr *head);



int rtrs_cq_qp_create(struct rtrs_sess *rtrs_sess, struct rtrs_con *con,

		      u32 max_send_sge, int cq_vector, u16 cq_size,

		      u16 wr_queue_size, enum ib_poll_context poll_ctx);

		      u32 max_send_sge, int cq_vector, int cq_size,

		      u32 max_send_wr, u32 max_recv_wr,

		      enum ib_poll_context poll_ctx);

void rtrs_cq_qp_destroy(struct rtrs_con *con);



void rtrs_init_hb(struct rtrs_sess *sess, struct ib_cqe *cqe,

drivers/infiniband/ulp/rtrs/rtrs-srv.c

+3 −2
Original line number Diff line number Diff line
@@ -1586,7 +1586,7 @@ static int create_con(struct rtrs_srv_sess *sess, 
	struct rtrs_sess *s = &sess->s;

	struct rtrs_srv_con *con;



	u16 cq_size, wr_queue_size;

	u32 cq_size, wr_queue_size;

	int err, cq_vector;



	con = kzalloc(sizeof(*con), GFP_KERNEL);
@@ -1630,7 +1630,8 @@ static int create_con(struct rtrs_srv_sess *sess, 


	/* TODO: SOFTIRQ can be faster, but be careful with softirq context */

	err = rtrs_cq_qp_create(&sess->s, &con->c, 1, cq_vector, cq_size,

				 wr_queue_size, IB_POLL_WORKQUEUE);

				 wr_queue_size, wr_queue_size,

				 IB_POLL_WORKQUEUE);

	if (err) {

		rtrs_err(s, "rtrs_cq_qp_create(), err: %d\n", err);

		goto free_con;

drivers/infiniband/ulp/rtrs/rtrs.c

+8 −6
Original line number Diff line number Diff line
@@ -231,14 +231,14 @@ static int create_cq(struct rtrs_con *con, int cq_vector, u16 cq_size, 
}



static int create_qp(struct rtrs_con *con, struct ib_pd *pd,

		     u16 wr_queue_size, u32 max_sge)

		     u32 max_send_wr, u32 max_recv_wr, u32 max_sge)

{

	struct ib_qp_init_attr init_attr = {NULL};

	struct rdma_cm_id *cm_id = con->cm_id;

	int ret;



	init_attr.cap.max_send_wr = wr_queue_size;

	init_attr.cap.max_recv_wr = wr_queue_size;

	init_attr.cap.max_send_wr = max_send_wr;

	init_attr.cap.max_recv_wr = max_recv_wr;

	init_attr.cap.max_recv_sge = 1;

	init_attr.event_handler = qp_event_handler;

	init_attr.qp_context = con;
@@ -260,8 +260,9 @@ static int create_qp(struct rtrs_con *con, struct ib_pd *pd, 
}



int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con,

		       u32 max_send_sge, int cq_vector, u16 cq_size,

		       u16 wr_queue_size, enum ib_poll_context poll_ctx)

		       u32 max_send_sge, int cq_vector, int cq_size,

		       u32 max_send_wr, u32 max_recv_wr,

		       enum ib_poll_context poll_ctx)

{

	int err;
@@ -269,7 +270,8 @@ int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con, 
	if (err)

		return err;



	err = create_qp(con, sess->dev->ib_pd, wr_queue_size, max_send_sge);

	err = create_qp(con, sess->dev->ib_pd, max_send_wr, max_recv_wr,

			max_send_sge);

	if (err) {

		ib_free_cq(con->cq);

		con->cq = NULL;