From e84b71af15b155fb45d5a77a55f96e23af71f840 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Tue, 12 Mar 2013 18:29:24 -0700 Subject: [PATCH] TEST: Add test for EVPD bit for INQUIRY commands --- Makefile.am | 1 + test-tool/iscsi-support.c | 36 +++++++++++++++++++++++++++++++++ test-tool/iscsi-support.h | 1 + test-tool/iscsi-test-cu.c | 1 + test-tool/iscsi-test-cu.h | 1 + test-tool/test_inquiry_evpd.c | 38 +++++++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+) create mode 100644 test-tool/test_inquiry_evpd.c diff --git a/Makefile.am b/Makefile.am index d932a2f..9839d89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -190,6 +190,7 @@ bin_iscsi_test_cu_SOURCES = test-tool/iscsi-test-cu.c \ test-tool/test_get_lba_status_beyond_eol.c \ test-tool/test_inquiry_standard.c \ test-tool/test_inquiry_alloc_length.c \ + test-tool/test_inquiry_evpd.c \ test-tool/test_nomedia_sbc.c \ test-tool/test_orwrite_simple.c \ test-tool/test_orwrite_beyond_eol.c \ diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index bf17862..363a869 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -5134,3 +5134,39 @@ inquiry(struct iscsi_context *iscsi, int lun, int evpd, int page_code, int maxsi return 0; } +int +inquiry_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int evpd, int page_code, int maxsize) +{ + struct scsi_task *task; + + logging(LOG_VERBOSE, "Send INQUIRY (Expecting INVALID_FIELD_IN_CDB) evpd:%d page_code:%d alloc_len:%d", + evpd, page_code, maxsize); + task = iscsi_inquiry_sync(iscsi, lun, evpd, page_code, maxsize); + if (task == NULL) { + logging(LOG_NORMAL, "[FAILED] Failed to send INQUIRY command: " + "%s", iscsi_get_error(iscsi)); + return -1; + } + if (task->status == SCSI_STATUS_GOOD) { + logging(LOG_NORMAL, "[FAILED] INQUIRY successful but should " + "have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB"); + scsi_free_scsi_task(task); + return -1; + } + + if (task->status != SCSI_STATUS_CHECK_CONDITION + || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST + || task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB) { + logging(LOG_NORMAL, "[FAILED] INQUIRY failed with wrong sense. " + "Should have failed with ILLEGAL_REQUEST/" + "INVALID_FIELD_IN_CDB. Sense:%s\n", + iscsi_get_error(iscsi)); + scsi_free_scsi_task(task); + return -1; + } + + scsi_free_scsi_task(task); + logging(LOG_VERBOSE, "[OK] INQUIRY returned ILLEGAL_REQUEST/INVALID_FIELD_IB_CDB."); + return 0; +} + diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index b75a39f..ca55b35 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -211,6 +211,7 @@ int verify_write_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) int verify_read_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf); int verify_write_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf); int inquiry(struct iscsi_context *iscsi, int lun, int evpd, int page_code, int maxsize, struct scsi_task **save_task); +int inquiry_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int evpd, int page_code, int maxsize); int get_lba_status(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len); int get_lba_status_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len); int get_lba_status_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len); diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c index cdc7f60..360c1b1 100644 --- a/test-tool/iscsi-test-cu.c +++ b/test-tool/iscsi-test-cu.c @@ -69,6 +69,7 @@ static CU_TestInfo tests_get_lba_status[] = { static CU_TestInfo tests_inquiry[] = { { (char *)"testInquiryStandard", test_inquiry_standard }, { (char *)"testInquiryAllocLength", test_inquiry_alloc_length}, + { (char *)"testInquiryEVPD", test_inquiry_evpd}, CU_TEST_INFO_NULL }; diff --git a/test-tool/iscsi-test-cu.h b/test-tool/iscsi-test-cu.h index a92343f..11a1bb8 100644 --- a/test-tool/iscsi-test-cu.h +++ b/test-tool/iscsi-test-cu.h @@ -45,6 +45,7 @@ void test_get_lba_status_beyond_eol(void); void test_inquiry_standard(void); void test_inquiry_alloc_length(void); +void test_inquiry_evpd(void); void test_nomedia_sbc(void); diff --git a/test-tool/test_inquiry_evpd.c b/test-tool/test_inquiry_evpd.c new file mode 100644 index 0000000..e791f1a --- /dev/null +++ b/test-tool/test_inquiry_evpd.c @@ -0,0 +1,38 @@ +/* + Copyright (C) 2013 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 + +#include "iscsi.h" +#include "scsi-lowlevel.h" +#include "iscsi-support.h" +#include "iscsi-test-cu.h" + +void +test_inquiry_evpd(void) +{ + int ret; + + logging(LOG_VERBOSE, LOG_BLANK_LINE); + logging(LOG_VERBOSE, "Test of the INQUIRY EVPD bit"); + + logging(LOG_VERBOSE, "Verify that INQUIRY with EVPD==0 and PC!=0 is an error"); + ret = inquiry_invalidfieldincdb(iscsic, tgt_lun, 0, 1, 256); + CU_ASSERT_EQUAL(ret, 0); +}