From 2e3126b9acd6602cbd423c12102e85594e4a48b3 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Wed, 2 May 2012 20:14:51 +1000 Subject: [PATCH] TESTS: add tests for READ12/16 RDPROTECT for luns without protection information --- Makefile.am | 4 +- include/iscsi.h | 2 +- test-tool/0201_read16_rdprotect.c | 94 +++++++++++++++++++++++++++++++ test-tool/0211_read12_rdprotect.c | 94 +++++++++++++++++++++++++++++++ test-tool/iscsi-test.c | 2 + test-tool/iscsi-test.h | 2 + 6 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 test-tool/0201_read16_rdprotect.c create mode 100644 test-tool/0211_read12_rdprotect.c diff --git a/Makefile.am b/Makefile.am index ed5e01d..22c9847 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,8 +67,8 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.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/0190_writesame16_unmap.c test-tool/0191_writesame16_unmap_unaligned.c \ - test-tool/0200_read16_simple.c \ - test-tool/0210_read12_simple.c + test-tool/0200_read16_simple.c test-tool/0201_read16_rdprotect.c \ + test-tool/0210_read12_simple.c test-tool/0211_read12_rdprotect.c endif # LD_PRELOAD library. diff --git a/include/iscsi.h b/include/iscsi.h index 13c7ee4..927c9e3 100644 --- a/include/iscsi.h +++ b/include/iscsi.h @@ -702,7 +702,7 @@ iscsi_write12_sync(struct iscsi_context *iscsi, int lun, uint32_t lba, EXTERN struct scsi_task * iscsi_read16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, -int rdprotect, int dpo, int fua, int fua_nv, int group_number); + int rdprotect, int dpo, int fua, int fua_nv, int group_number); EXTERN struct scsi_task * iscsi_write16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba, diff --git a/test-tool/0201_read16_rdprotect.c b/test-tool/0201_read16_rdprotect.c new file mode 100644 index 0000000..db88941 --- /dev/null +++ b/test-tool/0201_read16_rdprotect.c @@ -0,0 +1,94 @@ +/* + 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 T0201_read16_rdprotect(const char *initiator, const char *url) +{ + struct iscsi_context *iscsi; + struct scsi_task *task; + struct scsi_readcapacity16 *rc16; + int ret = 0, i, lun; + uint32_t block_size, num_blocks; + + 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("READCAPACITY16 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; + } + + block_size = rc16->block_length; + + if(rc16->prot_en != 0) { + printf("device is formatted with protection information, skipping test\n"); + scsi_free_scsi_task(task); + goto finished; + } + scsi_free_scsi_task(task); + + + printf("Read16 with RDPROTECT "); + for (i = 1; i <= 7; i++) { + task = iscsi_read16_sync(iscsi, lun, 0, block_size, block_size, i, 0, 0, 0, 0); + if (task == NULL) { + printf("[FAILED]\n"); + printf("Failed to send read16 command: %s\n", iscsi_get_error(iscsi)); + ret = -1; + goto finished; + } + if (task->status != SCSI_STATUS_CHECK_CONDITION + || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST + || task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB) { + printf("[FAILED]\n"); + printf("Read16 with RDPROTECT!=0 should have failed with CHECK_CONDITION/ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB\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/0211_read12_rdprotect.c b/test-tool/0211_read12_rdprotect.c new file mode 100644 index 0000000..18a732c --- /dev/null +++ b/test-tool/0211_read12_rdprotect.c @@ -0,0 +1,94 @@ +/* + 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 T0211_read12_rdprotect(const char *initiator, const char *url) +{ + struct iscsi_context *iscsi; + struct scsi_task *task; + struct scsi_readcapacity16 *rc16; + int ret = 0, i, lun; + uint32_t block_size, num_blocks; + + 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("READCAPACITY16 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; + } + + block_size = rc16->block_length; + + if(rc16->prot_en != 0) { + printf("device is formatted with protection information, skipping test\n"); + scsi_free_scsi_task(task); + goto finished; + } + scsi_free_scsi_task(task); + + + printf("Read12 with RDPROTECT "); + for (i = 1; i <= 7; i++) { + task = iscsi_read12_sync(iscsi, lun, 0, block_size, block_size, i, 0, 0, 0, 0); + if (task == NULL) { + printf("[FAILED]\n"); + printf("Failed to send read12 command: %s\n", iscsi_get_error(iscsi)); + ret = -1; + goto finished; + } + if (task->status != SCSI_STATUS_CHECK_CONDITION + || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST + || task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB) { + printf("[FAILED]\n"); + printf("Read12 with RDPROTECT!=0 should have failed with CHECK_CONDITION/ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB\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 a466085..922eadf 100644 --- a/test-tool/iscsi-test.c +++ b/test-tool/iscsi-test.c @@ -82,9 +82,11 @@ struct scsi_test tests[] = { /* read16*/ { "T0200_read16_simple", T0200_read16_simple }, +{ "T0201_read16_rdprotect", T0201_read16_rdprotect }, /* read12*/ { "T0210_read12_simple", T0210_read12_simple }, +{ "T0211_read12_rdprotect", T0211_read12_rdprotect }, { NULL, NULL } }; diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h index 169fff1..f918003 100644 --- a/test-tool/iscsi-test.h +++ b/test-tool/iscsi-test.h @@ -55,5 +55,7 @@ int T0190_writesame16_unmap(const char *initiator, const char *url); int T0191_writesame16_unmap_unaligned(const char *initiator, const char *url); int T0200_read16_simple(const char *initiator, const char *url); +int T0201_read16_rdprotect(const char *initiator, const char *url); int T0210_read12_simple(const char *initiator, const char *url); +int T0211_read12_rdprotect(const char *initiator, const char *url);