Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull more rdma fixes from Doug Ledford: "As per my previous pull request, there were two drivers that each had a rather large number of legitimate fixes still to be sent. As it turned out, I also missed a reasonably large set of fixes from one person across the stack that are all important fixes. All in all, the bnxt_re, i40iw, and Dan Carpenter are 3/4 to 2/3rds of this pull request. There were some other random fixes that I didn't send in the last pull request that I added to this one. This catches the rdma stack up to the fixes from up to about the beginning of this week. Any more fixes I'll wait and batch up later in the -rc cycle. This will give us a good base to start with for basing a for-next branch on -rc2. Summary: - i40iw fixes - bnxt_re fixes - Dan Carpenter bugfixes across stack - ten more random fixes, no more than two from any one person" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (37 commits) RDMA/core: Initialize port_num in qp_attr RDMA/uverbs: Fix the check for port number IB/cma: Fix reference count leak when no ipv4 addresses are set RDMA/iser: don't send an rkey if all data is written as immadiate-data rxe: fix broken receive queue draining RDMA/qedr: Prevent memory overrun in verbs' user responses iw_cxgb4: don't use WR keys/addrs for 0 byte reads IB/mlx4: Fix CM REQ retries in paravirt mode IB/rdmavt: Setting of QP timeout can overflow jiffies computation IB/core: Fix sparse warnings RDMA/bnxt_re: Fix the value reported for local ack delay RDMA/bnxt_re: Report MISSED_EVENTS in req_notify_cq RDMA/bnxt_re: Fix return value of poll routine RDMA/bnxt_re: Enable atomics only if host bios supports RDMA/bnxt_re: Specify RDMA component when allocating stats context RDMA/bnxt_re: Fixed the max_rd_atomic support for initiator and destination QP RDMA/bnxt_re: Report supported value to IB stack in query_device RDMA/bnxt_re: Do not free the ctx_tbl entry if delete GID fails RDMA/bnxt_re: Fix WQE Size posted to HW to prevent it from throwing error RDMA/bnxt_re: Free doorbell page index (DPI) during dealloc ucontext ...

Linus Torvalds committed 9 years ago

Commit bb236db2 parents 24a1635 a62ab6632 files · +306 −119Browse files

Unified · Split

32 files

drivers/infiniband/core/cma.c +2 −0
drivers/infiniband/core/uverbs_cmd.c +2 −11
drivers/infiniband/hw/bnxt_re/bnxt_re.h +9 −0
drivers/infiniband/hw/bnxt_re/ib_verbs.c +72 −47
drivers/infiniband/hw/bnxt_re/ib_verbs.h +1 −2
drivers/infiniband/hw/bnxt_re/main.c +1 −0
drivers/infiniband/hw/bnxt_re/qplib_fp.c +29 −0
drivers/infiniband/hw/bnxt_re/qplib_fp.h +1 −0
drivers/infiniband/hw/bnxt_re/qplib_sp.c +16 −0
drivers/infiniband/hw/bnxt_re/qplib_sp.h +3 −0
drivers/infiniband/hw/cxgb3/iwch_provider.c +4 −5
drivers/infiniband/hw/cxgb4/cq.c +1 −0
drivers/infiniband/hw/cxgb4/qp.c +1 −1
drivers/infiniband/hw/i40iw/i40iw.h +1 −0
drivers/infiniband/hw/i40iw/i40iw_cm.c +4 −1
drivers/infiniband/hw/i40iw/i40iw_ctrl.c +2 −0
drivers/infiniband/hw/i40iw/i40iw_main.c +30 −30
drivers/infiniband/hw/i40iw/i40iw_puda.c +4 −1
drivers/infiniband/hw/i40iw/i40iw_utils.c +58 −2
drivers/infiniband/hw/i40iw/i40iw_verbs.c +14 −5
drivers/infiniband/hw/i40iw/i40iw_verbs.h +1 −1
drivers/infiniband/hw/mlx4/cm.c +4 −0
drivers/infiniband/hw/mlx5/mr.c +1 −1
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +3 −1
drivers/infiniband/hw/qedr/verbs.c +12 −4
drivers/infiniband/sw/rdmavt/qp.c +1 −3
drivers/infiniband/sw/rxe/rxe_resp.c +3 −0
drivers/infiniband/sw/rxe/rxe_verbs.c +3 −0
drivers/infiniband/ulp/ipoib/ipoib_main.c +1 −0
drivers/infiniband/ulp/iser/iser_initiator.c +4 −2
include/rdma/ib_addr.h +4 −2
include/rdma/rdmavt_qp.h +14 −0

drivers/infiniband/core/cma.c+2−0

@@ -1033,6 +1033,8 @@ int rdma_init_qp_attr(struct rdma_cm_id id, struct ib_qp_attr qp_attr, · 1032 unmodified lines
1033	1033	} else
1034	1034	ret = iw_cm_init_qp_attr(id_priv->cm_id.iw, qp_attr,
1035	1035	qp_attr_mask);
	1036	+ qp_attr->port_num = id_priv->id.port_num;
	1037	+ *qp_attr_mask \|= IB_QP_PORT;
1036	1038	} else
1037	1039	ret = -ENOSYS;
1038	1040

drivers/infiniband/core/uverbs_cmd.c+2−11

@@ -1296,7 +1296,6 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file, · 1295 unmodified lines
1296	1296	struct ib_uobject *uobj;
1297	1297	struct ib_cq *cq;
1298	1298	struct ib_ucq_object *obj;
1299		− struct ib_uverbs_event_queue *ev_queue;
1300	1299	int ret = -EINVAL;
1301	1300
1302	1301	if (copy_from_user(&cmd, buf, sizeof cmd))
@@ -1313,7 +1312,6 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file, · 10 unmodified lines
1313	1312	*/
1314	1313	uverbs_uobject_get(uobj);
1315	1314	cq = uobj->object;
1316		− ev_queue = cq->cq_context;
1317	1315	obj = container_of(cq->uobject, struct ib_ucq_object, uobject);
1318	1316
1319	1317	memset(&resp, 0, sizeof(resp));
@@ -1935,7 +1933,8 @@ static int modify_qp(struct ib_uverbs_file *file, · 615 unmodified lines
1935	1933	goto out;
1936	1934	}
1937	1935
1938		− if (!rdma_is_port_valid(qp->device, cmd->base.port_num)) {
	1936	+ if ((cmd->base.attr_mask & IB_QP_PORT) &&
	1937	+ !rdma_is_port_valid(qp->device, cmd->base.port_num)) {
1939	1938	ret = -EINVAL;
1940	1939	goto release_qp;
1941	1940	}
@@ -2088,7 +2087,6 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file, · 146 unmodified lines
2088	2087	struct ib_uverbs_destroy_qp cmd;
2089	2088	struct ib_uverbs_destroy_qp_resp resp;
2090	2089	struct ib_uobject *uobj;
2091		− struct ib_qp *qp;
2092	2090	struct ib_uqp_object *obj;
2093	2091	int ret = -EINVAL;
2094	2092
@@ -2102,7 +2100,6 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file, · 7 unmodified lines
2102	2100	if (IS_ERR(uobj))
2103	2101	return PTR_ERR(uobj);
2104	2102
2105		− qp = uobj->object;
2106	2103	obj = container_of(uobj, struct ib_uqp_object, uevent.uobject);
2107	2104	/*
2108	2105	* Make sure we don't free the memory in remove_commit as we still
@@ -3004,7 +3001,6 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file, · 895 unmodified lines
3004	3001	{
3005	3002	struct ib_uverbs_ex_destroy_wq cmd = {};
3006	3003	struct ib_uverbs_ex_destroy_wq_resp resp = {};
3007		− struct ib_wq *wq;
3008	3004	struct ib_uobject *uobj;
3009	3005	struct ib_uwq_object *obj;
3010	3006	size_t required_cmd_sz;
@@ -3038,7 +3034,6 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file, · 27 unmodified lines
3038	3034	if (IS_ERR(uobj))
3039	3035	return PTR_ERR(uobj);
3040	3036
3041		− wq = uobj->object;
3042	3037	obj = container_of(uobj, struct ib_uwq_object, uevent.uobject);
3043	3038	/*
3044	3039	* Make sure we don't free the memory in remove_commit as we still
@@ -3728,10 +3723,8 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file, · 683 unmodified lines
3728	3723	struct ib_uverbs_destroy_srq cmd;
3729	3724	struct ib_uverbs_destroy_srq_resp resp;
3730	3725	struct ib_uobject *uobj;
3731		− struct ib_srq *srq;
3732	3726	struct ib_uevent_object *obj;
3733	3727	int ret = -EINVAL;
3734		− enum ib_srq_type srq_type;
3735	3728
3736	3729	if (copy_from_user(&cmd, buf, sizeof cmd))
3737	3730	return -EFAULT;
@@ -3741,9 +3734,7 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file, · 3 unmodified lines
3741	3734	if (IS_ERR(uobj))
3742	3735	return PTR_ERR(uobj);
3743	3736
3744		− srq = uobj->object;
3745	3737	obj = container_of(uobj, struct ib_uevent_object, uobject);
3746		− srq_type = srq->srq_type;
3747	3738	/*
3748	3739	* Make sure we don't free the memory in remove_commit as we still
3749	3740	* needs the uobject memory to create the response.

drivers/infiniband/hw/bnxt_re/bnxt_re.h+9−0

@@ -51,6 +51,8 @@ · 50 unmodified lines
51	51	#define BNXT_RE_PAGE_SIZE_8M BIT(23)
52	52	#define BNXT_RE_PAGE_SIZE_1G BIT(30)
53	53
	54	+#define BNXT_RE_MAX_MR_SIZE BIT(30)
	55	+
54	56	#define BNXT_RE_MAX_QPC_COUNT (64 * 1024)
55	57	#define BNXT_RE_MAX_MRW_COUNT (64 * 1024)
56	58	#define BNXT_RE_MAX_SRQC_COUNT (64 * 1024)
@@ -60,6 +62,13 @@ · 3 unmodified lines
60	62
61	63	#define BNXT_RE_RQ_WQE_THRESHOLD 32
62	64
	65	+/*
	66	+ * Setting the default ack delay value to 16, which means
	67	+ * the default timeout is approx. 260ms(4 usec * 2 ^(timeout))
	68	+ */
	69	+
	70	+#define BNXT_RE_DEFAULT_ACK_DELAY 16
	71	+
63	72	struct bnxt_re_work {
64	73	struct work_struct work;
65	74	unsigned long event;

drivers/infiniband/hw/bnxt_re/ib_verbs.c+72−47

@@ -145,10 +145,8 @@ int bnxt_re_query_device(struct ib_device *ibdev, · 144 unmodified lines
145	145	ib_attr->fw_ver = (u64)(unsigned long)(dev_attr->fw_ver);
146	146	bnxt_qplib_get_guid(rdev->netdev->dev_addr,
147	147	(u8 *)&ib_attr->sys_image_guid);
148		− ib_attr->max_mr_size = ~0ull;
149		− ib_attr->page_size_cap = BNXT_RE_PAGE_SIZE_4K \| BNXT_RE_PAGE_SIZE_8K \|
150		− BNXT_RE_PAGE_SIZE_64K \| BNXT_RE_PAGE_SIZE_2M \|
151		− BNXT_RE_PAGE_SIZE_8M \| BNXT_RE_PAGE_SIZE_1G;
	148	+ ib_attr->max_mr_size = BNXT_RE_MAX_MR_SIZE;
	149	+ ib_attr->page_size_cap = BNXT_RE_PAGE_SIZE_4K;
152	150
153	151	ib_attr->vendor_id = rdev->en_dev->pdev->vendor;
154	152	ib_attr->vendor_part_id = rdev->en_dev->pdev->device;
@@ -174,9 +172,11 @@ int bnxt_re_query_device(struct ib_device *ibdev, · 19 unmodified lines
174	172	ib_attr->max_mr = dev_attr->max_mr;
175	173	ib_attr->max_pd = dev_attr->max_pd;
176	174	ib_attr->max_qp_rd_atom = dev_attr->max_qp_rd_atom;
177		− ib_attr->max_qp_init_rd_atom = dev_attr->max_qp_rd_atom;
178		− ib_attr->atomic_cap = IB_ATOMIC_HCA;
179		− ib_attr->masked_atomic_cap = IB_ATOMIC_HCA;
	175	+ ib_attr->max_qp_init_rd_atom = dev_attr->max_qp_init_rd_atom;
	176	+ if (dev_attr->is_atomic) {
	177	+ ib_attr->atomic_cap = IB_ATOMIC_HCA;
	178	+ ib_attr->masked_atomic_cap = IB_ATOMIC_HCA;
	179	+ }
180	180
181	181	ib_attr->max_ee_rd_atom = 0;
182	182	ib_attr->max_res_rd_atom = 0;
@@ -201,7 +201,7 @@ int bnxt_re_query_device(struct ib_device *ibdev, · 18 unmodified lines
201	201	ib_attr->max_fast_reg_page_list_len = MAX_PBL_LVL_1_PGS;
202	202
203	203	ib_attr->max_pkeys = 1;
204		− ib_attr->local_ca_ack_delay = 0;
	204	+ ib_attr->local_ca_ack_delay = BNXT_RE_DEFAULT_ACK_DELAY;
205	205	return 0;
206	206	}
207	207
@@ -390,15 +390,17 @@ int bnxt_re_del_gid(struct ib_device *ibdev, u8 port_num, · 182 unmodified lines
390	390	return -EINVAL;
391	391	ctx->refcnt--;
392	392	if (!ctx->refcnt) {
393		− rc = bnxt_qplib_del_sgid
394		− (sgid_tbl,
395		− &sgid_tbl->tbl[ctx->idx], true);
396		− if (rc)
	393	+ rc = bnxt_qplib_del_sgid(sgid_tbl,
	394	+ &sgid_tbl->tbl[ctx->idx],
	395	+ true);
	396	+ if (rc) {
397	397	dev_err(rdev_to_dev(rdev),
398	398	"Failed to remove GID: %#x", rc);
399		− ctx_tbl = sgid_tbl->ctx;
400		− ctx_tbl[ctx->idx] = NULL;
401		− kfree(ctx);
	399	+ } else {
	400	+ ctx_tbl = sgid_tbl->ctx;
	401	+ ctx_tbl[ctx->idx] = NULL;
	402	+ kfree(ctx);
	403	+ }
402	404	}
403	405	} else {
404	406	return -EINVAL;
@@ -588,10 +590,10 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd) · 183 unmodified lines
588	590
589	591	/* Create a fence MW only for kernel consumers */
590	592	mw = bnxt_re_alloc_mw(&pd->ib_pd, IB_MW_TYPE_1, NULL);
591		− if (!mw) {
	593	+ if (IS_ERR(mw)) {
592	594	dev_err(rdev_to_dev(rdev),
593	595	"Failed to create fence-MW for PD: %p\n", pd);
594		− rc = -EINVAL;
	596	+ rc = PTR_ERR(mw);
595	597	goto fail;
596	598	}
597	599	fence->mw = mw;
@@ -612,30 +614,13 @@ int bnxt_re_dealloc_pd(struct ib_pd *ib_pd) · 14 unmodified lines
612	614	int rc;
613	615
614	616	bnxt_re_destroy_fence_mr(pd);
615		− if (ib_pd->uobject && pd->dpi.dbr) {
616		− struct ib_ucontext *ib_uctx = ib_pd->uobject->context;
617		− struct bnxt_re_ucontext *ucntx;
618	617
619		− /* Free DPI only if this is the first PD allocated by the
620		− * application and mark the context dpi as NULL
621		− */
622		− ucntx = container_of(ib_uctx, struct bnxt_re_ucontext, ib_uctx);
623		−
624		− rc = bnxt_qplib_dealloc_dpi(&rdev->qplib_res,
625		− &rdev->qplib_res.dpi_tbl,
626		− &pd->dpi);
	618	+ if (pd->qplib_pd.id) {
	619	+ rc = bnxt_qplib_dealloc_pd(&rdev->qplib_res,
	620	+ &rdev->qplib_res.pd_tbl,
	621	+ &pd->qplib_pd);
627	622	if (rc)
628		− dev_err(rdev_to_dev(rdev), "Failed to deallocate HW DPI");
629		− /* Don't fail, continue*/
630		− ucntx->dpi = NULL;
631		− }
632		−
633		− rc = bnxt_qplib_dealloc_pd(&rdev->qplib_res,
634		− &rdev->qplib_res.pd_tbl,
635		− &pd->qplib_pd);
636		− if (rc) {
637		− dev_err(rdev_to_dev(rdev), "Failed to deallocate HW PD");
638		− return rc;
	623	+ dev_err(rdev_to_dev(rdev), "Failed to deallocate HW PD");
639	624	}
640	625
641	626	kfree(pd);
@@ -667,23 +652,22 @@ struct ib_pd bnxt_re_alloc_pd(struct ib_device ibdev, · 25 unmodified lines
667	652	if (udata) {
668	653	struct bnxt_re_pd_resp resp;
669	654
670		− if (!ucntx->dpi) {
	655	+ if (!ucntx->dpi.dbr) {
671	656	/* Allocate DPI in alloc_pd to avoid failing of
672	657	* ibv_devinfo and family of application when DPIs
673	658	* are depleted.
674	659	*/
675	660	if (bnxt_qplib_alloc_dpi(&rdev->qplib_res.dpi_tbl,
676		− &pd->dpi, ucntx)) {
	661	+ &ucntx->dpi, ucntx)) {
677	662	rc = -ENOMEM;
678	663	goto dbfail;
679	664	}
680		− ucntx->dpi = &pd->dpi;
681	665	}
682	666
683	667	resp.pdid = pd->qplib_pd.id;
684	668	/* Still allow mapping this DBR to the new user PD. */
685		− resp.dpi = ucntx->dpi->dpi;
686		− resp.dbr = (u64)ucntx->dpi->umdbr;
	669	+ resp.dpi = ucntx->dpi.dpi;
	670	+ resp.dbr = (u64)ucntx->dpi.umdbr;
687	671
688	672	rc = ib_copy_to_udata(udata, &resp, sizeof(resp));
689	673	if (rc) {
@@ -960,7 +944,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev rdev, struct bnxt_re_pd pd, · 270 unmodified lines
960	944	qplib_qp->rq.nmap = umem->nmap;
961	945	}
962	946
963		− qplib_qp->dpi = cntx->dpi;
	947	+ qplib_qp->dpi = &cntx->dpi;
964	948	return 0;
965	949	rqfail:
966	950	ib_umem_release(qp->sumem);
@@ -1530,13 +1514,24 @@ int bnxt_re_modify_qp(struct ib_qp ib_qp, struct ib_qp_attr qp_attr, · 563 unmodified lines
1530	1514	if (qp_attr_mask & IB_QP_MAX_QP_RD_ATOMIC) {
1531	1515	qp->qplib_qp.modify_flags \|=
1532	1516	CMDQ_MODIFY_QP_MODIFY_MASK_MAX_RD_ATOMIC;
1533		− qp->qplib_qp.max_rd_atomic = qp_attr->max_rd_atomic;
	1517	+ /* Cap the max_rd_atomic to device max */
	1518	+ qp->qplib_qp.max_rd_atomic = min_t(u32, qp_attr->max_rd_atomic,
	1519	+ dev_attr->max_qp_rd_atom);
1534	1520	}
1535	1521	if (qp_attr_mask & IB_QP_SQ_PSN) {
1536	1522	qp->qplib_qp.modify_flags \|= CMDQ_MODIFY_QP_MODIFY_MASK_SQ_PSN;
1537	1523	qp->qplib_qp.sq.psn = qp_attr->sq_psn;
1538	1524	}
1539	1525	if (qp_attr_mask & IB_QP_MAX_DEST_RD_ATOMIC) {
	1526	+ if (qp_attr->max_dest_rd_atomic >
	1527	+ dev_attr->max_qp_init_rd_atom) {
	1528	+ dev_err(rdev_to_dev(rdev),
	1529	+ "max_dest_rd_atomic requested%d is > dev_max%d",
	1530	+ qp_attr->max_dest_rd_atomic,
	1531	+ dev_attr->max_qp_init_rd_atom);
	1532	+ return -EINVAL;
	1533	+ }
	1534	+
1540	1535	qp->qplib_qp.modify_flags \|=
1541	1536	CMDQ_MODIFY_QP_MODIFY_MASK_MAX_DEST_RD_ATOMIC;
1542	1537	qp->qplib_qp.max_dest_rd_atomic = qp_attr->max_dest_rd_atomic;
@@ -2403,7 +2398,7 @@ struct ib_cq bnxt_re_create_cq(struct ib_device ibdev, · 860 unmodified lines
2403	2398	}
2404	2399	cq->qplib_cq.sghead = cq->umem->sg_head.sgl;
2405	2400	cq->qplib_cq.nmap = cq->umem->nmap;
2406		− cq->qplib_cq.dpi = uctx->dpi;
	2401	+ cq->qplib_cq.dpi = &uctx->dpi;
2407	2402	} else {
2408	2403	cq->max_cql = min_t(u32, entries, MAX_CQL_PER_POLL);
2409	2404	cq->cql = kcalloc(cq->max_cql, sizeof(struct bnxt_qplib_cqe),
@@ -2905,6 +2900,7 @@ int bnxt_re_poll_cq(struct ib_cq ib_cq, int num_entries, struct ib_wc wc) · 495 unmodified lines
2905	2900
2906	2901	spin_lock_irqsave(&cq->cq_lock, flags);
2907	2902	budget = min_t(u32, num_entries, cq->max_cql);
	2903	+ num_entries = budget;
2908	2904	if (!cq->cql) {
2909	2905	dev_err(rdev_to_dev(cq->rdev), "POLL CQ : no CQL to use");
2910	2906	goto exit;
@@ -3031,6 +3027,11 @@ int bnxt_re_req_notify_cq(struct ib_cq *ib_cq, · 120 unmodified lines
3031	3027	else if (ib_cqn_flags & IB_CQ_SOLICITED)
3032	3028	type = DBR_DBR_TYPE_CQ_ARMSE;
3033	3029
	3030	+ /* Poll to see if there are missed events */
	3031	+ if ((ib_cqn_flags & IB_CQ_REPORT_MISSED_EVENTS) &&
	3032	+ !(bnxt_qplib_is_cq_empty(&cq->qplib_cq)))
	3033	+ return 1;
	3034	+
3034	3035	bnxt_qplib_req_notify_cq(&cq->qplib_cq, type);
3035	3036
3036	3037	return 0;
@@ -3245,6 +3246,12 @@ struct ib_mr bnxt_re_reg_user_mr(struct ib_pd ib_pd, u64 start, u64 length, · 208 unmodified lines
3245	3246	struct scatterlist *sg;
3246	3247	int entry;
3247	3248
	3249	+ if (length > BNXT_RE_MAX_MR_SIZE) {
	3250	+ dev_err(rdev_to_dev(rdev), "MR Size: %lld > Max supported:%ld\n",
	3251	+ length, BNXT_RE_MAX_MR_SIZE);
	3252	+ return ERR_PTR(-ENOMEM);
	3253	+ }
	3254	+
3248	3255	mr = kzalloc(sizeof(*mr), GFP_KERNEL);
3249	3256	if (!mr)
3250	3257	return ERR_PTR(-ENOMEM);
@@ -3388,8 +3395,26 @@ int bnxt_re_dealloc_ucontext(struct ib_ucontext *ib_uctx) · 137 unmodified lines
3388	3395	struct bnxt_re_ucontext *uctx = container_of(ib_uctx,
3389	3396	struct bnxt_re_ucontext,
3390	3397	ib_uctx);
	3398	+
	3399	+ struct bnxt_re_dev *rdev = uctx->rdev;
	3400	+ int rc = 0;
	3401	+
3391	3402	if (uctx->shpg)
3392	3403	free_page((unsigned long)uctx->shpg);
	3404	+
	3405	+ if (uctx->dpi.dbr) {
	3406	+ /* Free DPI only if this is the first PD allocated by the
	3407	+ * application and mark the context dpi as NULL
	3408	+ */
	3409	+ rc = bnxt_qplib_dealloc_dpi(&rdev->qplib_res,
	3410	+ &rdev->qplib_res.dpi_tbl,
	3411	+ &uctx->dpi);
	3412	+ if (rc)
	3413	+ dev_err(rdev_to_dev(rdev), "Deallocte HW DPI failed!");
	3414	+ /* Don't fail, continue*/
	3415	+ uctx->dpi.dbr = NULL;
	3416	+ }
	3417	+
3393	3418	kfree(uctx);
3394	3419	return 0;
3395	3420	}

drivers/infiniband/hw/bnxt_re/ib_verbs.h+1−2

@@ -59,7 +59,6 @@ struct bnxt_re_pd { · 58 unmodified lines
59	59	struct bnxt_re_dev *rdev;
60	60	struct ib_pd ib_pd;
61	61	struct bnxt_qplib_pd qplib_pd;
62		− struct bnxt_qplib_dpi dpi;
63	62	struct bnxt_re_fence_data fence;
64	63	};
65	64
@@ -127,7 +126,7 @@ struct bnxt_re_mw { · 61 unmodified lines
127	126	struct bnxt_re_ucontext {
128	127	struct bnxt_re_dev *rdev;
129	128	struct ib_ucontext ib_uctx;
130		− struct bnxt_qplib_dpi *dpi;
	129	+ struct bnxt_qplib_dpi dpi;
131	130	void *shpg;
132	131	spinlock_t sh_lock; /* protect shpg */
133	132	};

drivers/infiniband/hw/bnxt_re/main.c+1−0

@@ -333,6 +333,7 @@ static int bnxt_re_net_stats_ctx_alloc(struct bnxt_re_dev *rdev, · 332 unmodified lines
333	333	bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_STAT_CTX_ALLOC, -1, -1);
334	334	req.update_period_ms = cpu_to_le32(1000);
335	335	req.stats_dma_addr = cpu_to_le64(dma_map);
	336	+ req.stat_ctx_flags = STAT_CTX_ALLOC_REQ_STAT_CTX_FLAGS_ROCE;
336	337	bnxt_re_fill_fw_msg(&fw_msg, (void )&req, sizeof(req), (void )&resp,
337	338	sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
338	339	rc = en_dev->en_ops->bnxt_send_fw_msg(en_dev, BNXT_ROCE_ULP, &fw_msg);

drivers/infiniband/hw/bnxt_re/qplib_fp.c+29−0

@@ -1128,6 +1128,11 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, · 1127 unmodified lines
1128	1128	}
1129	1129	/* Each SGE entry = 1 WQE size16 */
1130	1130	wqe_size16 = wqe->num_sge;
	1131	+ /* HW requires wqe size has room for atleast one SGE even if
	1132	+ * none was supplied by ULP
	1133	+ */
	1134	+ if (!wqe->num_sge)
	1135	+ wqe_size16++;
1131	1136	}
1132	1137
1133	1138	/* Specifics */
@@ -1364,6 +1369,11 @@ int bnxt_qplib_post_recv(struct bnxt_qplib_qp *qp, · 230 unmodified lines
1364	1369	rqe->flags = wqe->flags;
1365	1370	rqe->wqe_size = wqe->num_sge +
1366	1371	((offsetof(typeof(*rqe), data) + 15) >> 4);
	1372	+ /* HW requires wqe size has room for atleast one SGE even if none
	1373	+ * was supplied by ULP
	1374	+ */
	1375	+ if (!wqe->num_sge)
	1376	+ rqe->wqe_size++;
1367	1377
1368	1378	/* Supply the rqe->wr_id index to the wr_id_tbl for now */
1369	1379	rqe->wr_id[0] = cpu_to_le32(sw_prod);
@@ -1885,6 +1895,25 @@ flush_rq: · 515 unmodified lines
1885	1895	return rc;
1886	1896	}
1887	1897
	1898	+bool bnxt_qplib_is_cq_empty(struct bnxt_qplib_cq *cq)
	1899	+{
	1900	+ struct cq_base hw_cqe, *hw_cqe_ptr;
	1901	+ unsigned long flags;
	1902	+ u32 sw_cons, raw_cons;
	1903	+ bool rc = true;
	1904	+
	1905	+ spin_lock_irqsave(&cq->hwq.lock, flags);
	1906	+ raw_cons = cq->hwq.cons;
	1907	+ sw_cons = HWQ_CMP(raw_cons, &cq->hwq);
	1908	+ hw_cqe_ptr = (struct cq_base **)cq->hwq.pbl_ptr;
	1909	+ hw_cqe = &hw_cqe_ptr[CQE_PG(sw_cons)][CQE_IDX(sw_cons)];
	1910	+
	1911	+ /* Check for Valid bit. If the CQE is valid, return false */
	1912	+ rc = !CQE_CMP_VALID(hw_cqe, raw_cons, cq->hwq.max_elements);
	1913	+ spin_unlock_irqrestore(&cq->hwq.lock, flags);
	1914	+ return rc;
	1915	+}
	1916	+
1888	1917	static int bnxt_qplib_cq_process_res_raweth_qp1(struct bnxt_qplib_cq *cq,
1889	1918	struct cq_res_raweth_qp1 *hwcqe,
1890	1919	struct bnxt_qplib_cqe **pcqe,

drivers/infiniband/hw/bnxt_re/qplib_fp.h+1−0

@@ -449,6 +449,7 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res res, struct bnxt_qplib_cq cq); · 448 unmodified lines
449	449	int bnxt_qplib_destroy_cq(struct bnxt_qplib_res res, struct bnxt_qplib_cq cq);
450	450	int bnxt_qplib_poll_cq(struct bnxt_qplib_cq cq, struct bnxt_qplib_cqe cqe,
451	451	int num, struct bnxt_qplib_qp **qp);
	452	+bool bnxt_qplib_is_cq_empty(struct bnxt_qplib_cq *cq);
452	453	void bnxt_qplib_req_notify_cq(struct bnxt_qplib_cq *cq, u32 arm_type);
453	454	void bnxt_qplib_free_nq(struct bnxt_qplib_nq *nq);
454	455	int bnxt_qplib_alloc_nq(struct pci_dev pdev, struct bnxt_qplib_nq nq);

drivers/infiniband/hw/bnxt_re/qplib_sp.c+16−0

@@ -51,6 +51,19 @@ const struct bnxt_qplib_gid bnxt_qplib_gid_zero = {{ 0, 0, 0, 0, 0, 0, 0, 0, · 50 unmodified lines
51	51	0, 0, 0, 0, 0, 0, 0, 0 } };
52	52
53	53	/* Device */
	54	+
	55	+static bool bnxt_qplib_is_atomic_cap(struct bnxt_qplib_rcfw *rcfw)
	56	+{
	57	+ int rc;
	58	+ u16 pcie_ctl2;
	59	+
	60	+ rc = pcie_capability_read_word(rcfw->pdev, PCI_EXP_DEVCTL2,
	61	+ &pcie_ctl2);
	62	+ if (rc)
	63	+ return false;
	64	+ return !!(pcie_ctl2 & PCI_EXP_DEVCTL2_ATOMIC_REQ);
	65	+}
	66	+
54	67	int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,
55	68	struct bnxt_qplib_dev_attr *attr)
56	69	{
@@ -81,6 +94,8 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw, · 24 unmodified lines
81	94
82	95	/* Extract the context from the side buffer */
83	96	attr->max_qp = le32_to_cpu(sb->max_qp);
	97	+ /* max_qp value reported by FW for PF doesn't include the QP1 for PF */
	98	+ attr->max_qp += 1;
84	99	attr->max_qp_rd_atom =
85	100	sb->max_qp_rd_atom > BNXT_QPLIB_MAX_OUT_RD_ATOM ?
86	101	BNXT_QPLIB_MAX_OUT_RD_ATOM : sb->max_qp_rd_atom;
@@ -129,6 +144,7 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw, · 42 unmodified lines
129	144	attr->tqm_alloc_reqs[i * 4 + 3] = *(++tqm_alloc);
130	145	}
131	146
	147	+ attr->is_atomic = bnxt_qplib_is_atomic_cap(rcfw);
132	148	bail:
133	149	bnxt_qplib_rcfw_free_sbuf(rcfw, sbuf);
134	150	return rc;

drivers/infiniband/hw/bnxt_re/qplib_sp.h+3−0

@@ -42,6 +42,8 @@ · 41 unmodified lines
42	42
43	43	#define BNXT_QPLIB_RESERVED_QP_WRS 128
44	44
	45	+#define PCI_EXP_DEVCTL2_ATOMIC_REQ 0x0040
	46	+
45	47	struct bnxt_qplib_dev_attr {
46	48	char fw_ver[32];
47	49	u16 max_sgid;
@@ -70,6 +72,7 @@ struct bnxt_qplib_dev_attr { · 22 unmodified lines
70	72	u32 max_inline_data;
71	73	u32 l2_db_size;
72	74	u8 tqm_alloc_reqs[MAX_TQM_ALLOC_REQ];
	75	+ bool is_atomic;
73	76	};
74	77
75	78	struct bnxt_qplib_pd {

drivers/infiniband/hw/cxgb3/iwch_provider.c+4−5

@@ -718,7 +718,7 @@ static struct ib_mr iwch_alloc_mr(struct ib_pd pd, · 717 unmodified lines
718	718	struct iwch_mr *mhp;
719	719	u32 mmid;
720	720	u32 stag = 0;
721		− int ret = 0;
	721	+ int ret = -ENOMEM;
722	722
723	723	if (mr_type != IB_MR_TYPE_MEM_REG \|\|
724	724	max_num_sg > T3_MAX_FASTREG_DEPTH)
@@ -731,10 +731,8 @@ static struct ib_mr iwch_alloc_mr(struct ib_pd pd, · 6 unmodified lines
731	731	goto err;
732	732
733	733	mhp->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
734		− if (!mhp->pages) {
735		− ret = -ENOMEM;
	734	+ if (!mhp->pages)
736	735	goto pl_err;
737		− }
738	736
739	737	mhp->rhp = rhp;
740	738	ret = iwch_alloc_pbl(mhp, max_num_sg);
@@ -751,7 +749,8 @@ static struct ib_mr iwch_alloc_mr(struct ib_pd pd, · 10 unmodified lines
751	749	mhp->attr.state = 1;
752	750	mmid = (stag) >> 8;
753	751	mhp->ibmr.rkey = mhp->ibmr.lkey = stag;
754		− if (insert_handle(rhp, &rhp->mmidr, mhp, mmid))
	752	+ ret = insert_handle(rhp, &rhp->mmidr, mhp, mmid);
	753	+ if (ret)
755	754	goto err3;
756	755
757	756	pr_debug("%s mmid 0x%x mhp %p stag 0x%x\n", __func__, mmid, mhp, stag);

drivers/infiniband/hw/cxgb4/cq.c+1−0

@@ -963,6 +963,7 @@ struct ib_cq c4iw_create_cq(struct ib_device ibdev, · 962 unmodified lines
963	963	goto err3;
964	964
965	965	if (ucontext) {
	966	+ ret = -ENOMEM;
966	967	mm = kmalloc(sizeof *mm, GFP_KERNEL);
967	968	if (!mm)
968	969	goto err4;

drivers/infiniband/hw/cxgb4/qp.c+1−1

@@ -569,7 +569,7 @@ static int build_rdma_read(union t4_wr wqe, struct ib_send_wr wr, u8 *len16) · 568 unmodified lines
569	569	{
570	570	if (wr->num_sge > 1)
571	571	return -EINVAL;
572		− if (wr->num_sge) {
	572	+ if (wr->num_sge && wr->sg_list[0].length) {
573	573	wqe->read.stag_src = cpu_to_be32(rdma_wr(wr)->rkey);
574	574	wqe->read.to_src_hi = cpu_to_be32((u32)(rdma_wr(wr)->remote_addr
575	575	>> 32));

drivers/infiniband/hw/i40iw/i40iw.h+1−0

@@ -527,6 +527,7 @@ enum i40iw_status_code i40iw_add_mac_addr(struct i40iw_device *iwdev, · 526 unmodified lines
527	527	int i40iw_modify_qp(struct ib_qp , struct ib_qp_attr , int, struct ib_udata *);
528	528	void i40iw_cq_wq_destroy(struct i40iw_device iwdev, struct i40iw_sc_cq cq);
529	529
	530	+void i40iw_cleanup_pending_cqp_op(struct i40iw_device *iwdev);
530	531	void i40iw_rem_pdusecount(struct i40iw_pd iwpd, struct i40iw_device iwdev);
531	532	void i40iw_add_pdusecount(struct i40iw_pd *iwpd);
532	533	void i40iw_rem_devusecount(struct i40iw_device *iwdev);

drivers/infiniband/hw/i40iw/i40iw_cm.c+4−1

@@ -3487,7 +3487,8 @@ static void i40iw_cm_disconn_true(struct i40iw_qp *iwqp) · 3486 unmodified lines
3487	3487	if (((original_hw_tcp_state == I40IW_TCP_STATE_CLOSED) \|\|
3488	3488	(original_hw_tcp_state == I40IW_TCP_STATE_TIME_WAIT) \|\|
3489	3489	(last_ae == I40IW_AE_RDMAP_ROE_BAD_LLP_CLOSE) \|\|
3490		− (last_ae == I40IW_AE_LLP_CONNECTION_RESET))) {
	3490	+ (last_ae == I40IW_AE_LLP_CONNECTION_RESET) \|\|
	3491	+ iwdev->reset)) {
3491	3492	issue_close = 1;
3492	3493	iwqp->cm_id = NULL;
3493	3494	if (!iwqp->flush_issued) {
@@ -4265,6 +4266,8 @@ void i40iw_cm_disconnect_all(struct i40iw_device *iwdev) · 771 unmodified lines
4265	4266	cm_node = container_of(list_node, struct i40iw_cm_node, connected_entry);
4266	4267	attr.qp_state = IB_QPS_ERR;
4267	4268	i40iw_modify_qp(&cm_node->iwqp->ibqp, &attr, IB_QP_STATE, NULL);
	4269	+ if (iwdev->reset)
	4270	+ i40iw_cm_disconn(cm_node->iwqp);
4268	4271	i40iw_rem_ref_cm_node(cm_node);
4269	4272	}
4270	4273	}

drivers/infiniband/hw/i40iw/i40iw_ctrl.c+2−0

@@ -1970,6 +1970,8 @@ static enum i40iw_status_code i40iw_sc_ccq_destroy(struct i40iw_sc_cq *ccq, · 1969 unmodified lines
1970	1970	ret_code = i40iw_cqp_poll_registers(cqp, tail, 1000);
1971	1971	}
1972	1972
	1973	+ cqp->process_cqp_sds = i40iw_update_sds_noccq;
	1974	+
1973	1975	return ret_code;
1974	1976	}
1975	1977

drivers/infiniband/hw/i40iw/i40iw_main.c+30−30

@@ -243,6 +243,8 @@ static void i40iw_destroy_cqp(struct i40iw_device *iwdev, bool free_hwcqp) · 242 unmodified lines
243	243	if (free_hwcqp)
244	244	dev->cqp_ops->cqp_destroy(dev->cqp);
245	245
	246	+ i40iw_cleanup_pending_cqp_op(iwdev);
	247	+
246	248	i40iw_free_dma_mem(dev->hw, &cqp->sq);
247	249	kfree(cqp->scratch_array);
248	250	iwdev->cqp.scratch_array = NULL;
@@ -274,13 +276,12 @@ static void i40iw_disable_irq(struct i40iw_sc_dev *dev, · 25 unmodified lines
274	276	/**
275	277	* i40iw_destroy_aeq - destroy aeq
276	278	* @iwdev: iwarp device
277		− * @reset: true if called before reset
278	279	*
279	280	* Issue a destroy aeq request and
280	281	* free the resources associated with the aeq
281	282	* The function is called during driver unload
282	283	*/
283		−static void i40iw_destroy_aeq(struct i40iw_device *iwdev, bool reset)
	284	+static void i40iw_destroy_aeq(struct i40iw_device *iwdev)
284	285	{
285	286	enum i40iw_status_code status = I40IW_ERR_NOT_READY;
286	287	struct i40iw_sc_dev *dev = &iwdev->sc_dev;
@@ -288,7 +289,7 @@ static void i40iw_destroy_aeq(struct i40iw_device *iwdev, bool reset) · 1 unmodified line
288	289
289	290	if (!iwdev->msix_shared)
290	291	i40iw_disable_irq(dev, iwdev->iw_msixtbl, (void *)iwdev);
291		− if (reset)
	292	+ if (iwdev->reset)
292	293	goto exit;
293	294
294	295	if (!dev->aeq_ops->aeq_destroy(&aeq->sc_aeq, 0, 1))
@@ -304,19 +305,17 @@ exit: · 9 unmodified lines
304	305	* i40iw_destroy_ceq - destroy ceq
305	306	* @iwdev: iwarp device
306	307	* @iwceq: ceq to be destroyed
307		− * @reset: true if called before reset
308	308	*
309	309	* Issue a destroy ceq request and
310	310	* free the resources associated with the ceq
311	311	*/
312	312	static void i40iw_destroy_ceq(struct i40iw_device *iwdev,
313		− struct i40iw_ceq *iwceq,
314		− bool reset)
	313	+ struct i40iw_ceq *iwceq)
315	314	{
316	315	enum i40iw_status_code status;
317	316	struct i40iw_sc_dev *dev = &iwdev->sc_dev;
318	317
319		− if (reset)
	318	+ if (iwdev->reset)
320	319	goto exit;
321	320
322	321	status = dev->ceq_ops->ceq_destroy(&iwceq->sc_ceq, 0, 1);
@@ -335,12 +334,11 @@ exit: · 12 unmodified lines
335	334	/**
336	335	* i40iw_dele_ceqs - destroy all ceq's
337	336	* @iwdev: iwarp device
338		− * @reset: true if called before reset
339	337	*
340	338	* Go through all of the device ceq's and for each ceq
341	339	* disable the ceq interrupt and destroy the ceq
342	340	*/
343		−static void i40iw_dele_ceqs(struct i40iw_device *iwdev, bool reset)
	341	+static void i40iw_dele_ceqs(struct i40iw_device *iwdev)
344	342	{
345	343	u32 i = 0;
346	344	struct i40iw_sc_dev *dev = &iwdev->sc_dev;
@@ -349,32 +347,31 @@ static void i40iw_dele_ceqs(struct i40iw_device *iwdev, bool reset) · 2 unmodified lines
349	347
350	348	if (iwdev->msix_shared) {
351	349	i40iw_disable_irq(dev, msix_vec, (void *)iwdev);
352		− i40iw_destroy_ceq(iwdev, iwceq, reset);
	350	+ i40iw_destroy_ceq(iwdev, iwceq);
353	351	iwceq++;
354	352	i++;
355	353	}
356	354
357	355	for (msix_vec++; i < iwdev->ceqs_count; i++, msix_vec++, iwceq++) {
358	356	i40iw_disable_irq(dev, msix_vec, (void *)iwceq);
359		− i40iw_destroy_ceq(iwdev, iwceq, reset);
	357	+ i40iw_destroy_ceq(iwdev, iwceq);
360	358	}
361	359	}
362	360
363	361	/**
364	362	* i40iw_destroy_ccq - destroy control cq
365	363	* @iwdev: iwarp device
366		− * @reset: true if called before reset
367	364	*
368	365	* Issue destroy ccq request and
369	366	* free the resources associated with the ccq
370	367	*/
371		−static void i40iw_destroy_ccq(struct i40iw_device *iwdev, bool reset)
	368	+static void i40iw_destroy_ccq(struct i40iw_device *iwdev)
372	369	{
373	370	struct i40iw_sc_dev *dev = &iwdev->sc_dev;
374	371	struct i40iw_ccq *ccq = &iwdev->ccq;
375	372	enum i40iw_status_code status = 0;
376	373
377		− if (!reset)
	374	+ if (!iwdev->reset)
378	375	status = dev->ccq_ops->ccq_destroy(dev->ccq, 0, true);
379	376	if (status)
380	377	i40iw_pr_err("ccq destroy failed %d\n", status);
@@ -810,7 +807,7 @@ static enum i40iw_status_code i40iw_setup_ceqs(struct i40iw_device *iwdev, · 429 unmodified lines
810	807	iwceq->msix_idx = msix_vec->idx;
811	808	status = i40iw_configure_ceq_vector(iwdev, iwceq, ceq_id, msix_vec);
812	809	if (status) {
813		− i40iw_destroy_ceq(iwdev, iwceq, false);
	810	+ i40iw_destroy_ceq(iwdev, iwceq);
814	811	break;
815	812	}
816	813	i40iw_enable_intr(&iwdev->sc_dev, msix_vec->idx);
@@ -912,7 +909,7 @@ static enum i40iw_status_code i40iw_setup_aeq(struct i40iw_device *iwdev) · 95 unmodified lines
912	909
913	910	status = i40iw_configure_aeq_vector(iwdev);
914	911	if (status) {
915		− i40iw_destroy_aeq(iwdev, false);
	912	+ i40iw_destroy_aeq(iwdev);
916	913	return status;
917	914	}
918	915
@@ -1442,12 +1439,11 @@ static enum i40iw_status_code i40iw_save_msix_info(struct i40iw_device *iwdev, · 523 unmodified lines
1442	1439	/**
1443	1440	* i40iw_deinit_device - clean up the device resources
1444	1441	* @iwdev: iwarp device
1445		− * @reset: true if called before reset
1446	1442	*
1447	1443	* Destroy the ib device interface, remove the mac ip entry and ipv4/ipv6 addresses,
1448	1444	* destroy the device queues and free the pble and the hmc objects
1449	1445	*/
1450		−static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset)
	1446	+static void i40iw_deinit_device(struct i40iw_device *iwdev)
1451	1447	{
1452	1448	struct i40e_info *ldev = iwdev->ldev;
1453	1449
@@ -1464,7 +1460,7 @@ static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset) · 10 unmodified lines
1464	1460	i40iw_destroy_rdma_device(iwdev->iwibdev);
1465	1461	/* fallthrough */
1466	1462	case IP_ADDR_REGISTERED:
1467		− if (!reset)
	1463	+ if (!iwdev->reset)
1468	1464	i40iw_del_macip_entry(iwdev, (u8)iwdev->mac_ip_table_idx);
1469	1465	/* fallthrough */
1470	1466	case INET_NOTIFIER:
@@ -1474,26 +1470,26 @@ static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset) · 3 unmodified lines
1474	1470	unregister_inet6addr_notifier(&i40iw_inetaddr6_notifier);
1475	1471	}
1476	1472	/* fallthrough */
	1473	+ case PBLE_CHUNK_MEM:
	1474	+ i40iw_destroy_pble_pool(dev, iwdev->pble_rsrc);
	1475	+ /* fallthrough */
1477	1476	case CEQ_CREATED:
1478		− i40iw_dele_ceqs(iwdev, reset);
	1477	+ i40iw_dele_ceqs(iwdev);
1479	1478	/* fallthrough */
1480	1479	case AEQ_CREATED:
1481		− i40iw_destroy_aeq(iwdev, reset);
	1480	+ i40iw_destroy_aeq(iwdev);
1482	1481	/* fallthrough */
1483	1482	case IEQ_CREATED:
1484		− i40iw_puda_dele_resources(&iwdev->vsi, I40IW_PUDA_RSRC_TYPE_IEQ, reset);
	1483	+ i40iw_puda_dele_resources(&iwdev->vsi, I40IW_PUDA_RSRC_TYPE_IEQ, iwdev->reset);
1485	1484	/* fallthrough */
1486	1485	case ILQ_CREATED:
1487		− i40iw_puda_dele_resources(&iwdev->vsi, I40IW_PUDA_RSRC_TYPE_ILQ, reset);
	1486	+ i40iw_puda_dele_resources(&iwdev->vsi, I40IW_PUDA_RSRC_TYPE_ILQ, iwdev->reset);
1488	1487	/* fallthrough */
1489	1488	case CCQ_CREATED:
1490		− i40iw_destroy_ccq(iwdev, reset);
1491		− /* fallthrough */
1492		− case PBLE_CHUNK_MEM:
1493		− i40iw_destroy_pble_pool(dev, iwdev->pble_rsrc);
	1489	+ i40iw_destroy_ccq(iwdev);
1494	1490	/* fallthrough */
1495	1491	case HMC_OBJS_CREATED:
1496		− i40iw_del_hmc_objects(dev, dev->hmc_info, true, reset);
	1492	+ i40iw_del_hmc_objects(dev, dev->hmc_info, true, iwdev->reset);
1497	1493	/* fallthrough */
1498	1494	case CQP_CREATED:
1499	1495	i40iw_destroy_cqp(iwdev, true);
@@ -1670,6 +1666,7 @@ static int i40iw_open(struct i40e_info ldev, struct i40e_client client) · 170 unmodified lines
1670	1666	status = i40iw_hmc_init_pble(&iwdev->sc_dev, iwdev->pble_rsrc);
1671	1667	if (status)
1672	1668	break;
	1669	+ iwdev->init_state = PBLE_CHUNK_MEM;
1673	1670	iwdev->virtchnl_wq = alloc_ordered_workqueue("iwvch", WQ_MEM_RECLAIM);
1674	1671	i40iw_register_notifiers();
1675	1672	iwdev->init_state = INET_NOTIFIER;
@@ -1693,7 +1690,7 @@ static int i40iw_open(struct i40e_info ldev, struct i40e_client client) · 17 unmodified lines
1693	1690	} while (0);
1694	1691
1695	1692	i40iw_pr_err("status = %d last completion = %d\n", status, iwdev->init_state);
1696		− i40iw_deinit_device(iwdev, false);
	1693	+ i40iw_deinit_device(iwdev);
1697	1694	return -ERESTART;
1698	1695	}
1699	1696
@@ -1774,9 +1771,12 @@ static void i40iw_close(struct i40e_info ldev, struct i40e_client client, bool · 74 unmodified lines
1774	1771	iwdev = &hdl->device;
1775	1772	iwdev->closing = true;
1776	1773
	1774	+ if (reset)
	1775	+ iwdev->reset = true;
	1776	+
1777	1777	i40iw_cm_disconnect_all(iwdev);
1778	1778	destroy_workqueue(iwdev->virtchnl_wq);
1779		− i40iw_deinit_device(iwdev, reset);
	1779	+ i40iw_deinit_device(iwdev);
1780	1780	}
1781	1781
1782	1782	/**

drivers/infiniband/hw/i40iw/i40iw_puda.c+4−1

@@ -408,6 +408,9 @@ enum i40iw_status_code i40iw_puda_send(struct i40iw_sc_qp *qp, · 407 unmodified lines
408	408	set_64bit_val(wqe, 0, info->paddr);
409	409	set_64bit_val(wqe, 8, LS_64(info->len, I40IWQPSQ_FRAG_LEN));
410	410	set_64bit_val(wqe, 16, header[0]);
	411	+
	412	+ /* Ensure all data is written before writing valid bit */
	413	+ wmb();
411	414	set_64bit_val(wqe, 24, header[1]);
412	415
413	416	i40iw_debug_buf(qp->dev, I40IW_DEBUG_PUDA, "PUDA SEND WQE", wqe, 32);
@@ -1411,10 +1414,10 @@ static void i40iw_ieq_handle_exception(struct i40iw_puda_rsrc *ieq, · 997 unmodified lines
1411	1414
1412	1415	if (!list_empty(rxlist)) {
1413	1416	tmpbuf = (struct i40iw_puda_buf *)rxlist->next;
1414		− plist = &tmpbuf->list;
1415	1417	while ((struct list_head *)tmpbuf != rxlist) {
1416	1418	if ((int)(buf->seqnum - tmpbuf->seqnum) < 0)
1417	1419	break;
	1420	+ plist = &tmpbuf->list;
1418	1421	tmpbuf = (struct i40iw_puda_buf *)plist->next;
1419	1422	}
1420	1423	/* Insert buf before tmpbuf */

drivers/infiniband/hw/i40iw/i40iw_utils.c+58−2

@@ -337,6 +337,7 @@ struct i40iw_cqp_request i40iw_get_cqp_request(struct i40iw_cqp cqp, bool wait · 336 unmodified lines
337	337	*/
338	338	void i40iw_free_cqp_request(struct i40iw_cqp cqp, struct i40iw_cqp_request cqp_request)
339	339	{
	340	+ struct i40iw_device *iwdev = container_of(cqp, struct i40iw_device, cqp);
340	341	unsigned long flags;
341	342
342	343	if (cqp_request->dynamic) {
@@ -350,6 +351,7 @@ void i40iw_free_cqp_request(struct i40iw_cqp cqp, struct i40iw_cqp_request cqp · 7 unmodified lines
350	351	list_add_tail(&cqp_request->list, &cqp->cqp_avail_reqs);
351	352	spin_unlock_irqrestore(&cqp->req_lock, flags);
352	353	}
	354	+ wake_up(&iwdev->close_wq);
353	355	}
354	356
355	357	/**
@@ -364,6 +366,56 @@ void i40iw_put_cqp_request(struct i40iw_cqp *cqp, · 8 unmodified lines
364	366	i40iw_free_cqp_request(cqp, cqp_request);
365	367	}
366	368
	369	+/**
	370	+ * i40iw_free_pending_cqp_request -free pending cqp request objs
	371	+ * @cqp: cqp ptr
	372	+ * @cqp_request: to be put back in cqp list
	373	+ */
	374	+static void i40iw_free_pending_cqp_request(struct i40iw_cqp *cqp,
	375	+ struct i40iw_cqp_request *cqp_request)
	376	+{
	377	+ struct i40iw_device *iwdev = container_of(cqp, struct i40iw_device, cqp);
	378	+
	379	+ if (cqp_request->waiting) {
	380	+ cqp_request->compl_info.error = true;
	381	+ cqp_request->request_done = true;
	382	+ wake_up(&cqp_request->waitq);
	383	+ }
	384	+ i40iw_put_cqp_request(cqp, cqp_request);
	385	+ wait_event_timeout(iwdev->close_wq,
	386	+ !atomic_read(&cqp_request->refcount),
	387	+ 1000);
	388	+}
	389	+
	390	+/**
	391	+ * i40iw_cleanup_pending_cqp_op - clean-up cqp with no completions
	392	+ * @iwdev: iwarp device
	393	+ */
	394	+void i40iw_cleanup_pending_cqp_op(struct i40iw_device *iwdev)
	395	+{
	396	+ struct i40iw_sc_dev *dev = &iwdev->sc_dev;
	397	+ struct i40iw_cqp *cqp = &iwdev->cqp;
	398	+ struct i40iw_cqp_request *cqp_request = NULL;
	399	+ struct cqp_commands_info *pcmdinfo = NULL;
	400	+ u32 i, pending_work, wqe_idx;
	401	+
	402	+ pending_work = I40IW_RING_WORK_AVAILABLE(cqp->sc_cqp.sq_ring);
	403	+ wqe_idx = I40IW_RING_GETCURRENT_TAIL(cqp->sc_cqp.sq_ring);
	404	+ for (i = 0; i < pending_work; i++) {
	405	+ cqp_request = (struct i40iw_cqp_request *)(unsigned long)cqp->scratch_array[wqe_idx];
	406	+ if (cqp_request)
	407	+ i40iw_free_pending_cqp_request(cqp, cqp_request);
	408	+ wqe_idx = (wqe_idx + 1) % I40IW_RING_GETSIZE(cqp->sc_cqp.sq_ring);
	409	+ }
	410	+
	411	+ while (!list_empty(&dev->cqp_cmd_head)) {
	412	+ pcmdinfo = (struct cqp_commands_info *)i40iw_remove_head(&dev->cqp_cmd_head);
	413	+ cqp_request = container_of(pcmdinfo, struct i40iw_cqp_request, info);
	414	+ if (cqp_request)
	415	+ i40iw_free_pending_cqp_request(cqp, cqp_request);
	416	+ }
	417	+}
	418	+
367	419	/**
368	420	* i40iw_free_qp - callback after destroy cqp completes
369	421	* @cqp_request: cqp request for destroy qp
@@ -546,8 +598,12 @@ void i40iw_rem_ref(struct ib_qp *ibqp) · 176 unmodified lines
546	598	cqp_info->in.u.qp_destroy.scratch = (uintptr_t)cqp_request;
547	599	cqp_info->in.u.qp_destroy.remove_hash_idx = true;
548	600	status = i40iw_handle_cqp_op(iwdev, cqp_request);
549		− if (status)
550		− i40iw_pr_err("CQP-OP Destroy QP fail");
	601	+ if (!status)
	602	+ return;
	603	+
	604	+ i40iw_rem_pdusecount(iwqp->iwpd, iwdev);
	605	+ i40iw_free_qp_resources(iwdev, iwqp, qp_num);
	606	+ i40iw_rem_devusecount(iwdev);
551	607	}
552	608
553	609	/**

drivers/infiniband/hw/i40iw/i40iw_verbs.c+14−5

@@ -426,9 +426,13 @@ void i40iw_free_qp_resources(struct i40iw_device *iwdev, · 425 unmodified lines
426	426	struct i40iw_qp *iwqp,
427	427	u32 qp_num)
428	428	{
	429	+ struct i40iw_pbl *iwpbl = &iwqp->iwpbl;
	430	+
429	431	i40iw_dealloc_push_page(iwdev, &iwqp->sc_qp);
430	432	if (qp_num)
431	433	i40iw_free_resource(iwdev, iwdev->allocated_qps, qp_num);
	434	+ if (iwpbl->pbl_allocated)
	435	+ i40iw_free_pble(iwdev->pble_rsrc, &iwpbl->pble_alloc);
432	436	i40iw_free_dma_mem(iwdev->sc_dev.hw, &iwqp->q2_ctx_mem);
433	437	i40iw_free_dma_mem(iwdev->sc_dev.hw, &iwqp->kqp.dma_mem);
434	438	kfree(iwqp->kqp.wrid_mem);
@@ -483,7 +487,7 @@ static int i40iw_setup_virt_qp(struct i40iw_device *iwdev, · 48 unmodified lines
483	487	struct i40iw_qp *iwqp,
484	488	struct i40iw_qp_init_info *init_info)
485	489	{
486		− struct i40iw_pbl *iwpbl = iwqp->iwpbl;
	490	+ struct i40iw_pbl *iwpbl = &iwqp->iwpbl;
487	491	struct i40iw_qp_mr *qpmr = &iwpbl->qp_mr;
488	492
489	493	iwqp->page = qpmr->sq_page;
@@ -688,19 +692,22 @@ static struct ib_qp i40iw_create_qp(struct ib_pd ibpd, · 198 unmodified lines
688	692	ucontext = to_ucontext(ibpd->uobject->context);
689	693
690	694	if (req.user_wqe_buffers) {
	695	+ struct i40iw_pbl *iwpbl;
	696	+
691	697	spin_lock_irqsave(
692	698	&ucontext->qp_reg_mem_list_lock, flags);
693		− iwqp->iwpbl = i40iw_get_pbl(
	699	+ iwpbl = i40iw_get_pbl(
694	700	(unsigned long)req.user_wqe_buffers,
695	701	&ucontext->qp_reg_mem_list);
696	702	spin_unlock_irqrestore(
697	703	&ucontext->qp_reg_mem_list_lock, flags);
698	704
699		− if (!iwqp->iwpbl) {
	705	+ if (!iwpbl) {
700	706	err_code = -ENODATA;
701	707	i40iw_pr_err("no pbl info\n");
702	708	goto error;
703	709	}
	710	+ memcpy(&iwqp->iwpbl, iwpbl, sizeof(iwqp->iwpbl));
704	711	}
705	712	}
706	713	err_code = i40iw_setup_virt_qp(iwdev, iwqp, &init_info);
@@ -1161,8 +1168,10 @@ static struct ib_cq i40iw_create_cq(struct ib_device ibdev, · 454 unmodified lines
1161	1168	memset(&req, 0, sizeof(req));
1162	1169	iwcq->user_mode = true;
1163	1170	ucontext = to_ucontext(context);
1164		− if (ib_copy_from_udata(&req, udata, sizeof(struct i40iw_create_cq_req)))
	1171	+ if (ib_copy_from_udata(&req, udata, sizeof(struct i40iw_create_cq_req))) {
	1172	+ err_code = -EFAULT;
1165	1173	goto cq_free_resources;
	1174	+ }
1166	1175
1167	1176	spin_lock_irqsave(&ucontext->cq_reg_mem_list_lock, flags);
1168	1177	iwpbl = i40iw_get_pbl((unsigned long)req.user_cq_buffer,
@@ -2063,7 +2072,7 @@ static int i40iw_dereg_mr(struct ib_mr *ib_mr) · 894 unmodified lines
2063	2072	ucontext = to_ucontext(ibpd->uobject->context);
2064	2073	i40iw_del_memlist(iwmr, ucontext);
2065	2074	}
2066		− if (iwpbl->pbl_allocated)
	2075	+ if (iwpbl->pbl_allocated && iwmr->type != IW_MEMREG_TYPE_QP)
2067	2076	i40iw_free_pble(iwdev->pble_rsrc, palloc);
2068	2077	kfree(iwmr);
2069	2078	return 0;

drivers/infiniband/hw/i40iw/i40iw_verbs.h+1−1

@@ -170,7 +170,7 @@ struct i40iw_qp { · 169 unmodified lines
170	170	struct i40iw_qp_kmode kqp;
171	171	struct i40iw_dma_mem host_ctx;
172	172	struct timer_list terminate_timer;
173		− struct i40iw_pbl *iwpbl;
	173	+ struct i40iw_pbl iwpbl;
174	174	struct i40iw_dma_mem q2_ctx_mem;
175	175	struct i40iw_dma_mem ietf_mem;
176	176	struct completion sq_drained;

drivers/infiniband/hw/mlx4/cm.c+4−0

@@ -323,6 +323,9 @@ int mlx4_ib_multiplex_cm_handler(struct ib_device *ibdev, int port, int slave_id · 322 unmodified lines
323	323	mad->mad_hdr.attr_id == CM_REP_ATTR_ID \|\|
324	324	mad->mad_hdr.attr_id == CM_SIDR_REQ_ATTR_ID) {
325	325	sl_cm_id = get_local_comm_id(mad);
	326	+ id = id_map_get(ibdev, &pv_cm_id, slave_id, sl_cm_id);
	327	+ if (id)
	328	+ goto cont;
326	329	id = id_map_alloc(ibdev, slave_id, sl_cm_id);
327	330	if (IS_ERR(id)) {
328	331	mlx4_ib_warn(ibdev, "%s: id{slave: %d, sl_cm_id: 0x%x} Failed to id_map_alloc\n",
@@ -343,6 +346,7 @@ int mlx4_ib_multiplex_cm_handler(struct ib_device *ibdev, int port, int slave_id · 14 unmodified lines
343	346	return -EINVAL;
344	347	}
345	348
	349	+cont:
346	350	set_local_comm_id(mad, id->pv_cm_id);
347	351
348	352	if (mad->mad_hdr.attr_id == CM_DREQ_ATTR_ID)

drivers/infiniband/hw/mlx5/mr.c+1−1

@@ -835,7 +835,7 @@ static int mr_umem_get(struct ib_pd *pd, u64 start, u64 length, · 834 unmodified lines
835	835	access_flags, 0);
836	836	err = PTR_ERR_OR_ZERO(*umem);
837	837	if (err < 0) {
838		− mlx5_ib_err(dev, "umem get failed (%ld)\n", PTR_ERR(umem));
	838	+ mlx5_ib_err(dev, "umem get failed (%d)\n", err);
839	839	return err;
840	840	}
841	841

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c+3−1

@@ -744,7 +744,8 @@ err: · 743 unmodified lines
744	744	if (is_uctx_pd) {
745	745	ocrdma_release_ucontext_pd(uctx);
746	746	} else {
747		− status = _ocrdma_dealloc_pd(dev, pd);
	747	+ if (_ocrdma_dealloc_pd(dev, pd))
	748	+ pr_err("%s: _ocrdma_dealloc_pd() failed\n", __func__);
748	749	}
749	750	exit:
750	751	return ERR_PTR(status);
@@ -1901,6 +1902,7 @@ struct ib_srq ocrdma_create_srq(struct ib_pd ibpd, · 1150 unmodified lines
1901	1902	goto err;
1902	1903
1903	1904	if (udata == NULL) {
	1905	+ status = -ENOMEM;
1904	1906	srq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt,
1905	1907	GFP_KERNEL);
1906	1908	if (srq->rqe_wr_id_tbl == NULL)

drivers/infiniband/hw/qedr/verbs.c+12−4

@@ -53,6 +53,14 @@ · 52 unmodified lines
53	53
54	54	#define DB_ADDR_SHIFT(addr) ((addr) << DB_PWM_ADDR_OFFSET_SHIFT)
55	55
	56	+static inline int qedr_ib_copy_to_udata(struct ib_udata udata, void src,
	57	+ size_t len)
	58	+{
	59	+ size_t min_len = min_t(size_t, len, udata->outlen);
	60	+
	61	+ return ib_copy_to_udata(udata, src, min_len);
	62	+}
	63	+
56	64	int qedr_query_pkey(struct ib_device ibdev, u8 port, u16 index, u16 pkey)
57	65	{
58	66	if (index > QEDR_ROCE_PKEY_TABLE_LEN)
@@ -378,7 +386,7 @@ struct ib_ucontext qedr_alloc_ucontext(struct ib_device ibdev, · 319 unmodified lines
378	386	uresp.sges_per_srq_wr = dev->attr.max_srq_sge;
379	387	uresp.max_cqes = QEDR_MAX_CQES;
380	388
381		− rc = ib_copy_to_udata(udata, &uresp, sizeof(uresp));
	389	+ rc = qedr_ib_copy_to_udata(udata, &uresp, sizeof(uresp));
382	390	if (rc)
383	391	goto err;
384	392
@@ -499,7 +507,7 @@ struct ib_pd qedr_alloc_pd(struct ib_device ibdev, · 114 unmodified lines
499	507
500	508	uresp.pd_id = pd_id;
501	509
502		− rc = ib_copy_to_udata(udata, &uresp, sizeof(uresp));
	510	+ rc = qedr_ib_copy_to_udata(udata, &uresp, sizeof(uresp));
503	511	if (rc) {
504	512	DP_ERR(dev, "copy error pd_id=0x%x.\n", pd_id);
505	513	dev->ops->rdma_dealloc_pd(dev->rdma_ctx, pd_id);
@@ -729,7 +737,7 @@ static int qedr_copy_cq_uresp(struct qedr_dev *dev, · 223 unmodified lines
729	737	uresp.db_offset = DB_ADDR_SHIFT(DQ_PWM_OFFSET_UCM_RDMA_CQ_CONS_32BIT);
730	738	uresp.icid = cq->icid;
731	739
732		− rc = ib_copy_to_udata(udata, &uresp, sizeof(uresp));
	740	+ rc = qedr_ib_copy_to_udata(udata, &uresp, sizeof(uresp));
733	741	if (rc)
734	742	DP_ERR(dev, "copy error cqid=0x%x.\n", cq->icid);
735	743
@@ -1238,7 +1246,7 @@ static int qedr_copy_qp_uresp(struct qedr_dev *dev, · 502 unmodified lines
1238	1246	uresp.atomic_supported = dev->atomic_cap != IB_ATOMIC_NONE;
1239	1247	uresp.qp_id = qp->qp_id;
1240	1248
1241		− rc = ib_copy_to_udata(udata, &uresp, sizeof(uresp));
	1249	+ rc = qedr_ib_copy_to_udata(udata, &uresp, sizeof(uresp));
1242	1250	if (rc)
1243	1251	DP_ERR(dev,
1244	1252	"create qp: failed a copy to user space with qp icid=0x%x.\n",

drivers/infiniband/sw/rdmavt/qp.c+1−3

@@ -1258,9 +1258,7 @@ int rvt_modify_qp(struct ib_qp ibqp, struct ib_qp_attr attr, · 1257 unmodified lines
1258	1258
1259	1259	if (attr_mask & IB_QP_TIMEOUT) {
1260	1260	qp->timeout = attr->timeout;
1261		− qp->timeout_jiffies =
1262		− usecs_to_jiffies((4096UL * (1UL << qp->timeout)) /
1263		− 1000UL);
	1261	+ qp->timeout_jiffies = rvt_timeout_to_jiffies(qp->timeout);
1264	1262	}
1265	1263
1266	1264	if (attr_mask & IB_QP_QKEY)

drivers/infiniband/sw/rxe/rxe_resp.c+3−0

@@ -1219,6 +1219,9 @@ void rxe_drain_req_pkts(struct rxe_qp *qp, bool notify) · 1218 unmodified lines
1219	1219	kfree_skb(skb);
1220	1220	}
1221	1221
	1222	+ if (notify)
	1223	+ return;
	1224	+
1222	1225	while (!qp->srq && qp->rq.queue && queue_head(qp->rq.queue))
1223	1226	advance_consumer(qp->rq.queue);
1224	1227	}

drivers/infiniband/sw/rxe/rxe_verbs.c+3−0

@@ -914,6 +914,9 @@ static int rxe_post_recv(struct ib_qp ibqp, struct ib_recv_wr wr, · 913 unmodified lines
914	914
915	915	spin_unlock_irqrestore(&rq->producer_lock, flags);
916	916
	917	+ if (qp->resp.state == QP_STATE_ERROR)
	918	+ rxe_run_task(&qp->resp.task, 1);
	919	+
917	920	err1:
918	921	return err;
919	922	}

drivers/infiniband/ulp/ipoib/ipoib_main.c+1−0

@@ -2239,6 +2239,7 @@ static struct net_device ipoib_add_port(const char format, · 2238 unmodified lines
2239	2239	goto register_failed;
2240	2240	}
2241	2241
	2242	+ result = -ENOMEM;
2242	2243	if (ipoib_cm_add_mode_attr(priv->dev))
2243	2244	goto sysfs_failed;
2244	2245	if (ipoib_add_pkey_attr(priv->dev))

drivers/infiniband/ulp/iser/iser_initiator.c+4−2

@@ -137,8 +137,10 @@ iser_prepare_write_cmd(struct iscsi_task *task, · 136 unmodified lines
137	137
138	138	if (unsol_sz < edtl) {
139	139	hdr->flags \|= ISER_WSV;
140		− hdr->write_stag = cpu_to_be32(mem_reg->rkey);
141		− hdr->write_va = cpu_to_be64(mem_reg->sge.addr + unsol_sz);
	140	+ if (buf_out->data_len > imm_sz) {
	141	+ hdr->write_stag = cpu_to_be32(mem_reg->rkey);
	142	+ hdr->write_va = cpu_to_be64(mem_reg->sge.addr + unsol_sz);
	143	+ }
142	144
143	145	iser_dbg("Cmd itt:%d, WRITE tags, RKEY:%#.4X "
144	146	"VA:%#llX + unsol:%d\n",

include/rdma/ib_addr.h+4−2

@@ -205,11 +205,13 @@ static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr, · 204 unmodified lines
205	205	dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if);
206	206	if (dev) {
207	207	ip4 = in_dev_get(dev);
208		− if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) {
	208	+ if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address)
209	209	ipv6_addr_set_v4mapped(ip4->ifa_list->ifa_address,
210	210	(struct in6_addr *)gid);
	211	+
	212	+ if (ip4)
211	213	in_dev_put(ip4);
212		− }
	214	+
213	215	dev_put(dev);
214	216	}
215	217	}

include/rdma/rdmavt_qp.h+14−0

@@ -647,6 +647,20 @@ static inline u32 rvt_div_mtu(struct rvt_qp *qp, u32 len) · 646 unmodified lines
647	647	return len >> qp->log_pmtu;
648	648	}
649	649
	650	+/**
	651	+ * rvt_timeout_to_jiffies - Convert a ULP timeout input into jiffies
	652	+ * @timeout - timeout input(0 - 31).
	653	+ *
	654	+ * Return a timeout value in jiffies.
	655	+ */
	656	+static inline unsigned long rvt_timeout_to_jiffies(u8 timeout)
	657	+{
	658	+ if (timeout > 31)
	659	+ timeout = 31;
	660	+
	661	+ return usecs_to_jiffies(1U << timeout) * 4096UL / 1000UL;
	662	+}
	663	+
650	664	extern const int ib_rvt_state_ops[];
651	665
652	666	struct rvt_dev_info;