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

Commit 3df8f68a authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

iser-target: Fix isert_put_reject payload buffer post 



This patch adds the missing isert_put_reject() logic to post
a outgoing payload buffer to hold the 48 bytes of original PDU
header request payload for the rejected cmd.

It also fixes ISTATE_SEND_REJECT handling in isert_response_completion()
-> isert_do_control_comp() code, and drops incorrect iscsi_cmd_t->reject_comp
usage.

Cc: Or Gerlitz <ogerlitz@mellanox.com>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: stable@vger.kernel.org  # 3.10+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 4f45d320

drivers/infiniband/ulp/isert/ib_isert.c

+22 −4
Original line number Diff line number Diff line
@@ -1243,6 +1243,9 @@ isert_put_cmd(struct isert_cmd *isert_cmd) 
		 * associated cmd->se_cmd needs to be released.

		 */

		if (cmd->se_cmd.se_tfo != NULL) {

			pr_debug("Calling transport_generic_free_cmd from"

				 " isert_put_cmd for 0x%02x\n",

				 cmd->iscsi_opcode);

			transport_generic_free_cmd(&cmd->se_cmd, 0);

			break;

		}
@@ -1339,8 +1342,8 @@ isert_do_control_comp(struct work_struct *work) 
		atomic_dec(&isert_conn->post_send_buf_count);



		cmd->i_state = ISTATE_SENT_STATUS;

		complete(&cmd->reject_comp);

		isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev);

		break;

	case ISTATE_SEND_LOGOUTRSP:

		pr_debug("Calling iscsit_logout_post_handler >>>>>>>>>>>>>>\n");

		/*
@@ -1366,7 +1369,8 @@ isert_response_completion(struct iser_tx_desc *tx_desc, 
	struct iscsi_cmd *cmd = &isert_cmd->iscsi_cmd;



	if (cmd->i_state == ISTATE_SEND_TASKMGTRSP ||

	    cmd->i_state == ISTATE_SEND_LOGOUTRSP) {

	    cmd->i_state == ISTATE_SEND_LOGOUTRSP ||

	    cmd->i_state == ISTATE_SEND_REJECT) {

		isert_unmap_tx_desc(tx_desc, ib_dev);



		INIT_WORK(&isert_cmd->comp_work, isert_do_control_comp);
@@ -1658,11 +1662,25 @@ isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
				struct isert_cmd, iscsi_cmd);

	struct isert_conn *isert_conn = (struct isert_conn *)conn->context;

	struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr;

	struct ib_device *ib_dev = isert_conn->conn_cm_id->device;

	struct ib_sge *tx_dsg = &isert_cmd->tx_desc.tx_sg[1];

	struct iscsi_reject *hdr =

		(struct iscsi_reject *)&isert_cmd->tx_desc.iscsi_header;



	isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc);

	iscsit_build_reject(cmd, conn, (struct iscsi_reject *)

				&isert_cmd->tx_desc.iscsi_header);

	iscsit_build_reject(cmd, conn, hdr);

	isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);



	hton24(hdr->dlength, ISCSI_HDR_LEN);

	isert_cmd->sense_buf_dma = ib_dma_map_single(ib_dev,

			(void *)cmd->buf_ptr, ISCSI_HDR_LEN,

			DMA_TO_DEVICE);

	isert_cmd->sense_buf_len = ISCSI_HDR_LEN;

	tx_dsg->addr	= isert_cmd->sense_buf_dma;

	tx_dsg->length	= ISCSI_HDR_LEN;

	tx_dsg->lkey	= isert_conn->conn_mr->lkey;

	isert_cmd->tx_desc.num_sge = 2;



	isert_init_send_wr(isert_cmd, send_wr);



	pr_debug("Posting Reject IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");