Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77369ed3 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

[IB] uverbs: have kernel return QP capabilities 



Move the computation of QP capabilities (max scatter/gather entries,
max inline data, etc) into the kernel, and have the uverbs module
return the values as part of the create QP response.  This keeps
precise knowledge of device limits in the low-level kernel driver.

This requires an ABI bump, so while we're making changes, get rid of
the max_sge parameter for the modify SRQ command -- it's not used and
shouldn't be there.

Signed-off-by: default avatarJack Morgenstein <jackm@mellanox.co.il>
Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent ec914c52

drivers/infiniband/core/uverbs_cmd.c

+8 −4
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file, 
		resp->wc[i].opcode 	   = wc[i].opcode;

		resp->wc[i].vendor_err 	   = wc[i].vendor_err;

		resp->wc[i].byte_len 	   = wc[i].byte_len;

		resp->wc[i].imm_data 	   = wc[i].imm_data;

		resp->wc[i].imm_data 	   = (__u32 __force) wc[i].imm_data;

		resp->wc[i].qp_num 	   = wc[i].qp_num;

		resp->wc[i].src_qp 	   = wc[i].src_qp;

		resp->wc[i].wc_flags 	   = wc[i].wc_flags;
@@ -909,6 +909,11 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
		goto err_destroy;



	resp.qp_handle       = uobj->uobject.id;

	resp.max_recv_sge    = attr.cap.max_recv_sge;

	resp.max_send_sge    = attr.cap.max_send_sge;

	resp.max_recv_wr     = attr.cap.max_recv_wr;

	resp.max_send_wr     = attr.cap.max_send_wr;

	resp.max_inline_data = attr.cap.max_inline_data;



	if (copy_to_user((void __user *) (unsigned long) cmd.response,

			 &resp, sizeof resp)) {
@@ -1135,7 +1140,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, 
		next->num_sge    = user_wr->num_sge;

		next->opcode     = user_wr->opcode;

		next->send_flags = user_wr->send_flags;

		next->imm_data   = user_wr->imm_data;

		next->imm_data   = (__be32 __force) user_wr->imm_data;



		if (qp->qp_type == IB_QPT_UD) {

			next->wr.ud.ah = idr_find(&ib_uverbs_ah_idr,
@@ -1701,7 +1706,6 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file, 
	}



	attr.max_wr    = cmd.max_wr;

	attr.max_sge   = cmd.max_sge;

	attr.srq_limit = cmd.srq_limit;



	ret = ib_modify_srq(srq, &attr, cmd.attr_mask);

drivers/infiniband/hw/mthca/mthca_cmd.c

+2 −0
Original line number Diff line number Diff line
@@ -1060,6 +1060,8 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev *dev, 
		dev_lim->hca.arbel.resize_srq = field & 1;

		MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SG_RQ_OFFSET);

		dev_lim->max_sg = min_t(int, field, dev_lim->max_sg);

		MTHCA_GET(size, outbox, QUERY_DEV_LIM_MAX_DESC_SZ_RQ_OFFSET);

		dev_lim->max_desc_sz = min_t(int, size, dev_lim->max_desc_sz);

		MTHCA_GET(size, outbox, QUERY_DEV_LIM_MPT_ENTRY_SZ_OFFSET);

		dev_lim->mpt_entry_sz = size;

		MTHCA_GET(field, outbox, QUERY_DEV_LIM_PBL_SZ_OFFSET);

drivers/infiniband/hw/mthca/mthca_dev.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ struct mthca_limits { 
	int      max_sg;

	int      num_qps;

	int      max_wqes;

	int	 max_desc_sz;

	int	 max_qp_init_rdma;

	int      reserved_qps;

	int      num_srqs;

drivers/infiniband/hw/mthca/mthca_main.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim 
	mdev->limits.max_srq_wqes       = dev_lim->max_srq_sz;

	mdev->limits.reserved_srqs      = dev_lim->reserved_srqs;

	mdev->limits.reserved_eecs      = dev_lim->reserved_eecs;

	mdev->limits.max_desc_sz        = dev_lim->max_desc_sz;

	/*

	 * Subtract 1 from the limit because we need to allocate a

	 * spare CQE so the HCA HW can tell the difference between an

drivers/infiniband/hw/mthca/mthca_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -616,11 +616,11 @@ static struct ib_qp *mthca_create_qp(struct ib_pd *pd, 
		return ERR_PTR(err);

	}



	init_attr->cap.max_inline_data = 0;

	init_attr->cap.max_send_wr     = qp->sq.max;

	init_attr->cap.max_recv_wr     = qp->rq.max;

	init_attr->cap.max_send_sge    = qp->sq.max_gs;

	init_attr->cap.max_recv_sge    = qp->rq.max_gs;

	init_attr->cap.max_inline_data = qp->max_inline_data;



	return &qp->ibqp;

}