iscsit: proper endianess conversions (50e5c87d) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/target/iscsi/iscsi_target.c

+55 −66

Original line number	Diff line number	Diff line
		@@ -785,9 +785,6 @@ static int iscsit_handle_scsi_cmd(

		hdr = (struct iscsi_scsi_req *) buf;
		payload_length = ntoh24(hdr->dlength);
		hdr->data_length = be32_to_cpu(hdr->data_length);
		hdr->cmdsn = be32_to_cpu(hdr->cmdsn);
		hdr->exp_statsn = be32_to_cpu(hdr->exp_statsn);

		/* FIXME; Add checks for AdditionalHeaderSegment */

		@@ -851,7 +848,7 @@ done:
		buf, conn);
		}

		if ((hdr->data_length == payload_length) &&
		if ((be32_to_cpu(hdr->data_length )== payload_length) &&
		(!(hdr->flags & ISCSI_FLAG_CMD_FINAL))) {
		pr_err("Expected Data Transfer Length and Length of"
		" Immediate Data are the same, but ISCSI_FLAG_CMD_FINAL"
		@@ -860,7 +857,7 @@ done:
		buf, conn);
		}

		if (payload_length > hdr->data_length) {
		if (payload_length > be32_to_cpu(hdr->data_length)) {
		pr_err("DataSegmentLength: %u is greater than"
		" EDTL: %u, protocol error.\n", payload_length,
		hdr->data_length);
		@@ -931,8 +928,8 @@ done:
		spin_unlock_bh(&conn->sess->ttt_lock);
		} else if (hdr->flags & ISCSI_FLAG_CMD_WRITE)
		cmd->targ_xfer_tag = 0xFFFFFFFF;
		cmd->cmd_sn = hdr->cmdsn;
		cmd->exp_stat_sn = hdr->exp_statsn;
		cmd->cmd_sn = be32_to_cpu(hdr->cmdsn);
		cmd->exp_stat_sn = be32_to_cpu(hdr->exp_statsn);
		cmd->first_burst_len = payload_length;

		if (cmd->data_direction == DMA_FROM_DEVICE) {
		@@ -951,8 +948,9 @@ done:
		* Initialize struct se_cmd descriptor from target_core_mod infrastructure
		*/
		transport_init_se_cmd(&cmd->se_cmd, &lio_target_fabric_configfs->tf_ops,
		conn->sess->se_sess, hdr->data_length, cmd->data_direction,
		sam_task_attr, cmd->sense_buffer + 2);
		conn->sess->se_sess, be32_to_cpu(hdr->data_length),
		cmd->data_direction, sam_task_attr,
		cmd->sense_buffer + 2);

		pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x,"
		" ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,
		@@ -1027,7 +1025,7 @@ attach_cmd:
		1, 0, buf, cmd);
		}

		iscsit_ack_from_expstatsn(conn, hdr->exp_statsn);
		iscsit_ack_from_expstatsn(conn, be32_to_cpu(hdr->exp_statsn));

		/*
		* If no Immediate Data is attached, it's OK to return now.
		@@ -1193,10 +1191,6 @@ static int iscsit_handle_data_out(struct iscsi_conn conn, unsigned char buf)

		hdr = (struct iscsi_data *) buf;
		payload_length = ntoh24(hdr->dlength);
		hdr->ttt = be32_to_cpu(hdr->ttt);
		hdr->exp_statsn = be32_to_cpu(hdr->exp_statsn);
		hdr->datasn = be32_to_cpu(hdr->datasn);
		hdr->offset = be32_to_cpu(hdr->offset);

		if (!payload_length) {
		pr_err("DataOUT payload is ZERO, protocol error.\n");
		@@ -1248,7 +1242,7 @@ static int iscsit_handle_data_out(struct iscsi_conn conn, unsigned char buf)
		se_cmd = &cmd->se_cmd;
		iscsit_mod_dataout_timer(cmd);

		if ((hdr->offset + payload_length) > cmd->se_cmd.data_length) {
		if ((be32_to_cpu(hdr->offset) + payload_length) > cmd->se_cmd.data_length) {
		pr_err("DataOut Offset: %u, Length %u greater than"
		" iSCSI Command EDTL %u, protocol error.\n",
		hdr->offset, payload_length, cmd->se_cmd.data_length);
		@@ -1331,7 +1325,8 @@ static int iscsit_handle_data_out(struct iscsi_conn conn, unsigned char buf)
		rx_size += payload_length;
		iov = &cmd->iov_data[0];

		iov_ret = iscsit_map_iovec(cmd, iov, hdr->offset, payload_length);
		iov_ret = iscsit_map_iovec(cmd, iov, be32_to_cpu(hdr->offset),
		payload_length);
		if (iov_ret < 0)
		return -1;

		@@ -1362,7 +1357,8 @@ static int iscsit_handle_data_out(struct iscsi_conn conn, unsigned char buf)
		u32 data_crc;

		data_crc = iscsit_do_crypto_hash_sg(&conn->conn_rx_hash, cmd,
		hdr->offset, payload_length, padding,
		be32_to_cpu(hdr->offset),
		payload_length, padding,
		cmd->pad_bytes);

		if (checksum != data_crc) {
		@@ -1423,9 +1419,6 @@ static int iscsit_handle_nop_out(

		hdr = (struct iscsi_nopout *) buf;
		payload_length = ntoh24(hdr->dlength);
		hdr->ttt = be32_to_cpu(hdr->ttt);
		hdr->cmdsn = be32_to_cpu(hdr->cmdsn);
		hdr->exp_statsn = be32_to_cpu(hdr->exp_statsn);

		if (hdr->itt == RESERVED_ITT && !(hdr->opcode & ISCSI_OP_IMMEDIATE)) {
		pr_err("NOPOUT ITT is reserved, but Immediate Bit is"
		@@ -1455,7 +1448,7 @@ static int iscsit_handle_nop_out(
		* Either way, make sure we allocate an struct iscsi_cmd, as both
		* can contain ping data.
		*/
		if (hdr->ttt == 0xFFFFFFFF) {
		if (hdr->ttt == cpu_to_be32(0xFFFFFFFF)) {
		cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);
		if (!cmd)
		return iscsit_add_reject(
		@@ -1468,12 +1461,12 @@ static int iscsit_handle_nop_out(
		1 : 0);
		conn->sess->init_task_tag = cmd->init_task_tag = hdr->itt;
		cmd->targ_xfer_tag = 0xFFFFFFFF;
		cmd->cmd_sn = hdr->cmdsn;
		cmd->exp_stat_sn = hdr->exp_statsn;
		cmd->cmd_sn = be32_to_cpu(hdr->cmdsn);
		cmd->exp_stat_sn = be32_to_cpu(hdr->exp_statsn);
		cmd->data_direction = DMA_NONE;
		}

		if (payload_length && (hdr->ttt == 0xFFFFFFFF)) {
		if (payload_length && hdr->ttt == cpu_to_be32(0xFFFFFFFF)) {
		rx_size = payload_length;
		ping_data = kzalloc(payload_length + 1, GFP_KERNEL);
		if (!ping_data) {
		@@ -1566,7 +1559,7 @@ static int iscsit_handle_nop_out(
		list_add_tail(&cmd->i_conn_node, &conn->conn_cmd_list);
		spin_unlock_bh(&conn->cmd_lock);

		iscsit_ack_from_expstatsn(conn, hdr->exp_statsn);
		iscsit_ack_from_expstatsn(conn, be32_to_cpu(hdr->exp_statsn));

		if (hdr->opcode & ISCSI_OP_IMMEDIATE) {
		iscsit_add_cmd_to_response_queue(cmd, conn,
		@@ -1587,11 +1580,11 @@ static int iscsit_handle_nop_out(
		return 0;
		}

		if (hdr->ttt != 0xFFFFFFFF) {
		if (hdr->ttt != cpu_to_be32(0xFFFFFFFF)) {
		/*
		* This was a response to a unsolicited NOPIN ping.
		*/
		cmd = iscsit_find_cmd_from_ttt(conn, hdr->ttt);
		cmd = iscsit_find_cmd_from_ttt(conn, be32_to_cpu(hdr->ttt));
		if (!cmd)
		return -1;

		@@ -1636,10 +1629,6 @@ static int iscsit_handle_task_mgt_cmd(
		u8 function;

		hdr = (struct iscsi_tm *) buf;
		hdr->cmdsn = be32_to_cpu(hdr->cmdsn);
		hdr->exp_statsn = be32_to_cpu(hdr->exp_statsn);
		hdr->refcmdsn = be32_to_cpu(hdr->refcmdsn);
		hdr->exp_datasn = be32_to_cpu(hdr->exp_datasn);
		hdr->flags &= ~ISCSI_FLAG_CMD_FINAL;
		function = hdr->flags;

		@@ -1664,8 +1653,8 @@ static int iscsit_handle_task_mgt_cmd(
		buf, conn);
		}
		if ((function != ISCSI_TM_FUNC_ABORT_TASK) &&
		(hdr->refcmdsn != ISCSI_RESERVED_TAG))
		hdr->refcmdsn = ISCSI_RESERVED_TAG;
		be32_to_cpu(hdr->refcmdsn) != ISCSI_RESERVED_TAG)
		hdr->refcmdsn = cpu_to_be32(ISCSI_RESERVED_TAG);

		cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);
		if (!cmd)
		@@ -1742,8 +1731,8 @@ static int iscsit_handle_task_mgt_cmd(
		cmd->immediate_cmd = ((hdr->opcode & ISCSI_OP_IMMEDIATE) ? 1 : 0);
		cmd->init_task_tag = hdr->itt;
		cmd->targ_xfer_tag = 0xFFFFFFFF;
		cmd->cmd_sn = hdr->cmdsn;
		cmd->exp_stat_sn = hdr->exp_statsn;
		cmd->cmd_sn = be32_to_cpu(hdr->cmdsn);
		cmd->exp_stat_sn = be32_to_cpu(hdr->exp_statsn);
		se_tmr = cmd->se_cmd.se_tmr_req;
		tmr_req = cmd->tmr_req;
		/*
		@@ -1827,7 +1816,7 @@ attach:
		ISCSI_REASON_PROTOCOL_ERROR,
		1, 0, buf, cmd);
		}
		iscsit_ack_from_expstatsn(conn, hdr->exp_statsn);
		iscsit_ack_from_expstatsn(conn, be32_to_cpu(hdr->exp_statsn));

		if (out_of_order_cmdsn \|\| !(hdr->opcode & ISCSI_OP_IMMEDIATE))
		return 0;
		@@ -1864,9 +1853,6 @@ static int iscsit_handle_text_cmd(

		hdr = (struct iscsi_text *) buf;
		payload_length = ntoh24(hdr->dlength);
		hdr->ttt = be32_to_cpu(hdr->ttt);
		hdr->cmdsn = be32_to_cpu(hdr->cmdsn);
		hdr->exp_statsn = be32_to_cpu(hdr->exp_statsn);

		if (payload_length > conn->conn_ops->MaxXmitDataSegmentLength) {
		pr_err("Unable to accept text parameter length: %u"
		@@ -1983,15 +1969,15 @@ static int iscsit_handle_text_cmd(
		cmd->immediate_cmd = ((hdr->opcode & ISCSI_OP_IMMEDIATE) ? 1 : 0);
		conn->sess->init_task_tag = cmd->init_task_tag = hdr->itt;
		cmd->targ_xfer_tag = 0xFFFFFFFF;
		cmd->cmd_sn = hdr->cmdsn;
		cmd->exp_stat_sn = hdr->exp_statsn;
		cmd->cmd_sn = be32_to_cpu(hdr->cmdsn);
		cmd->exp_stat_sn = be32_to_cpu(hdr->exp_statsn);
		cmd->data_direction = DMA_NONE;

		spin_lock_bh(&conn->cmd_lock);
		list_add_tail(&cmd->i_conn_node, &conn->conn_cmd_list);
		spin_unlock_bh(&conn->cmd_lock);

		iscsit_ack_from_expstatsn(conn, hdr->exp_statsn);
		iscsit_ack_from_expstatsn(conn, be32_to_cpu(hdr->exp_statsn));

		if (!(hdr->opcode & ISCSI_OP_IMMEDIATE)) {
		cmdsn_ret = iscsit_sequence_cmd(conn, cmd, hdr->cmdsn);
		@@ -2125,9 +2111,6 @@ static int iscsit_handle_logout_cmd(

		hdr = (struct iscsi_logout *) buf;
		reason_code = (hdr->flags & 0x7f);
		hdr->cid = be16_to_cpu(hdr->cid);
		hdr->cmdsn = be32_to_cpu(hdr->cmdsn);
		hdr->exp_statsn = be32_to_cpu(hdr->exp_statsn);

		if (tiqn) {
		spin_lock(&tiqn->logout_stats.lock);
		@@ -2159,9 +2142,9 @@ static int iscsit_handle_logout_cmd(
		cmd->immediate_cmd = ((hdr->opcode & ISCSI_OP_IMMEDIATE) ? 1 : 0);
		conn->sess->init_task_tag = cmd->init_task_tag = hdr->itt;
		cmd->targ_xfer_tag = 0xFFFFFFFF;
		cmd->cmd_sn = hdr->cmdsn;
		cmd->exp_stat_sn = hdr->exp_statsn;
		cmd->logout_cid = hdr->cid;
		cmd->cmd_sn = be32_to_cpu(hdr->cmdsn);
		cmd->exp_stat_sn = be32_to_cpu(hdr->exp_statsn);
		cmd->logout_cid = be16_to_cpu(hdr->cid);
		cmd->logout_reason = reason_code;
		cmd->data_direction = DMA_NONE;

		@@ -2171,7 +2154,7 @@ static int iscsit_handle_logout_cmd(
		*/
		if ((reason_code == ISCSI_LOGOUT_REASON_CLOSE_SESSION) \|\|
		((reason_code == ISCSI_LOGOUT_REASON_CLOSE_CONNECTION) &&
		(hdr->cid == conn->cid)))
		be16_to_cpu(hdr->cid) == conn->cid))
		logout_remove = 1;

		spin_lock_bh(&conn->cmd_lock);
		@@ -2179,7 +2162,7 @@ static int iscsit_handle_logout_cmd(
		spin_unlock_bh(&conn->cmd_lock);

		if (reason_code != ISCSI_LOGOUT_REASON_RECOVERY)
		iscsit_ack_from_expstatsn(conn, hdr->exp_statsn);
		iscsit_ack_from_expstatsn(conn, be32_to_cpu(hdr->exp_statsn));

		/*
		* Immediate commands are executed, well, immediately.
		@@ -2212,10 +2195,6 @@ static int iscsit_handle_snack(

		hdr = (struct iscsi_snack *) buf;
		hdr->flags &= ~ISCSI_FLAG_CMD_FINAL;
		hdr->ttt = be32_to_cpu(hdr->ttt);
		hdr->exp_statsn = be32_to_cpu(hdr->exp_statsn);
		hdr->begrun = be32_to_cpu(hdr->begrun);
		hdr->runlength = be32_to_cpu(hdr->runlength);

		pr_debug("Got ISCSI_INIT_SNACK, ITT: 0x%08x, ExpStatSN:"
		" 0x%08x, Type: 0x%02x, BegRun: 0x%08x, RunLength: 0x%08x,"
		@@ -2235,13 +2214,18 @@ static int iscsit_handle_snack(
		switch (hdr->flags & ISCSI_FLAG_SNACK_TYPE_MASK) {
		case 0:
		return iscsit_handle_recovery_datain_or_r2t(conn, buf,
		hdr->itt, hdr->ttt, hdr->begrun, hdr->runlength);
		hdr->itt,
		be32_to_cpu(hdr->ttt),
		be32_to_cpu(hdr->begrun),
		be32_to_cpu(hdr->runlength));
		case ISCSI_FLAG_SNACK_TYPE_STATUS:
		return iscsit_handle_status_snack(conn, hdr->itt, hdr->ttt,
		hdr->begrun, hdr->runlength);
		return iscsit_handle_status_snack(conn, hdr->itt,
		be32_to_cpu(hdr->ttt),
		be32_to_cpu(hdr->begrun), be32_to_cpu(hdr->runlength));
		case ISCSI_FLAG_SNACK_TYPE_DATA_ACK:
		return iscsit_handle_data_ack(conn, hdr->ttt, hdr->begrun,
		hdr->runlength);
		return iscsit_handle_data_ack(conn, be32_to_cpu(hdr->ttt),
		be32_to_cpu(hdr->begrun),
		be32_to_cpu(hdr->runlength));
		case ISCSI_FLAG_SNACK_TYPE_RDATA:
		/* FIXME: Support R-Data SNACK */
		pr_err("R-Data SNACK Not Supported.\n");
		@@ -2529,11 +2513,16 @@ static int iscsit_send_data_in(
		put_unaligned_le64(0xFFFFFFFFFFFFFFFFULL, &hdr->lun);

		hdr->itt = cmd->init_task_tag;
		hdr->ttt = (hdr->flags & ISCSI_FLAG_DATA_ACK) ?
		cpu_to_be32(cmd->targ_xfer_tag) :
		0xFFFFFFFF;
		hdr->statsn = (set_statsn) ? cpu_to_be32(cmd->stat_sn) :
		0xFFFFFFFF;

		if (hdr->flags & ISCSI_FLAG_DATA_ACK)
		hdr->ttt = cpu_to_be32(cmd->targ_xfer_tag);
		else
		hdr->ttt = cpu_to_be32(0xFFFFFFFF);
		if (set_statsn)
		hdr->statsn = cpu_to_be32(cmd->stat_sn);
		else
		hdr->statsn = cpu_to_be32(0xFFFFFFFF);

		hdr->exp_cmdsn = cpu_to_be32(conn->sess->exp_cmd_sn);
		hdr->max_cmdsn = cpu_to_be32(conn->sess->max_cmd_sn);
		hdr->datasn = cpu_to_be32(datain.data_sn);
		@@ -3088,7 +3077,7 @@ static int iscsit_send_status(
		cmd->se_cmd.scsi_sense_length += sizeof (__be16);

		padding = -(cmd->se_cmd.scsi_sense_length) & 3;
		hton24(hdr->dlength, cmd->se_cmd.scsi_sense_length);
		hton24(hdr->dlength, (u32)cmd->se_cmd.scsi_sense_length);
		iov[iov_count].iov_base = cmd->sense_buffer;
		iov[iov_count++].iov_len =
		(cmd->se_cmd.scsi_sense_length + padding);
		@@ -3418,7 +3407,7 @@ static int iscsit_send_reject(
		hdr->opcode = ISCSI_OP_REJECT;
		hdr->flags \|= ISCSI_FLAG_CMD_FINAL;
		hton24(hdr->dlength, ISCSI_HDR_LEN);
		hdr->ffffffff = 0xffffffff;
		hdr->ffffffff = cpu_to_be32(0xffffffff);
		cmd->stat_sn = conn->stat_sn++;
		hdr->statsn = cpu_to_be32(cmd->stat_sn);
		hdr->exp_cmdsn = cpu_to_be32(conn->sess->exp_cmd_sn);

drivers/target/iscsi/iscsi_target_core.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -479,7 +479,6 @@ struct iscsi_cmd {

		struct iscsi_tmr_req {
		bool task_reassign:1;
		u32 ref_cmd_sn;
		u32 exp_data_sn;
		struct iscsi_cmd *ref_cmd;
		struct iscsi_conn_recovery *conn_recovery;

drivers/target/iscsi/iscsi_target_erl0.c

+44 −36

Original line number	Diff line number	Diff line
		@@ -95,14 +95,15 @@ static int iscsit_dataout_within_command_recovery_check(
		*/
		if (conn->sess->sess_ops->DataSequenceInOrder) {
		if ((cmd->cmd_flags & ICF_WITHIN_COMMAND_RECOVERY) &&
		(cmd->write_data_done != hdr->offset))
		cmd->write_data_done != be32_to_cpu(hdr->offset))
		goto dump;

		cmd->cmd_flags &= ~ICF_WITHIN_COMMAND_RECOVERY;
		} else {
		struct iscsi_seq *seq;

		seq = iscsit_get_seq_holder(cmd, hdr->offset, payload_length);
		seq = iscsit_get_seq_holder(cmd, be32_to_cpu(hdr->offset),
		payload_length);
		if (!seq)
		return DATAOUT_CANNOT_RECOVER;
		/*
		@@ -111,15 +112,15 @@ static int iscsit_dataout_within_command_recovery_check(
		cmd->seq_ptr = seq;

		if (conn->sess->sess_ops->DataPDUInOrder) {
		if ((seq->status ==
		DATAOUT_SEQUENCE_WITHIN_COMMAND_RECOVERY) &&
		((seq->offset != hdr->offset) \|\|
		(seq->data_sn != hdr->datasn)))
		if (seq->status ==
		DATAOUT_SEQUENCE_WITHIN_COMMAND_RECOVERY &&
		(seq->offset != be32_to_cpu(hdr->offset) \|\|
		seq->data_sn != be32_to_cpu(hdr->datasn)))
		goto dump;
		} else {
		if ((seq->status ==
		DATAOUT_SEQUENCE_WITHIN_COMMAND_RECOVERY) &&
		(seq->data_sn != hdr->datasn))
		if (seq->status ==
		DATAOUT_SEQUENCE_WITHIN_COMMAND_RECOVERY &&
		seq->data_sn != be32_to_cpu(hdr->datasn))
		goto dump;
		}

		@@ -148,12 +149,12 @@ static int iscsit_dataout_check_unsolicited_sequence(
		u32 payload_length = ntoh24(hdr->dlength);


		if ((hdr->offset < cmd->seq_start_offset) \|\|
		((hdr->offset + payload_length) > cmd->seq_end_offset)) {
		if ((be32_to_cpu(hdr->offset) < cmd->seq_start_offset) \|\|
		((be32_to_cpu(hdr->offset) + payload_length) > cmd->seq_end_offset)) {
		pr_err("Command ITT: 0x%08x with Offset: %u,"
		" Length: %u outside of Unsolicited Sequence %u:%u while"
		" DataSequenceInOrder=Yes.\n", cmd->init_task_tag,
		hdr->offset, payload_length, cmd->seq_start_offset,
		be32_to_cpu(hdr->offset), payload_length, cmd->seq_start_offset,
		cmd->seq_end_offset);
		return DATAOUT_CANNOT_RECOVER;
		}
		@@ -236,12 +237,12 @@ static int iscsit_dataout_check_sequence(
		* fullfilling an Recovery R2T, it's best to just dump the
		* payload here, instead of erroring out.
		*/
		if ((hdr->offset < cmd->seq_start_offset) \|\|
		((hdr->offset + payload_length) > cmd->seq_end_offset)) {
		if ((be32_to_cpu(hdr->offset) < cmd->seq_start_offset) \|\|
		((be32_to_cpu(hdr->offset) + payload_length) > cmd->seq_end_offset)) {
		pr_err("Command ITT: 0x%08x with Offset: %u,"
		" Length: %u outside of Sequence %u:%u while"
		" DataSequenceInOrder=Yes.\n", cmd->init_task_tag,
		hdr->offset, payload_length, cmd->seq_start_offset,
		be32_to_cpu(hdr->offset), payload_length, cmd->seq_start_offset,
		cmd->seq_end_offset);

		if (iscsit_dump_data_payload(conn, payload_length, 1) < 0)
		@@ -251,7 +252,8 @@ static int iscsit_dataout_check_sequence(

		next_burst_len = (cmd->next_burst_len + payload_length);
		} else {
		seq = iscsit_get_seq_holder(cmd, hdr->offset, payload_length);
		seq = iscsit_get_seq_holder(cmd, be32_to_cpu(hdr->offset),
		payload_length);
		if (!seq)
		return DATAOUT_CANNOT_RECOVER;
		/*
		@@ -366,16 +368,16 @@ static int iscsit_dataout_check_datasn(
		data_sn = seq->data_sn;
		}

		if (hdr->datasn > data_sn) {
		if (be32_to_cpu(hdr->datasn) > data_sn) {
		pr_err("Command ITT: 0x%08x, received DataSN: 0x%08x"
		" higher than expected 0x%08x.\n", cmd->init_task_tag,
		hdr->datasn, data_sn);
		be32_to_cpu(hdr->datasn), data_sn);
		recovery = 1;
		goto recover;
		} else if (hdr->datasn < data_sn) {
		} else if (be32_to_cpu(hdr->datasn) < data_sn) {
		pr_err("Command ITT: 0x%08x, received DataSN: 0x%08x"
		" lower than expected 0x%08x, discarding payload.\n",
		cmd->init_task_tag, hdr->datasn, data_sn);
		cmd->init_task_tag, be32_to_cpu(hdr->datasn), data_sn);
		dump = 1;
		goto dump;
		}
		@@ -415,26 +417,27 @@ static int iscsit_dataout_pre_datapduinorder_yes(
		* error has occured and fail the connection.
		*/
		if (conn->sess->sess_ops->DataSequenceInOrder) {
		if (hdr->offset != cmd->write_data_done) {
		if (be32_to_cpu(hdr->offset) != cmd->write_data_done) {
		pr_err("Command ITT: 0x%08x, received offset"
		" %u different than expected %u.\n", cmd->init_task_tag,
		hdr->offset, cmd->write_data_done);
		be32_to_cpu(hdr->offset), cmd->write_data_done);
		recovery = 1;
		goto recover;
		}
		} else {
		struct iscsi_seq *seq = cmd->seq_ptr;

		if (hdr->offset > seq->offset) {
		if (be32_to_cpu(hdr->offset) > seq->offset) {
		pr_err("Command ITT: 0x%08x, received offset"
		" %u greater than expected %u.\n", cmd->init_task_tag,
		hdr->offset, seq->offset);
		be32_to_cpu(hdr->offset), seq->offset);
		recovery = 1;
		goto recover;
		} else if (hdr->offset < seq->offset) {
		} else if (be32_to_cpu(hdr->offset) < seq->offset) {
		pr_err("Command ITT: 0x%08x, received offset"
		" %u less than expected %u, discarding payload.\n",
		cmd->init_task_tag, hdr->offset, seq->offset);
		cmd->init_task_tag, be32_to_cpu(hdr->offset),
		seq->offset);
		dump = 1;
		goto dump;
		}
		@@ -453,7 +456,7 @@ dump:
		return DATAOUT_CANNOT_RECOVER;

		return (recovery) ? iscsit_recover_dataout_sequence(cmd,
		hdr->offset, payload_length) :
		be32_to_cpu(hdr->offset), payload_length) :
		(dump) ? DATAOUT_WITHIN_COMMAND_RECOVERY : DATAOUT_NORMAL;
		}

		@@ -465,7 +468,8 @@ static int iscsit_dataout_pre_datapduinorder_no(
		struct iscsi_data hdr = (struct iscsi_data ) buf;
		u32 payload_length = ntoh24(hdr->dlength);

		pdu = iscsit_get_pdu_holder(cmd, hdr->offset, payload_length);
		pdu = iscsit_get_pdu_holder(cmd, be32_to_cpu(hdr->offset),
		payload_length);
		if (!pdu)
		return DATAOUT_CANNOT_RECOVER;

		@@ -479,7 +483,7 @@ static int iscsit_dataout_pre_datapduinorder_no(
		case ISCSI_PDU_RECEIVED_OK:
		pr_err("Command ITT: 0x%08x received already gotten"
		" Offset: %u, Length: %u\n", cmd->init_task_tag,
		hdr->offset, payload_length);
		be32_to_cpu(hdr->offset), payload_length);
		return iscsit_dump_data_payload(cmd->conn, payload_length, 1);
		default:
		return DATAOUT_CANNOT_RECOVER;
		@@ -553,7 +557,7 @@ static int iscsit_dataout_post_crc_passed(
		if (cmd->unsolicited_data) {
		if ((cmd->first_burst_len + payload_length) ==
		conn->sess->sess_ops->FirstBurstLength) {
		if (iscsit_dataout_update_r2t(cmd, hdr->offset,
		if (iscsit_dataout_update_r2t(cmd, be32_to_cpu(hdr->offset),
		payload_length) < 0)
		return DATAOUT_CANNOT_RECOVER;
		send_r2t = 1;
		@@ -561,7 +565,8 @@ static int iscsit_dataout_post_crc_passed(

		if (!conn->sess->sess_ops->DataPDUInOrder) {
		ret = iscsit_dataout_update_datapduinorder_no(cmd,
		hdr->datasn, (hdr->flags & ISCSI_FLAG_CMD_FINAL));
		be32_to_cpu(hdr->datasn),
		(hdr->flags & ISCSI_FLAG_CMD_FINAL));
		if (ret == DATAOUT_CANNOT_RECOVER)
		return ret;
		}
		@@ -586,7 +591,8 @@ static int iscsit_dataout_post_crc_passed(
		if (conn->sess->sess_ops->DataSequenceInOrder) {
		if ((cmd->next_burst_len + payload_length) ==
		conn->sess->sess_ops->MaxBurstLength) {
		if (iscsit_dataout_update_r2t(cmd, hdr->offset,
		if (iscsit_dataout_update_r2t(cmd,
		be32_to_cpu(hdr->offset),
		payload_length) < 0)
		return DATAOUT_CANNOT_RECOVER;
		send_r2t = 1;
		@@ -594,7 +600,7 @@ static int iscsit_dataout_post_crc_passed(

		if (!conn->sess->sess_ops->DataPDUInOrder) {
		ret = iscsit_dataout_update_datapduinorder_no(
		cmd, hdr->datasn,
		cmd, be32_to_cpu(hdr->datasn),
		(hdr->flags & ISCSI_FLAG_CMD_FINAL));
		if (ret == DATAOUT_CANNOT_RECOVER)
		return ret;
		@@ -610,7 +616,8 @@ static int iscsit_dataout_post_crc_passed(

		if ((seq->next_burst_len + payload_length) ==
		seq->xfer_len) {
		if (iscsit_dataout_update_r2t(cmd, hdr->offset,
		if (iscsit_dataout_update_r2t(cmd,
		be32_to_cpu(hdr->offset),
		payload_length) < 0)
		return DATAOUT_CANNOT_RECOVER;
		send_r2t = 1;
		@@ -618,7 +625,7 @@ static int iscsit_dataout_post_crc_passed(

		if (!conn->sess->sess_ops->DataPDUInOrder) {
		ret = iscsit_dataout_update_datapduinorder_no(
		cmd, hdr->datasn,
		cmd, be32_to_cpu(hdr->datasn),
		(hdr->flags & ISCSI_FLAG_CMD_FINAL));
		if (ret == DATAOUT_CANNOT_RECOVER)
		return ret;
		@@ -678,7 +685,8 @@ static int iscsit_dataout_post_crc_failed(
		}

		recover:
		return iscsit_recover_dataout_sequence(cmd, hdr->offset, payload_length);
		return iscsit_recover_dataout_sequence(cmd, be32_to_cpu(hdr->offset),
		payload_length);
		}

		/*

drivers/target/iscsi/iscsi_target_erl2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		*/
		void iscsit_create_conn_recovery_datain_values(
		struct iscsi_cmd *cmd,
		u32 exp_data_sn)
		__be32 exp_data_sn)
		{
		u32 data_sn = 0;
		struct iscsi_conn *conn = cmd->conn;
		@@ -44,7 +44,7 @@ void iscsit_create_conn_recovery_datain_values(
		cmd->next_burst_len = 0;
		cmd->read_data_done = 0;

		while (exp_data_sn > data_sn) {
		while (be32_to_cpu(exp_data_sn) > data_sn) {
		if ((cmd->next_burst_len +
		conn->conn_ops->MaxRecvDataSegmentLength) <
		conn->sess->sess_ops->MaxBurstLength) {

drivers/target/iscsi/iscsi_target_erl2.h

+1 −1

Original line number	Diff line number	Diff line
		#ifndef ISCSI_TARGET_ERL2_H
		#define ISCSI_TARGET_ERL2_H

		extern void iscsit_create_conn_recovery_datain_values(struct iscsi_cmd *, u32);
		extern void iscsit_create_conn_recovery_datain_values(struct iscsi_cmd *, __be32);
		extern void iscsit_create_conn_recovery_dataout_values(struct iscsi_cmd *);
		extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(
		struct iscsi_session *, u16);