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

Commit 9253e667 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Nicholas Bellinger
Browse files

iser-target: Fix variable-length response error completion 



Since commit "2426bd45 target: Report correct response ..."
we might get a command with data_size that does not fit to
the number of allocated data sg elements. Given that we rely on
cmd t_data_nents which might be different than the data_size,
we sometimes receive local length error completion. The correct
approach would be to take the command data_size into account when
constructing the ib sg_list.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarJenny Falkovich <jennyf@mellanox.com>
Cc: stable@vger.kernel.org # 3.16+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent b2feda4f

drivers/infiniband/ulp/isert/ib_isert.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -2380,7 +2380,6 @@ isert_build_rdma_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd, 
	page_off = offset % PAGE_SIZE;

	page_off = offset % PAGE_SIZE;





	send_wr->sg_list = ib_sge;

	send_wr->sg_list = ib_sge;

	send_wr->num_sge = sg_nents;

	send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;

	send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;

	/*

	/*

	 * Perform mapping of TCM scatterlist memory ib_sge dma_addr.

	 * Perform mapping of TCM scatterlist memory ib_sge dma_addr.
@@ -2400,14 +2399,17 @@ isert_build_rdma_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd, 
			  ib_sge->addr, ib_sge->length, ib_sge->lkey);

			  ib_sge->addr, ib_sge->length, ib_sge->lkey);

		page_off = 0;

		page_off = 0;

		data_left -= ib_sge->length;

		data_left -= ib_sge->length;

		if (!data_left)

			break;

		ib_sge++;

		ib_sge++;

		isert_dbg("Incrementing ib_sge pointer to %p\n", ib_sge);

		isert_dbg("Incrementing ib_sge pointer to %p\n", ib_sge);

	}

	}





	send_wr->num_sge = ++i;

	isert_dbg("Set outgoing sg_list: %p num_sg: %u from TCM SGLs\n",

	isert_dbg("Set outgoing sg_list: %p num_sg: %u from TCM SGLs\n",

		  send_wr->sg_list, send_wr->num_sge);

		  send_wr->sg_list, send_wr->num_sge);





	return sg_nents;

	return send_wr->num_sge;

}

}





static int

static int