From aefa88b7249a54b41f5e978e062065e4bfb70113 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sun, 27 Jan 2013 10:32:00 -0800 Subject: [PATCH] TESTS: Add tests that WRITESAME10/16 UNMAP will unmap until end of the device when number-of-blocks is set to 0 --- Makefile.am | 4 +- test-tool/iscsi-test-cu.c | 2 + test-tool/iscsi-test-cu.h | 2 + test-tool/test_writesame10_unmap.c | 1 - test-tool/test_writesame10_unmap_until_end.c | 68 ++++++++++++++++++++ test-tool/test_writesame16_unmap_until_end.c | 68 ++++++++++++++++++++ 6 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 test-tool/test_writesame10_unmap_until_end.c create mode 100644 test-tool/test_writesame16_unmap_until_end.c diff --git a/Makefile.am b/Makefile.am index d19d5c7..5913800 100644 --- a/Makefile.am +++ b/Makefile.am @@ -251,12 +251,14 @@ bin_iscsi_test_cu_SOURCES = test-tool/iscsi-test-cu.c \ test-tool/test_writesame10_wrprotect.c \ test-tool/test_writesame10_unmap.c \ test-tool/test_writesame10_unmap_unaligned.c \ + test-tool/test_writesame10_unmap_until_end.c \ test-tool/test_writesame16_simple.c \ test-tool/test_writesame16_beyond_eol.c \ test-tool/test_writesame16_0blocks.c \ test-tool/test_writesame16_wrprotect.c \ test-tool/test_writesame16_unmap.c \ - test-tool/test_writesame16_unmap_unaligned.c + test-tool/test_writesame16_unmap_unaligned.c \ + test-tool/test_writesame16_unmap_until_end.c endif diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c index 3292790..b8ea98b 100644 --- a/test-tool/iscsi-test-cu.c +++ b/test-tool/iscsi-test-cu.c @@ -197,6 +197,7 @@ static CU_TestInfo tests_writesame10[] = { { (char *)"testWriteSame10WriteProtect", test_writesame10_wrprotect }, { (char *)"testWriteSame10Unmap", test_writesame10_unmap }, { (char *)"testWriteSame10UnmapUnaligned", test_writesame10_unmap_unaligned }, + { (char *)"testWriteSame10UnmapUntilEnd", test_writesame10_unmap_until_end }, CU_TEST_INFO_NULL }; @@ -207,6 +208,7 @@ static CU_TestInfo tests_writesame16[] = { { (char *)"testWriteSame16WriteProtect", test_writesame16_wrprotect }, { (char *)"testWriteSame16Unmap", test_writesame16_unmap }, { (char *)"testWriteSame16UnmapUnaligned", test_writesame16_unmap_unaligned }, + { (char *)"testWriteSame16UnmapUntilEnd", test_writesame16_unmap_until_end }, CU_TEST_INFO_NULL }; diff --git a/test-tool/iscsi-test-cu.h b/test-tool/iscsi-test-cu.h index d373f0f..425d985 100644 --- a/test-tool/iscsi-test-cu.h +++ b/test-tool/iscsi-test-cu.h @@ -128,6 +128,7 @@ void test_writesame10_0blocks(void); void test_writesame10_wrprotect(void); void test_writesame10_unmap(void); void test_writesame10_unmap_unaligned(void); +void test_writesame10_unmap_until_end(void); void test_writesame16_simple(void); void test_writesame16_beyond_eol(void); @@ -135,5 +136,6 @@ void test_writesame16_0blocks(void); void test_writesame16_wrprotect(void); void test_writesame16_unmap(void); void test_writesame16_unmap_unaligned(void); +void test_writesame16_unmap_until_end(void); #endif /* _ISCSI_TEST_CU_H_ */ diff --git a/test-tool/test_writesame10_unmap.c b/test-tool/test_writesame10_unmap.c index 730148c..c192afb 100644 --- a/test-tool/test_writesame10_unmap.c +++ b/test-tool/test_writesame10_unmap.c @@ -1,4 +1,3 @@ - /* Copyright (C) 2013 Ronnie Sahlberg diff --git a/test-tool/test_writesame10_unmap_until_end.c b/test-tool/test_writesame10_unmap_until_end.c new file mode 100644 index 0000000..52bc1d4 --- /dev/null +++ b/test-tool/test_writesame10_unmap_until_end.c @@ -0,0 +1,68 @@ +/* + Copyright (C) 2013 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 + +#include "iscsi.h" +#include "scsi-lowlevel.h" +#include "iscsi-support.h" +#include "iscsi-test-cu.h" + + +void +test_writesame10_unmap_until_end(void) +{ + int i, ret; + unsigned int j; + + CHECK_FOR_DATALOSS; + CHECK_FOR_THIN_PROVISIONING; + CHECK_FOR_LBPWS10; + CHECK_FOR_SBC; + + logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, "Test WRITESAME10 of 1-256 blocks at the end of the LUN by setting number-of-blocks==0"); + for (i = 1; i <= 256; i++) { + unsigned char *buf = malloc(block_size * i); + + logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); + memset(buf, 0xff, block_size * i); + ret = write10(iscsic, tgt_lun, num_blocks - i, + i * block_size, block_size, + 0, 0, 0, 0, 0, buf); + CU_ASSERT_EQUAL(ret, 0); + + logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); + ret = writesame10(iscsic, tgt_lun, num_blocks - i, + 0, i, + 0, 1, 0, 0, NULL); + CU_ASSERT_EQUAL(ret, 0); + + logging(LOG_VERBOSE, "Read %d blocks and verify they are now zero", i); + ret = read10(iscsic, tgt_lun, num_blocks - i, + i * block_size, block_size, + 0, 0, 0, 0, 0, buf); + for (j = 0; j < block_size * i; j++) { + if (buf[j] != 0) { + CU_ASSERT_EQUAL(buf[j], 0); + } + } + free(buf); + } +} diff --git a/test-tool/test_writesame16_unmap_until_end.c b/test-tool/test_writesame16_unmap_until_end.c new file mode 100644 index 0000000..02610a9 --- /dev/null +++ b/test-tool/test_writesame16_unmap_until_end.c @@ -0,0 +1,68 @@ +/* + Copyright (C) 2013 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 + +#include "iscsi.h" +#include "scsi-lowlevel.h" +#include "iscsi-support.h" +#include "iscsi-test-cu.h" + + +void +test_writesame16_unmap_until_end(void) +{ + int i, ret; + unsigned int j; + + CHECK_FOR_DATALOSS; + CHECK_FOR_THIN_PROVISIONING; + CHECK_FOR_LBPWS; + CHECK_FOR_SBC; + + logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, "Test WRITESAME16 of 1-256 blocks at the end of the LUN by setting number-of-blocks==0"); + for (i = 1; i <= 256; i++) { + unsigned char *buf = malloc(block_size * i); + + logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); + memset(buf, 0xff, block_size * i); + ret = write16(iscsic, tgt_lun, num_blocks - i, + i * block_size, block_size, + 0, 0, 0, 0, 0, buf); + CU_ASSERT_EQUAL(ret, 0); + + logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); + ret = writesame16(iscsic, tgt_lun, num_blocks - i, + 0, i, + 0, 1, 0, 0, NULL); + CU_ASSERT_EQUAL(ret, 0); + + logging(LOG_VERBOSE, "Read %d blocks and verify they are now zero", i); + ret = read16(iscsic, tgt_lun, num_blocks - i, + i * block_size, block_size, + 0, 0, 0, 0, 0, buf); + for (j = 0; j < block_size * i; j++) { + if (buf[j] != 0) { + CU_ASSERT_EQUAL(buf[j], 0); + } + } + free(buf); + } +}