target/iscsi: Fix unsolicited data seq_end_offset calculation
authorVarun Prakash <varun@chelsio.com>
Fri, 20 Jan 2017 11:14:33 +0000 (16:44 +0530)
committerNicholas Bellinger <nab@linux-iscsi.org>
Sun, 19 Feb 2017 05:24:21 +0000 (21:24 -0800)
In case of unsolicited data for the first sequence
seq_end_offset must be set to minimum of total data length
and FirstBurstLength, so do not add cmd->write_data_done
to the min of total data length and FirstBurstLength.

This patch avoids that with ImmediateData=Yes, InitialR2T=No,
MaxXmitDataSegmentLength < FirstBurstLength that a WRITE command
with IO size above FirstBurstLength triggers sequence error
messages, for example

Set following parameters on target (linux-4.8.12)
ImmediateData = Yes
InitialR2T = No
MaxXmitDataSegmentLength = 8k
FirstBurstLength = 64k

Log in from Open iSCSI initiator and execute
dd if=/dev/zero of=/dev/sdb bs=128k count=1 oflag=direct

Error messages on target
Command ITT: 0x00000035 with Offset: 65536, Length: 8192 outside
of Sequence 73728:131072 while DataSequenceInOrder=Yes.
Command ITT: 0x00000035, received DataSN: 0x00000001 higher than
expected 0x00000000.
Unable to perform within-command recovery while ERL=0.

Signed-off-by: Varun Prakash <varun@chelsio.com>
[ bvanassche: Use min() instead of open-coding it / edited patch description ]
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/iscsi/iscsi_target_erl0.c

index b54e72c7ab0fa5f4ddf501b27b6e46c280f8c368..a8bcbc43b047c80764de949e1b20591c46f8568c 100644 (file)
@@ -44,10 +44,8 @@ void iscsit_set_dataout_sequence_values(
         */
        if (cmd->unsolicited_data) {
                cmd->seq_start_offset = cmd->write_data_done;
-               cmd->seq_end_offset = (cmd->write_data_done +
-                       ((cmd->se_cmd.data_length >
-                         conn->sess->sess_ops->FirstBurstLength) ?
-                        conn->sess->sess_ops->FirstBurstLength : cmd->se_cmd.data_length));
+               cmd->seq_end_offset = min(cmd->se_cmd.data_length,
+                                       conn->sess->sess_ops->FirstBurstLength);
                return;
        }