From 568e4ddfcc31de3f2d6e32a1cdee7fcb0399d3ea Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sat, 28 Apr 2012 14:34:47 +1000 Subject: [PATCH] SBC: Add support for WRITESAME16 and add simple tests using it to unmap blocks from a thin provisioned lun --- Makefile.am | 3 +- include/iscsi.h | 14 ++ include/scsi-lowlevel.h | 2 + lib/libiscsi.def | 6 + lib/scsi-command.c | 41 ++++++ lib/scsi-lowlevel.c | 45 ++++++ lib/sync.c | 26 ++++ test-tool/0190_writesame16_unmap.c | 141 +++++++++++++++++++ test-tool/0191_writesame16_unmap_unaligned.c | 113 +++++++++++++++ test-tool/iscsi-test.c | 4 + test-tool/iscsi-test.h | 3 + 11 files changed, 397 insertions(+), 1 deletion(-) create mode 100644 test-tool/0190_writesame16_unmap.c create mode 100644 test-tool/0191_writesame16_unmap_unaligned.c diff --git a/Makefile.am b/Makefile.am index c7868bb..3eddff0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,8 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \ test-tool/0153_read16_rdprotect.c \ test-tool/0160_readcapacity16_simple.c \ test-tool/0170_unmap_simple.c test-tool/0171_unmap_zero.c \ - test-tool/0180_writesame10_unmap.c test-tool/0181_writesame10_unmap_unaligned.c + test-tool/0180_writesame10_unmap.c test-tool/0181_writesame10_unmap_unaligned.c \ + test-tool/0190_writesame16_unmap.c test-tool/0191_writesame16_unmap_unaligned.c endif # LD_PRELOAD library. diff --git a/include/iscsi.h b/include/iscsi.h index 6f90014..eef6c02 100644 --- a/include/iscsi.h +++ b/include/iscsi.h @@ -615,6 +615,13 @@ iscsi_writesame10_task(struct iscsi_context *iscsi, int lun, int wrprotect, int group, iscsi_command_cb cb, void *private_data); EXTERN struct scsi_task * +iscsi_writesame16_task(struct iscsi_context *iscsi, int lun, + unsigned char *data, uint32_t datalen, + uint64_t lba, uint32_t num_blocks, + int anchor, int unmap, int pbdata, int lbdata, + int wrprotect, int group, + iscsi_command_cb cb, void *private_data); +EXTERN struct scsi_task * iscsi_modesense6_task(struct iscsi_context *iscsi, int lun, int dbd, int pc, int page_code, int sub_page_code, unsigned char alloc_len, iscsi_command_cb cb, @@ -686,6 +693,13 @@ iscsi_writesame10_sync(struct iscsi_context *iscsi, int lun, int anchor, int unmap, int pbdata, int lbdata, int wrprotect, int group); +EXTERN struct scsi_task * +iscsi_writesame16_sync(struct iscsi_context *iscsi, int lun, + unsigned char *data, uint32_t datalen, + uint64_t lba, uint32_t num_blocks, + int anchor, int unmap, int pbdata, int lbdata, + int wrprotect, int group); + EXTERN struct scsi_task * iscsi_unmap_sync(struct iscsi_context *iscsi, int lun, int anchor, int group, struct unmap_list *list, int list_len); diff --git a/include/scsi-lowlevel.h b/include/scsi-lowlevel.h index fe78672..c2b9e12 100644 --- a/include/scsi-lowlevel.h +++ b/include/scsi-lowlevel.h @@ -32,6 +32,7 @@ enum scsi_opcode { SCSI_OPCODE_WRITE_SAME10 = 0x41, SCSI_OPCODE_UNMAP = 0x42, SCSI_OPCODE_READ16 = 0x88, + SCSI_OPCODE_WRITE_SAME16 = 0x93, SCSI_OPCODE_SERVICE_ACTION_IN = 0x9E, SCSI_OPCODE_REPORTLUNS = 0xA0, SCSI_OPCODE_READ12 = 0xA8 @@ -565,6 +566,7 @@ EXTERN struct scsi_task *scsi_cdb_serviceactionin16(enum scsi_service_action_in EXTERN struct scsi_task *scsi_cdb_readcapacity16(void); EXTERN struct scsi_task *scsi_cdb_unmap(int anchor, int group, uint16_t xferlen); EXTERN struct scsi_task *scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, int pbdata, int lbdata, uint32_t lba, int group, uint16_t num_blocks); +EXTERN struct scsi_task *scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, int pbdata, int lbdata, uint64_t lba, int group, uint32_t num_blocks); void *scsi_malloc(struct scsi_task *task, size_t size); diff --git a/lib/libiscsi.def b/lib/libiscsi.def index f7de01f..02784ba 100644 --- a/lib/libiscsi.def +++ b/lib/libiscsi.def @@ -49,6 +49,8 @@ iscsi_read6_task iscsi_read10_task iscsi_verify10_task iscsi_write10_task +iscsi_writesame10_task +iscsi_writesame16_task iscsi_modesense6_task iscsi_scsi_command_sync iscsi_reportluns_sync @@ -61,6 +63,8 @@ iscsi_read6_sync iscsi_read10_sync iscsi_verify10_sync iscsi_write10_sync +iscsi_writesame10_sync +iscsi_writesame16_sync iscsi_scsi_task_cancel iscsi_scsi_cancel_all_tasks poll @@ -88,6 +92,8 @@ scsi_cdb_read6 scsi_cdb_read10 scsi_cdb_verify10 scsi_cdb_write10 +scsi_cdb_writesame10 +scsi_cdb_writesame16 scsi_cdb_synchronizecache10 scsi_cdb_readcapacity16 scsi_cdb_serviceactionin16 diff --git a/lib/scsi-command.c b/lib/scsi-command.c index 46ae3c3..89ed1bc 100644 --- a/lib/scsi-command.c +++ b/lib/scsi-command.c @@ -837,6 +837,47 @@ iscsi_writesame10_task(struct iscsi_context *iscsi, int lun, return task; } +struct scsi_task * +iscsi_writesame16_task(struct iscsi_context *iscsi, int lun, + unsigned char *data, uint32_t datalen, + uint64_t lba, uint32_t num_blocks, + int anchor, int unmap, int pbdata, int lbdata, + int wrprotect, int group, + iscsi_command_cb cb, void *private_data) +{ + struct scsi_task *task; + struct iscsi_data outdata; + + task = scsi_cdb_writesame16(wrprotect, anchor, unmap, pbdata, lbdata, lba, group, num_blocks); + if (task == NULL) { + iscsi_set_error(iscsi, "Out-of-memory: Failed to create " + "writesame16 cdb."); + return NULL; + } + + if (datalen) { + outdata.data = data; + outdata.size = datalen; + task->expxferlen = datalen; + + if (iscsi_scsi_command_async(iscsi, lun, task, cb, &outdata, + private_data) != 0) { + scsi_free_scsi_task(task); + return NULL; + } + } else { + task->expxferlen = 0; + task->xfer_dir = SCSI_XFER_NONE; + + if (iscsi_scsi_command_async(iscsi, lun, task, cb, NULL, + private_data) != 0) { + scsi_free_scsi_task(task); + return NULL; + } + } + + return task; +} struct scsi_task * iscsi_unmap_task(struct iscsi_context *iscsi, int lun, int anchor, int group, diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c index bd517e1..6dbfed5 100644 --- a/lib/scsi-lowlevel.c +++ b/lib/scsi-lowlevel.c @@ -833,6 +833,51 @@ scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, int pbdata, int lbdat return task; } +/* + * WRITE_SAME16 + */ +struct scsi_task * +scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, int pbdata, int lbdata, uint64_t lba, int group, uint32_t num_blocks) +{ + struct scsi_task *task; + + task = malloc(sizeof(struct scsi_task)); + if (task == NULL) { + return NULL; + } + + memset(task, 0, sizeof(struct scsi_task)); + task->cdb[0] = SCSI_OPCODE_WRITE_SAME16; + + if (wrprotect) { + task->cdb[1] |= ((wrprotect & 0x7) << 5); + } + if (anchor) { + task->cdb[1] |= 0x10; + } + if (unmap) { + task->cdb[1] |= 0x08; + } + if (pbdata) { + task->cdb[1] |= 0x04; + } + if (lbdata) { + task->cdb[1] |= 0x02; + } + *(uint32_t *)&task->cdb[2] = htonl(lba >> 32); + *(uint32_t *)&task->cdb[6] = htonl(lba & 0xffffffff); + *(uint32_t *)&task->cdb[10] = htonl(num_blocks); + if (group) { + task->cdb[14] |= (group & 0x1f); + } + + task->cdb_size = 16; + task->xfer_dir = SCSI_XFER_WRITE; + task->expxferlen = 512; + + return task; +} + /* * MODESENSE6 */ diff --git a/lib/sync.c b/lib/sync.c index ba617ae..49284aa 100644 --- a/lib/sync.c +++ b/lib/sync.c @@ -387,6 +387,32 @@ iscsi_writesame10_sync(struct iscsi_context *iscsi, int lun, return state.task; } +struct scsi_task * +iscsi_writesame16_sync(struct iscsi_context *iscsi, int lun, + unsigned char *data, uint32_t datalen, + uint64_t lba, uint32_t num_blocks, + int anchor, int unmap, int pbdata, int lbdata, + int wrprotect, int group) +{ + struct iscsi_sync_state state; + + memset(&state, 0, sizeof(state)); + + if (iscsi_writesame16_task(iscsi, lun, data, datalen, + lba, num_blocks, + anchor, unmap, pbdata, lbdata, + wrprotect, group, + scsi_sync_cb, &state) == NULL) { + iscsi_set_error(iscsi, + "Failed to send WRITESAME16 command"); + return NULL; + } + + event_loop(iscsi, &state); + + return state.task; +} + struct scsi_task * iscsi_unmap_sync(struct iscsi_context *iscsi, int lun, int anchor, int group, struct unmap_list *list, int list_len) diff --git a/test-tool/0190_writesame16_unmap.c b/test-tool/0190_writesame16_unmap.c new file mode 100644 index 0000000..10c5ef4 --- /dev/null +++ b/test-tool/0190_writesame16_unmap.c @@ -0,0 +1,141 @@ +/* + Copyright (C) 2012 by Ronnie Sahlberg + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . +*/ + +#include +#include "iscsi.h" +#include "scsi-lowlevel.h" +#include "iscsi-test.h" + +int T0190_writesame16_unmap(const char *initiator, const char *url) +{ + struct iscsi_context *iscsi; + struct scsi_task *task; + struct scsi_readcapacity16 *rc16; + int ret, i, lun; + uint32_t block_size, num_blocks; + int lbppb; + + iscsi = iscsi_context_login(initiator, url, &lun); + if (iscsi == NULL) { + printf("Failed to login to target\n"); + return -1; + } + + /* find the size of the LUN */ + task = iscsi_readcapacity16_sync(iscsi, lun); + if (task == NULL) { + printf("Failed to send readcapacity16 command: %s\n", iscsi_get_error(iscsi)); + ret = -1; + goto finished; + } + if (task->status != SCSI_STATUS_GOOD) { + printf("Readcapacity command: failed with sense. %s\n", iscsi_get_error(iscsi)); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + rc16 = scsi_datain_unmarshall(task); + if (rc16 == NULL) { + printf("failed to unmarshall readcapacity16 data. %s\n", iscsi_get_error(iscsi)); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + + if (rc16->lbpme == 0){ + printf("Logical unit is fully provisioned. Skipping test\n"); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + + block_size = rc16->block_length; + num_blocks = rc16->returned_lba; + lbppb = 1 << rc16->lbppbe; + + scsi_free_scsi_task(task); + + + if (!data_loss) { + printf("--dataloss flag is not set. Skipping test\n"); + ret = -1; + goto finished; + } + + ret = 0; + + /* unmap the first 1 - 256 blocks at the start of the LUN */ + printf("Unmapping first 1-256 blocks ... "); + for (i=1; i<=256; i++) { + /* only try unmapping whole physical blocks */ + if (i % lbppb) { + continue; + } + task = iscsi_writesame16_sync(iscsi, lun, NULL, 0, + 0, i, + 0, 1, 0, 0, 0, 0); + if (task == NULL) { + printf("[FAILED]\n"); + printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi)); + ret = -1; + goto finished; + } + if (task->status != SCSI_STATUS_GOOD) { + printf("[FAILED]\n"); + printf("WRITESAME16 command: failed with sense. %s\n", iscsi_get_error(iscsi)); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + scsi_free_scsi_task(task); + } + printf("[OK]\n"); + + + /* unmap the last 1 - 256 blocks at the end of the LUN */ + printf("Unmapping last 1-256 blocks ... "); + for (i=1; i<=256; i++) { + /* only try unmapping whole physical blocks */ + if (i % lbppb) { + continue; + } + task = iscsi_writesame16_sync(iscsi, lun, NULL, 0, + num_blocks + 1 - i, i, + 0, 1, 0, 0, 0, 0); + if (task == NULL) { + printf("[FAILED]\n"); + printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi)); + ret = -1; + goto finished; + } + if (task->status != SCSI_STATUS_GOOD) { + printf("[FAILED]\n"); + printf("WRITESAME16 command: failed with sense. %s\n", iscsi_get_error(iscsi)); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + scsi_free_scsi_task(task); + } + printf("[OK]\n"); + + +finished: + iscsi_logout_sync(iscsi); + iscsi_destroy_context(iscsi); + return ret; +} diff --git a/test-tool/0191_writesame16_unmap_unaligned.c b/test-tool/0191_writesame16_unmap_unaligned.c new file mode 100644 index 0000000..5e84b86 --- /dev/null +++ b/test-tool/0191_writesame16_unmap_unaligned.c @@ -0,0 +1,113 @@ +/* + Copyright (C) 2012 by Ronnie Sahlberg + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . +*/ + +#include +#include "iscsi.h" +#include "scsi-lowlevel.h" +#include "iscsi-test.h" + +int T0191_writesame16_unmap_unaligned(const char *initiator, const char *url) +{ + struct iscsi_context *iscsi; + struct scsi_task *task; + struct scsi_readcapacity16 *rc16; + int ret, i, lun; + uint32_t block_size, num_blocks; + int lbppb; + + iscsi = iscsi_context_login(initiator, url, &lun); + if (iscsi == NULL) { + printf("Failed to login to target\n"); + return -1; + } + + /* find the size of the LUN */ + task = iscsi_readcapacity16_sync(iscsi, lun); + if (task == NULL) { + printf("Failed to send readcapacity16 command: %s\n", iscsi_get_error(iscsi)); + ret = -1; + goto finished; + } + if (task->status != SCSI_STATUS_GOOD) { + printf("Readcapacity command: failed with sense. %s\n", iscsi_get_error(iscsi)); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + rc16 = scsi_datain_unmarshall(task); + if (rc16 == NULL) { + printf("failed to unmarshall readcapacity16 data. %s\n", iscsi_get_error(iscsi)); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + + if (rc16->lbpme == 0){ + printf("Logical unit is fully provisioned. Skipping test\n"); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + + block_size = rc16->block_length; + num_blocks = rc16->returned_lba; + lbppb = 1 << rc16->lbppbe; + + scsi_free_scsi_task(task); + + if (lbppb < 2) { + printf("LBPPB==%d Can not unmap fractional physical block\n", lbppb); + ret = -1; + goto finished; + } + + if (!data_loss) { + printf("--dataloss flag is not set. Skipping test\n"); + ret = -1; + goto finished; + } + + ret = 0; + + /* unmap the first 1 - lbppb blocks at the start of the LUN */ + printf("Unmapping first 1 - (LBPPB-1) blocks ... "); + for (i=1; i < lbppb; i++) { + task = iscsi_writesame16_sync(iscsi, lun, NULL, 0, + 0, i, + 0, 1, 0, 0, 0, 0); + if (task == NULL) { + printf("[FAILED]\n"); + printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi)); + ret = -1; + goto finished; + } + if (task->status == SCSI_STATUS_GOOD) { + printf("[FAILED]\n"); + printf("WRITESAME16 command to unmap a fractional physical block should fail\n"); + ret = -1; + scsi_free_scsi_task(task); + goto finished; + } + scsi_free_scsi_task(task); + } + printf("[OK]\n"); + +finished: + iscsi_logout_sync(iscsi); + iscsi_destroy_context(iscsi); + return ret; +} diff --git a/test-tool/iscsi-test.c b/test-tool/iscsi-test.c index 992b42c..9aad4b0 100644 --- a/test-tool/iscsi-test.c +++ b/test-tool/iscsi-test.c @@ -76,6 +76,10 @@ struct scsi_test tests[] = { { "T0180_writesame10_unmap", T0180_writesame10_unmap }, { "T0181_writesame10_unmap_unaligned", T0181_writesame10_unmap_unaligned }, +/* writesame16*/ +{ "T0190_writesame16_unmap", T0190_writesame16_unmap }, +{ "T0191_writesame16_unmap_unaligned", T0191_writesame16_unmap_unaligned }, + { NULL, NULL } }; diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h index 7a2bcb4..eb97bf7 100644 --- a/test-tool/iscsi-test.h +++ b/test-tool/iscsi-test.h @@ -50,3 +50,6 @@ int T0171_unmap_zero(const char *initiator, const char *url); int T0180_writesame10_unmap(const char *initiator, const char *url); int T0181_writesame10_unmap_unaligned(const char *initiator, const char *url); + +int T0190_writesame16_unmap(const char *initiator, const char *url); +int T0191_writesame16_unmap_unaligned(const char *initiator, const char *url);