warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WRITE SAME data buffer length handling

Browse Source 
From the SPC-4 paragraph about WRITE SAME(10): "The WRITE SAME (10)
command requests that the device server transfer a single logical
block from the Data-Out Buffer [ ... ]". Hence always pass a data
buffer when sending a WRITE SAME(10) command.

Set the NDOB bit in the WRITE SAME(16) command if no data out buffer
is present.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2014-08-18 08:37:30 +02:00
committed by Ronnie Sahlberg
parent e8c4be8f62
commit ded75ae18a
6 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/scsi-lowlevel.h
+2 -2
View File
@@ -1072,8 +1072,8 @@ EXTERN struct scsi_task *scsi_cdb_verify16(uint64_t lba, uint32_t xferlen, int v
EXTERN struct scsi_task *scsi_cdb_write10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number); EXTERN struct scsi_task *scsi_cdb_write10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *scsi_cdb_write12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number); EXTERN struct scsi_task *scsi_cdb_write12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number); EXTERN struct scsi_task *scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, uint32_t lba, int group, uint16_t num_blocks); EXTERN struct scsi_task *scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, uint32_t lba, int group, uint16_t num_blocks, uint32_t datalen);
EXTERN struct scsi_task *scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, uint64_t lba, int group, uint32_t num_blocks); EXTERN struct scsi_task *scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, uint64_t lba, int group, uint32_t num_blocks, uint32_t datalen);
EXTERN struct scsi_task *scsi_cdb_writeverify10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number); EXTERN struct scsi_task *scsi_cdb_writeverify10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);
EXTERN struct scsi_task *scsi_cdb_writeverify12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number); EXTERN struct scsi_task *scsi_cdb_writeverify12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);
EXTERN struct scsi_task *scsi_cdb_writeverify16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number); EXTERN struct scsi_task *scsi_cdb_writeverify16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);
lib/iscsi-command.c
+4 -2
View File
@@ -1518,7 +1518,8 @@ iscsi_writesame10_task(struct iscsi_context *iscsi, int lun, uint32_t lba,
struct scsi_task *task; struct scsi_task *task;
struct iscsi_data d; struct iscsi_data d;
task = scsi_cdb_writesame10(wrprotect, anchor, unmap, lba, group, num_blocks); task = scsi_cdb_writesame10(wrprotect, anchor, unmap, lba, group,
num_blocks, datalen);
if (task == NULL) { if (task == NULL) {
iscsi_set_error(iscsi, "Out-of-memory: Failed to create " iscsi_set_error(iscsi, "Out-of-memory: Failed to create "
"writesame10 cdb."); "writesame10 cdb.");
@@ -1551,7 +1552,8 @@ iscsi_writesame16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
struct scsi_task *task; struct scsi_task *task;
struct iscsi_data d; struct iscsi_data d;
task = scsi_cdb_writesame16(wrprotect, anchor, unmap, lba, group, num_blocks); task = scsi_cdb_writesame16(wrprotect, anchor, unmap, lba, group,
num_blocks, datalen);
if (task == NULL) { if (task == NULL) {
iscsi_set_error(iscsi, "Out-of-memory: Failed to create " iscsi_set_error(iscsi, "Out-of-memory: Failed to create "
"writesame16 cdb."); "writesame16 cdb.");
lib/scsi-lowlevel.c
+7 -4
View File
@@ -2106,7 +2106,7 @@ err:
* WRITE_SAME10 * WRITE_SAME10
*/ */
struct scsi_task * struct scsi_task *
scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, uint32_t lba, int group, uint16_t num_blocks) scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, uint32_t lba, int group, uint16_t num_blocks, uint32_t datalen)
{ {
struct scsi_task *task; struct scsi_task *task;
@@ -2135,7 +2135,7 @@ scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, uint32_t lba, int gro
task->cdb_size = 10; task->cdb_size = 10;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
task->expxferlen = 512; task->expxferlen = datalen;
return task; return task;
} }
@@ -2144,7 +2144,7 @@ scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, uint32_t lba, int gro
* WRITE_SAME16 * WRITE_SAME16
*/ */
struct scsi_task * struct scsi_task *
scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, uint64_t lba, int group, uint32_t num_blocks) scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, uint64_t lba, int group, uint32_t num_blocks, uint32_t datalen)
{ {
struct scsi_task *task; struct scsi_task *task;
@@ -2165,6 +2165,9 @@ scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, uint64_t lba, int gro
if (unmap) { if (unmap) {
task->cdb[1] |= 0x08; task->cdb[1] |= 0x08;
} }
if (datalen == 0) {
task->cdb[1] |= 0x01;
}
scsi_set_uint32(&task->cdb[2], lba >> 32); scsi_set_uint32(&task->cdb[2], lba >> 32);
scsi_set_uint32(&task->cdb[6], lba & 0xffffffff); scsi_set_uint32(&task->cdb[6], lba & 0xffffffff);
scsi_set_uint32(&task->cdb[10], num_blocks); scsi_set_uint32(&task->cdb[10], num_blocks);
@@ -2174,7 +2177,7 @@ scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, uint64_t lba, int gro
task->cdb_size = 16; task->cdb_size = 16;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
task->expxferlen = 512; task->expxferlen = datalen;
return task; return task;
} }
test-tool/test_writesame10_0blocks.c
+5 -4
View File
@@ -27,6 +27,7 @@ void
test_writesame10_0blocks(void) test_writesame10_0blocks(void)
{ {
int ret; int ret;
unsigned char *buf = alloca(block_size);
CHECK_FOR_DATALOSS; CHECK_FOR_DATALOSS;
CHECK_FOR_SBC; CHECK_FOR_SBC;
@@ -41,7 +42,7 @@ test_writesame10_0blocks(void)
inq_bl->wsnz); inq_bl->wsnz);
ret = writesame10(iscsic, tgt_lun, 0, ret = writesame10(iscsic, tgt_lun, 0,
block_size, 0, block_size, 0,
0, 0, 0, 0, NULL); 0, 0, 0, 0, buf);
if (ret == -2) { if (ret == -2) {
CU_PASS("[SKIPPED] Target does not support WRITESAME10. Skipping test"); CU_PASS("[SKIPPED] Target does not support WRITESAME10. Skipping test");
return; return;
@@ -60,20 +61,20 @@ test_writesame10_0blocks(void)
logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks one block past end-of-LUN"); logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks one block past end-of-LUN");
ret = writesame10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1, ret = writesame10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1,
block_size, 0, block_size, 0,
0, 0, 0, 0, NULL); 0, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==2^31"); logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==2^31");
ret = writesame10_lbaoutofrange(iscsic, tgt_lun, 0x80000000, ret = writesame10_lbaoutofrange(iscsic, tgt_lun, 0x80000000,
block_size, 0, block_size, 0,
0, 0, 0, 0, NULL); 0, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==-1"); logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==-1");
ret = writesame10_lbaoutofrange(iscsic, tgt_lun, -1, ret = writesame10_lbaoutofrange(iscsic, tgt_lun, -1,
block_size, 0, block_size, 0,
0, 0, 0, 0, NULL); 0, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
} }
test-tool/test_writesame10_unmap_unaligned.c
+2 -1
View File
@@ -29,6 +29,7 @@ void
test_writesame10_unmap_unaligned(void) test_writesame10_unmap_unaligned(void)
{ {
int i, ret; int i, ret;
unsigned char *buf = alloca(block_size);
CHECK_FOR_DATALOSS; CHECK_FOR_DATALOSS;
CHECK_FOR_THIN_PROVISIONING; CHECK_FOR_THIN_PROVISIONING;
@@ -42,7 +43,7 @@ test_writesame10_unmap_unaligned(void)
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10 at LBA:%d", lbppb - i, i); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10 at LBA:%d", lbppb - i, i);
ret = writesame10_invalidfieldincdb(iscsic, tgt_lun, i, ret = writesame10_invalidfieldincdb(iscsic, tgt_lun, i,
block_size, lbppb - i, block_size, lbppb - i,
0, 1, 0, 0, NULL); 0, 1, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
} }
} }
test-tool/test_writesame10_unmap_until_end.c
+2 -2
View File
@@ -54,8 +54,8 @@ test_writesame10_unmap_until_end(void)
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i);
ret = writesame10(iscsic, tgt_lun, num_blocks - i, ret = writesame10(iscsic, tgt_lun, num_blocks - i,
0, i, block_size, i,
0, 1, 0, 0, NULL); 0, 1, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
if (rc16->lbprz) { if (rc16->lbprz) {