diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index 7f483bc..232d8e3 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -1917,241 +1917,49 @@ int get_lba_status_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, } int -prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, int immed, int group) +prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; + int ret; - logging(LOG_VERBOSE, "Send PREFETCH10 LBA:%d blocks:%d" - " immed:%d group:%d", - lba, num, immed, group); - - task = iscsi_prefetch10_sync(iscsi, lun, lba, num, immed, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send PREFETCH10 command: %s", - iscsi_get_error(iscsi)); - return -1; - } - if (task->status == SCSI_STATUS_CHECK_CONDITION - && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST - && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented on target"); - scsi_free_scsi_task(task); - return -2; - } - if (task->status != SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] PREFETCH10 command: " - "failed with sense. %s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] PREFETCH10 returned SUCCESS."); - return 0; -} - -int -prefetch10_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba, - int num, int immed, int group) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send PREFETCH10 (Expecting LBA_OUT_OF_RANGE) " - "LBA:%d blocks:%d immed:%d group:%d", + logging(LOG_VERBOSE, "Send PREFETCH10 (Expecting %s) LBA:%d blocks:%d" + " immed:%d group:%d", + scsi_status_str(status), lba, num, immed, group); - task = iscsi_prefetch10_sync(iscsi, lun, lba, num, immed, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send PREFETCH10 command: %s", - iscsi_get_error(iscsi)); - return -1; - } - if (task->status == SCSI_STATUS_CHECK_CONDITION - && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST - && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented on target"); - scsi_free_scsi_task(task); - return -2; - } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] PREFETCH10 returned SUCCESS. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE."); - 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_LBA_OUT_OF_RANGE) { - logging(LOG_NORMAL, "[FAILED] PREFETCH10 failed with the wrong sense code. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE but failed with sense:%s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } + task = scsi_cdb_prefetch10(lba, num, immed, group); + assert(task != NULL); - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] PREFETCH10 returned ILLEGAL_REQUEST/LBA_OUT_OF_RANGE."); - return 0; + task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + + ret = check_result("PREFETCH10", iscsi, task, status, key, ascq, num_ascq); + if (task) { + scsi_free_scsi_task(task); + } + return ret; } int -prefetch10_nomedium(struct iscsi_context *iscsi, int lun, uint32_t lba, - int num, int immed, int group) +prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; + int ret; - logging(LOG_VERBOSE, "Send PREFETCH10 (Expecting MEDIUM_NOT_PRESENT) " - "LBA:%d blocks:%d immed:%d group:%d", + logging(LOG_VERBOSE, "Send PREFETCH16 (Expecting %s) LBA:%" PRIu64 + " blocks:%d immed:%d group:%d", + scsi_status_str(status), lba, num, immed, group); - task = iscsi_prefetch10_sync(iscsi, lun, lba, num, immed, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send PREFETCH10 command: %s", - iscsi_get_error(iscsi)); - return -1; - return -1; - } - if (task->status == SCSI_STATUS_CHECK_CONDITION - && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST - && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented on target"); + task = scsi_cdb_prefetch16(lba, num, immed, group); + assert(task != NULL); + + task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + + ret = check_result("PREFETCH16", iscsi, task, status, key, ascq, num_ascq); + if (task) { scsi_free_scsi_task(task); - return -2; } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] PREFETCH10 returned SUCCESS. Should have failed with NOT_READY/MEDIUM_NOT_PRESENT."); - scsi_free_scsi_task(task); - return -1; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_NOT_READY - || (task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT - && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN - && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED)) { - logging(LOG_NORMAL, "[FAILED] PREFETCH10 failed with the wrong sense code. Should have failed with NOT_READY/MEDIUM_NOT_PRESENT but failed with sense:%s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] PREFETCH10 returned MEDIUM_NOT_PRESENT."); - return 0; -} - -int -prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num, int immed, int group) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send PREFETCH16 LBA:%" PRIu64 " blocks:%d" - " immed:%d group:%d", - lba, num, immed, group); - - task = iscsi_prefetch16_sync(iscsi, lun, lba, num, immed, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send PREFETCH16 command: %s", - iscsi_get_error(iscsi)); - return -1; - } - if (task->status == SCSI_STATUS_CHECK_CONDITION - && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST - && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented on target"); - scsi_free_scsi_task(task); - return -2; - } - if (task->status != SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] PREFETCH16 command: " - "failed with sense. %s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] PREFETCH16 returned SUCCESS."); - return 0; -} - -int -prefetch16_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba, - int num, int immed, int group) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send PREFETCH16 (Expecting LBA_OUT_OF_RANGE) " - "LBA:%" PRIu64 " blocks:%d immed:%d group:%d", - lba, num, immed, group); - - task = iscsi_prefetch16_sync(iscsi, lun, lba, num, immed, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send PREFETCH16 command: %s", - iscsi_get_error(iscsi)); - return -1; - } - if (task->status == SCSI_STATUS_CHECK_CONDITION - && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST - && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented on target"); - scsi_free_scsi_task(task); - return -2; - } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] PREFETCH16 returned SUCCESS. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE."); - 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_LBA_OUT_OF_RANGE) { - logging(LOG_NORMAL, "[FAILED] PREFETCH16 failed with the wrong sense code. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE but failed with sense:%s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] PREFETCH16 returned ILLEGAL_REQUEST/LBA_OUT_OF_RANGE."); - return 0; -} - -int -prefetch16_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, - int num, int immed, int group) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send PREFETCH16 (Expecting MEDIUM_NOT_PRESENT) " - "LBA:%" PRIu64 " blocks:%d immed:%d group:%d", - lba, num, immed, group); - - task = iscsi_prefetch16_sync(iscsi, lun, lba, num, immed, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send PREFETCH16 command: %s", - iscsi_get_error(iscsi)); - return -1; - return -1; - } - if (task->status == SCSI_STATUS_CHECK_CONDITION - && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST - && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented on target"); - scsi_free_scsi_task(task); - return -2; - } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] PREFETCH16 returned SUCCESS. Should have failed with NOT_READY/MEDIUM_NOT_PRESENT."); - scsi_free_scsi_task(task); - return -1; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_NOT_READY - || (task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT - && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN - && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED)) { - logging(LOG_NORMAL, "[FAILED] PREFETCH16 failed with the wrong sense code. Should have failed with NOT_READY/MEDIUM_NOT_PRESENT but failed with sense:%s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] PREFETCH16 returned MEDIUM_NOT_PRESENT."); - return 0; + return ret; } int diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index 9d5bf42..4603ea4 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -256,12 +256,8 @@ int get_lba_status(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t 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); int orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group); -int prefetch10_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group); -int prefetch10_nomedium(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group); -int prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num_blocks, int immed, int group); -int prefetch16_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba, int num_blocks, int immed, int group); -int prefetch16_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, int num_blocks, int immed, int group); +int prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num_blocks, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq); int preventallow(struct iscsi_context *iscsi, int lun, int prevent); int read6(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, unsigned char *data); int read6_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, unsigned char *data); diff --git a/test-tool/test_nomedia_sbc.c b/test-tool/test_nomedia_sbc.c index b1a4429..c2995f0 100644 --- a/test-tool/test_nomedia_sbc.c +++ b/test-tool/test_nomedia_sbc.c @@ -110,7 +110,8 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test PREFETCH10 when medium is ejected."); - ret = prefetch10_nomedium(iscsic, tgt_lun, 0, 1, 1, 0); + ret = prefetch10(iscsic, tgt_lun, 0, 1, 1, 0, EXPECT_NO_MEDIUM); + if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " "PREFETCH10"); @@ -119,7 +120,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test PREFETCH16 when medium is ejected."); - ret = prefetch16_nomedium(iscsic, tgt_lun, 0, 1, 1, 0); + ret = prefetch16(iscsic, tgt_lun, 0, 1, 1, 0, EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " "PREFETCH16"); diff --git a/test-tool/test_prefetch10_0blocks.c b/test-tool/test_prefetch10_0blocks.c index 43c076a..f16a27b 100644 --- a/test-tool/test_prefetch10_0blocks.c +++ b/test-tool/test_prefetch10_0blocks.c @@ -30,8 +30,8 @@ test_prefetch10_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks at LBA==0"); - ret = prefetch10(iscsic, tgt_lun, 0, - 0, 0, 0); + ret = prefetch10(iscsic, tgt_lun, 0, 0, 0, 0, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); CU_PASS("PREFETCH10 is not implemented."); @@ -45,19 +45,19 @@ test_prefetch10_0blocks(void) } logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks one block past end-of-LUN"); - ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1, - 0, 0, 0); + ret = prefetch10(iscsic, tgt_lun, num_blocks + 1, 0, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks at LBA==2^31"); - ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, 0x80000000, - 0, 0, 0); + ret = prefetch10(iscsic, tgt_lun, 0x80000000, 0, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks at LBA==-1"); - ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, -1, - 0, 0, 0); + ret = prefetch10(iscsic, tgt_lun, -1, 0, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch10_beyond_eol.c b/test-tool/test_prefetch10_beyond_eol.c index 6c90c09..e3d6a0b 100644 --- a/test-tool/test_prefetch10_beyond_eol.c +++ b/test-tool/test_prefetch10_beyond_eol.c @@ -37,8 +37,8 @@ test_prefetch10_beyond_eol(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { - ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, - i, 0, 0); + ret = prefetch10(iscsic, tgt_lun, num_blocks + 1 - i, i, 0, 0, + EXPECT_LBA_OOB); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); CU_PASS("PREFETCH10 is not implemented."); @@ -50,24 +50,24 @@ test_prefetch10_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH10 1-256 blocks at LBA==2^31"); for (i = 1; i <= 256; i++) { - ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, 0x80000000, - i, 0, 0); + ret = prefetch10(iscsic, tgt_lun, 0x80000000, i, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "Test PREFETCH10 1-256 blocks at LBA==-1"); for (i = 1; i <= 256; i++) { - ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, -1, - i, 0, 0); + ret = prefetch10(iscsic, tgt_lun, -1, i, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "Test PREFETCH10 2-256 blocks all but one block beyond the end"); for (i = 2; i <= 256; i++) { - ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1, - i, 0, 0); + ret = prefetch10(iscsic, tgt_lun, num_blocks - 1, i, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } } diff --git a/test-tool/test_prefetch10_flags.c b/test-tool/test_prefetch10_flags.c index 93396f2..7071b26 100644 --- a/test-tool/test_prefetch10_flags.c +++ b/test-tool/test_prefetch10_flags.c @@ -34,8 +34,8 @@ test_prefetch10_flags(void) logging(LOG_VERBOSE, "Test PREFETCH10 flags"); logging(LOG_VERBOSE, "Test PREFETCH10 with IMMED==1"); - ret = prefetch10(iscsic, tgt_lun, 0, - 1, 1, 0); + ret = prefetch10(iscsic, tgt_lun, 0, 1, 1, 0, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); CU_PASS("PREFETCH10 is not implemented."); @@ -44,12 +44,12 @@ test_prefetch10_flags(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 with GROUP==3"); - ret = prefetch10(iscsic, tgt_lun, 0, - 1, 0, 3); + ret = prefetch10(iscsic, tgt_lun, 0, 1, 0, 3, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 with IMMED=1 and GROUP==3"); - ret = prefetch10(iscsic, tgt_lun, 0, - 1, 1, 3); + ret = prefetch10(iscsic, tgt_lun, 0, 1, 1, 3, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch10_simple.c b/test-tool/test_prefetch10_simple.c index 90dc6c0..eb5020b 100644 --- a/test-tool/test_prefetch10_simple.c +++ b/test-tool/test_prefetch10_simple.c @@ -33,7 +33,8 @@ test_prefetch10_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch10(iscsic, tgt_lun, 0, i, 0, 0); + ret = prefetch10(iscsic, tgt_lun, 0, i, 0, 0, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); CU_PASS("PREFETCH10 is not implemented."); @@ -45,7 +46,8 @@ test_prefetch10_simple(void) logging(LOG_VERBOSE, "Test PREFETCH10 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch10(iscsic, tgt_lun, num_blocks - i, i, 0, 0); + ret = prefetch10(iscsic, tgt_lun, num_blocks - i, i, 0, 0, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } } diff --git a/test-tool/test_prefetch16_0blocks.c b/test-tool/test_prefetch16_0blocks.c index 905cd78..d175a88 100644 --- a/test-tool/test_prefetch16_0blocks.c +++ b/test-tool/test_prefetch16_0blocks.c @@ -30,8 +30,8 @@ test_prefetch16_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==0"); - ret = prefetch16(iscsic, tgt_lun, 0, - 0, 0, 0); + ret = prefetch16(iscsic, tgt_lun, 0, 0, 0, 0, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); CU_PASS("PREFETCH16 is not implemented."); @@ -40,19 +40,19 @@ test_prefetch16_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks one block past end-of-LUN"); - ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1, - 0, 0, 0); + ret = prefetch16(iscsic, tgt_lun, num_blocks + 1, 0, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==2^63"); - ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL, - 0, 0, 0); + ret = prefetch16(iscsic, tgt_lun, 0x8000000000000000ULL, 0, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==-1"); - ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, -1, - 0, 0, 0); + ret = prefetch16(iscsic, tgt_lun, -1, 0, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch16_beyond_eol.c b/test-tool/test_prefetch16_beyond_eol.c index 43b5751..7adcd6f 100644 --- a/test-tool/test_prefetch16_beyond_eol.c +++ b/test-tool/test_prefetch16_beyond_eol.c @@ -32,8 +32,8 @@ test_prefetch16_beyond_eol(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { - ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, - i, 0, 0); + ret = prefetch16(iscsic, tgt_lun, num_blocks + 1 - i, i, 0, 0, + EXPECT_LBA_OOB); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); CU_PASS("PREFETCH16 is not implemented."); @@ -45,24 +45,25 @@ test_prefetch16_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks at LBA==2^63"); for (i = 1; i <= 256; i++) { - ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL, - i, 0, 0); + ret = prefetch16(iscsic, tgt_lun, 0x8000000000000000ULL, + i, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks at LBA==-1"); for (i = 1; i <= 256; i++) { - ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, -1, - i, 0, 0); + ret = prefetch16(iscsic, tgt_lun, -1, i, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "Test PREFETCH16 2-256 blocks all but one block beyond the end"); for (i = 2; i <= 256; i++) { - ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1, - i, 0, 0); + ret = prefetch16(iscsic, tgt_lun, num_blocks - 1, i, 0, 0, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } } diff --git a/test-tool/test_prefetch16_flags.c b/test-tool/test_prefetch16_flags.c index 7240bde..d8db486 100644 --- a/test-tool/test_prefetch16_flags.c +++ b/test-tool/test_prefetch16_flags.c @@ -34,8 +34,8 @@ test_prefetch16_flags(void) logging(LOG_VERBOSE, "Test PREFETCH16 flags"); logging(LOG_VERBOSE, "Test PREFETCH16 with IMMED==1"); - ret = prefetch16(iscsic, tgt_lun, 0, - 1, 1, 0); + ret = prefetch16(iscsic, tgt_lun, 0, 1, 1, 0, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); CU_PASS("PREFETCH16 is not implemented."); @@ -44,12 +44,12 @@ test_prefetch16_flags(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 with GROUP==3"); - ret = prefetch16(iscsic, tgt_lun, 0, - 1, 0, 3); + ret = prefetch16(iscsic, tgt_lun, 0, 1, 0, 3, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 with IMMED=1 and GROUP==3"); - ret = prefetch16(iscsic, tgt_lun, 0, - 1, 1, 3); + ret = prefetch16(iscsic, tgt_lun, 0, 1, 1, 3, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch16_simple.c b/test-tool/test_prefetch16_simple.c index dab69de..f31ab35 100644 --- a/test-tool/test_prefetch16_simple.c +++ b/test-tool/test_prefetch16_simple.c @@ -33,7 +33,8 @@ test_prefetch16_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch16(iscsic, tgt_lun, 0, i, 0, 0); + ret = prefetch16(iscsic, tgt_lun, 0, i, 0, 0, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); CU_PASS("PREFETCH16 is not implemented."); @@ -45,7 +46,8 @@ test_prefetch16_simple(void) logging(LOG_VERBOSE, "Test PREFETCH16 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch16(iscsic, tgt_lun, num_blocks - i, i, 0, 0); + ret = prefetch16(iscsic, tgt_lun, num_blocks - i, i, 0, 0, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } }