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

Commit 9bb4ca68 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

iser-target: Ignore completions for FRWRs in isert_cq_tx_work 



This patch changes IB_WR_FAST_REG_MR + IB_WR_LOCAL_INV related
work requests to include a ISER_FRWR_LI_WRID value in order to
signal isert_cq_tx_work() that these requests should be ignored.

This is necessary because even though IB_SEND_SIGNALED is not
set for either work request, during a QP failure event the work
requests will be returned with exception status from the TX
completion queue.

v2 changes:
 - Rename ISER_FRWR_LI_WRID -> ISER_FASTREG_LI_WRID (Sagi)

Acked-by: default avatarSagi Grimberg <sagig@mellanox.com>
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Cc: <stable@vger.kernel.org> #3.12+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent b6b87a1d

drivers/infiniband/ulp/isert/ib_isert.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -1751,10 +1751,12 @@ isert_cq_tx_work(struct work_struct *work) 
			pr_debug("TX wc.status: 0x%08x\n", wc.status);

			pr_debug("TX wc.status: 0x%08x\n", wc.status);

			pr_debug("TX wc.vendor_err: 0x%08x\n", wc.vendor_err);

			pr_debug("TX wc.vendor_err: 0x%08x\n", wc.vendor_err);





			if (wc.wr_id != ISER_FASTREG_LI_WRID) {

				atomic_dec(&isert_conn->post_send_buf_count);

				atomic_dec(&isert_conn->post_send_buf_count);

				isert_cq_tx_comp_err(tx_desc, isert_conn);

				isert_cq_tx_comp_err(tx_desc, isert_conn);

			}

			}

		}

		}

	}





	ib_req_notify_cq(tx_cq, IB_CQ_NEXT_COMP);

	ib_req_notify_cq(tx_cq, IB_CQ_NEXT_COMP);

}

}
@@ -2213,6 +2215,7 @@ isert_fast_reg_mr(struct fast_reg_descriptor *fr_desc, 




	if (!fr_desc->valid) {

	if (!fr_desc->valid) {

		memset(&inv_wr, 0, sizeof(inv_wr));

		memset(&inv_wr, 0, sizeof(inv_wr));

		inv_wr.wr_id = ISER_FASTREG_LI_WRID;

		inv_wr.opcode = IB_WR_LOCAL_INV;

		inv_wr.opcode = IB_WR_LOCAL_INV;

		inv_wr.ex.invalidate_rkey = fr_desc->data_mr->rkey;

		inv_wr.ex.invalidate_rkey = fr_desc->data_mr->rkey;

		wr = &inv_wr;

		wr = &inv_wr;
@@ -2223,6 +2226,7 @@ isert_fast_reg_mr(struct fast_reg_descriptor *fr_desc, 




	/* Prepare FASTREG WR */

	/* Prepare FASTREG WR */

	memset(&fr_wr, 0, sizeof(fr_wr));

	memset(&fr_wr, 0, sizeof(fr_wr));

	fr_wr.wr_id = ISER_FASTREG_LI_WRID;

	fr_wr.opcode = IB_WR_FAST_REG_MR;

	fr_wr.opcode = IB_WR_FAST_REG_MR;

	fr_wr.wr.fast_reg.iova_start =

	fr_wr.wr.fast_reg.iova_start =

		fr_desc->data_frpl->page_list[0] + page_off;

		fr_desc->data_frpl->page_list[0] + page_off;

drivers/infiniband/ulp/isert/ib_isert.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 




#define ISERT_RDMA_LISTEN_BACKLOG	10

#define ISERT_RDMA_LISTEN_BACKLOG	10

#define ISCSI_ISER_SG_TABLESIZE		256

#define ISCSI_ISER_SG_TABLESIZE		256

#define ISER_FASTREG_LI_WRID		0xffffffffffffffffULL





enum isert_desc_type {

enum isert_desc_type {

	ISCSI_TX_CONTROL,

	ISCSI_TX_CONTROL,