Hi Nic,
I ran libiscsi test suite and find that some test cases failed. One of
them is "iSCSI.iSCSIdatasn":
./libiscsi/test-tool/iscsi-test-cu --test=iSCSI.iSCSIdatasn --verbose
--Verbose-scsi --dataloss iscsi://${IP}:3260/${IQN}/0
This is the output of the failed test:
// start of test output
Send READCAPACITY10 (Expecting SUCCESS) LBA:0 pmi:0
[OK] READCAPACITY10 returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send READCAPACITY16 (Expecting SUCCESS)
[OK] READCAPACITY16 returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send INQUIRY (Expecting SUCCESS) evpd:0 page_code:00 alloc_len:64
[OK] INQUIRY returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send INQUIRY (Expecting SUCCESS) evpd:1 page_code:b0 alloc_len:64
[OK] INQUIRY returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send INQUIRY (Expecting SUCCESS) evpd:1 page_code:b1 alloc_len:255
[OK] INQUIRY returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send INQUIRY (Expecting SUCCESS) evpd:1 page_code:b2 alloc_len:64
[OK] INQUIRY returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send REPORT_SUPPORTED_OPCODE (Expecting SUCCESS) RCTD:1 OPTIONS:0
OPCODE:0x00 SA:0 ALLOC_LEN:65535
[SKIPPED] REPORT_SUPPORTED_OPCODES is not implemented.
Send MODESENSE6 (Expecting SUCCESS)
[OK] MODESENSE6 returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send PRIN/READ_KEYS
CUnit - A unit testing framework for C - Version 2.1-2
http://cunit.sourceforge.net/
Suite: iSCSIdatasn
Test: iSCSIDataSnInvalid ...
Test sending invalid iSCSI DataSN
Send two Data-Out PDU's with DataSN==0. Should fail.
Send WRITE10 (Expecting SUCCESS) LBA:100 blocks:2 wrprotect:0 dpo:0
fua:0 fua_nv:0 group:0
[FAILED] WRITE10 command failed with sense. NO
SENSE(0x00)/(null)(0x0000)
Send Data-Out PDU with DataSN==27. Should fail
Send WRITE10 (Expecting SUCCESS) LBA:100 blocks:1 wrprotect:0 dpo:0
fua:0 fua_nv:0 group:0
[FAILED] WRITE10 command failed with sense. NO
SENSE(0x00)/(null)(0x0000)
Send Data-Out PDU with DataSN==-1. Should fail
Send WRITE10 (Expecting SUCCESS) LBA:100 blocks:1 wrprotect:0 dpo:0
fua:0 fua_nv:0 group:0
[OK] WRITE10 returned SUCCESS NO SENSE(0x00) (null)(0x0000)
Send Data-Out PDU's in reverse order (DataSN == 1,0). Should fail
Send WRITE10 (Expecting SUCCESS) LBA:100 blocks:2 wrprotect:0 dpo:0
fua:0 fua_nv:0 group:0
[FAILED] WRITE10 command failed with sense. NO
SENSE(0x00)/(null)(0x0000)
FAILED
1. test_iscsi_datasn_invalid.c:142 - CU_ASSERT_NOT_EQUAL(ret,0)
Run Summary: Type Total Ran Passed Failed Inactive
suites 1 1 n/a 0 0
tests 1 1 0 1 0
asserts 4 4 3 1 n/a
Elapsed time = 2.808 seconds
Tests completed with return value: 0
// end of test output
To fix it, I propose a patch:
Signed-off-by: Jiang Yi <jiangyilism@xxxxxxxxx>
---
drivers/target/iscsi/iscsi_target_erl0.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/target/iscsi/iscsi_target_erl0.c b/drivers/target/iscsi/iscsi_target_erl0.c
index 7fe2aa7..15fe495 100644
--- a/drivers/target/iscsi/iscsi_target_erl0.c
+++ b/drivers/target/iscsi/iscsi_target_erl0.c
@@ -297,7 +297,10 @@ static int iscsit_dataout_check_sequence(
pr_err("Command ITT: 0x%08x set ISCSI_FLAG_CMD_FINAL"
" before end of DataOUT sequence, protocol"
" error.\n", cmd->init_task_tag);
- return DATAOUT_CANNOT_RECOVER;
+ if (iscsit_dump_data_payload(conn, payload_length, 1) < 0) {
+ return DATAOUT_CANNOT_RECOVER;
+ }
+ return DATAOUT_WITHIN_COMMAND_RECOVERY;
}
} else {
if (next_burst_len < seq->xfer_len) {
@@ -382,7 +385,10 @@ static int iscsit_dataout_check_datasn(
if (!conn->sess->sess_ops->ErrorRecoveryLevel) {
pr_err("Unable to perform within-command recovery"
" while ERL=0.\n");
- return DATAOUT_CANNOT_RECOVER;
+ if (iscsit_dump_data_payload(conn, payload_length, 1) < 0) {
+ return DATAOUT_CANNOT_RECOVER;
+ }
+ return DATAOUT_WITHIN_COMMAND_RECOVERY;
}
dump:
if (iscsit_dump_data_payload(conn, payload_length, 1) < 0)
--
2.5.0
by Jiang Yi
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
