From 60a5856f00731be578a57bfbf68b2e9858680f07 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:33:50 +0200 Subject: [PATCH 01/12] test-tool/Compare&Write: skip InvalidDataOutSize unless iSCSI This test performs PDU manipulation so should only be run against iSCSI devices. Signed-off-by: David Disseldorp --- test-tool/test_compareandwrite_invalid_dataout_size.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test-tool/test_compareandwrite_invalid_dataout_size.c b/test-tool/test_compareandwrite_invalid_dataout_size.c index 4abd501..eb6a6dd 100644 --- a/test-tool/test_compareandwrite_invalid_dataout_size.c +++ b/test-tool/test_compareandwrite_invalid_dataout_size.c @@ -53,6 +53,13 @@ test_compareandwrite_invalid_dataout_size(void) CHECK_FOR_THIN_PROVISIONING; CHECK_FOR_LBPPB_GT_1; CHECK_FOR_SBC; + if (sd->iscsi_ctx == NULL) { + const char *err = "[SKIPPED] This test is " + "only supported for iSCSI backends"; + logging(LOG_NORMAL, "%s", err); + CU_PASS(err); + return; + } local_iscsi_queue_pdu = my_iscsi_queue_pdu; From 310e9ace02bafb78d69bfe20e5c9befe7ed24a10 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:46:28 +0200 Subject: [PATCH 02/12] test-tool/Compare&Write: override driver queue_pdu() callback In preparation for removing the test-tool iscsi_queue_pdu() dlsym overload hack, convert the Compare&Write InvalidDataOutSize test to use the regular transport driver callback for this purpose. Signed-off-by: David Disseldorp --- .../test_compareandwrite_invalid_dataout_size.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test-tool/test_compareandwrite_invalid_dataout_size.c b/test-tool/test_compareandwrite_invalid_dataout_size.c index eb6a6dd..9fcd739 100644 --- a/test-tool/test_compareandwrite_invalid_dataout_size.c +++ b/test-tool/test_compareandwrite_invalid_dataout_size.c @@ -27,11 +27,12 @@ static int new_tl; +static struct iscsi_transport iscsi_drv_orig; -static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu _U_) +static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) { if (pdu->outdata.data[0] != ISCSI_PDU_SCSI_REQUEST) { - return 0; + goto out; } switch (new_tl) { case 1: @@ -43,7 +44,8 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu pdu->outdata.data[32 + 13] = 3; break; } - return 0; +out: + return iscsi_drv_orig.queue_pdu(iscsi, pdu); } void @@ -61,8 +63,10 @@ test_compareandwrite_invalid_dataout_size(void) return; } - local_iscsi_queue_pdu = my_iscsi_queue_pdu; - + /* override transport queue_pdu callback for PDU manipulation */ + iscsi_drv_orig = *sd->iscsi_ctx->drv; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that COMPAREANDWRITE fails for invalid " "(too small/too large) DataOut sizes."); @@ -89,4 +93,6 @@ test_compareandwrite_invalid_dataout_size(void) block_size, 0, 0, 0, 0, EXPECT_STATUS_GENERIC_BAD); + /* restore transport callbacks */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; } From c067eef9c10c17b8a9be83ee4f71d4c8d0d238e4 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:46:28 +0200 Subject: [PATCH 03/12] test-tool/iSCSICmdSnTooLow: override driver queue_pdu() callback In preparation for removing the test-tool iscsi_queue_pdu() dlsym overload hack, convert this test to use the regular transport driver callback for this purpose. Signed-off-by: David Disseldorp --- test-tool/test_iscsi_cmdsn_toolow.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test-tool/test_iscsi_cmdsn_toolow.c b/test-tool/test_iscsi_cmdsn_toolow.c index 0b980b3..23b93c3 100644 --- a/test-tool/test_iscsi_cmdsn_toolow.c +++ b/test-tool/test_iscsi_cmdsn_toolow.c @@ -25,6 +25,7 @@ #include "iscsi-test-cu.h" static int change_cmdsn; +static struct iscsi_transport iscsi_drv_orig; static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) { @@ -40,7 +41,7 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu } change_cmdsn = 0; - return 0; + return iscsi_drv_orig.queue_pdu(iscsi, pdu); } void test_iscsi_cmdsn_toolow(void) @@ -64,7 +65,9 @@ void test_iscsi_cmdsn_toolow(void) sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO; sd->iscsi_ctx->target_max_recv_data_segment_length = block_size; - local_iscsi_queue_pdu = my_iscsi_queue_pdu; + /* override transport queue_pdu callback for PDU manipulation */ + iscsi_drv_orig = *sd->iscsi_ctx->drv; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; change_cmdsn = 1; /* we don't want autoreconnect since some targets will incorrectly * drop the connection on this condition. @@ -81,10 +84,11 @@ void test_iscsi_cmdsn_toolow(void) logging(LOG_VERBOSE, "[FAILURE] We got a response from the target but SMDSN was outside of the window."); } - - iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again"); TESTUNITREADY(sd, EXPECT_STATUS_GOOD); + + /* restore transport callbacks */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; } From 575ba2244c5db240bc29fa493404eee39f693a2d Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:46:28 +0200 Subject: [PATCH 04/12] test-tool/iSCSICmdSnTooHigh: override driver queue_pdu() callback In preparation for removing the test-tool iscsi_queue_pdu() dlsym overload hack, convert this test to use the regular transport driver callback for this purpose. Signed-off-by: David Disseldorp --- test-tool/test_iscsi_cmdsn_toohigh.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test-tool/test_iscsi_cmdsn_toohigh.c b/test-tool/test_iscsi_cmdsn_toohigh.c index 59ce0ab..19c8b91 100644 --- a/test-tool/test_iscsi_cmdsn_toohigh.c +++ b/test-tool/test_iscsi_cmdsn_toohigh.c @@ -25,6 +25,7 @@ #include "iscsi-test-cu.h" static int change_cmdsn; +static struct iscsi_transport iscsi_drv_orig; static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) { @@ -40,7 +41,7 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu } change_cmdsn = 0; - return 0; + return iscsi_drv_orig.queue_pdu(iscsi, pdu); } void test_iscsi_cmdsn_toohigh(void) @@ -64,7 +65,9 @@ void test_iscsi_cmdsn_toohigh(void) sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO; sd->iscsi_ctx->target_max_recv_data_segment_length = block_size; - local_iscsi_queue_pdu = my_iscsi_queue_pdu; + /* override transport queue_pdu callback for PDU manipulation */ + iscsi_drv_orig = *sd->iscsi_ctx->drv; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; change_cmdsn = 1; /* we don't want autoreconnect since some targets will incorrectly * drop the connection on this condition. @@ -81,9 +84,11 @@ void test_iscsi_cmdsn_toohigh(void) logging(LOG_VERBOSE, "[FAILURE] We got a response from the target but SMDSN was outside of the window."); } - iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again"); TESTUNITREADY(sd, EXPECT_STATUS_GOOD); + + /* restore transport callbacks */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; } From 153ca193fa61be8c2c26d8736119e7dc873d1242 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:46:28 +0200 Subject: [PATCH 05/12] test-tool/iSCSIDataSnInvalid: override driver queue_pdu() callback In preparation for removing the test-tool iscsi_queue_pdu() dlsym overload hack, convert this test to use the regular transport driver callback for this purpose. This commit also removes a number of unnecessary "WRITE10 is not implemented" checks, which should all be caught by the first check. Signed-off-by: David Disseldorp --- test-tool/test_iscsi_datasn_invalid.c | 56 ++++++++++----------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/test-tool/test_iscsi_datasn_invalid.c b/test-tool/test_iscsi_datasn_invalid.c index 14deb7a..c25631a 100644 --- a/test-tool/test_iscsi_datasn_invalid.c +++ b/test-tool/test_iscsi_datasn_invalid.c @@ -25,13 +25,14 @@ #include "iscsi-test-cu.h" static int change_datasn; +static struct iscsi_transport iscsi_drv_orig; -static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu _U_) +static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) { uint32_t datasn; if (pdu->outdata.data[0] != ISCSI_PDU_DATA_OUT) { - return 0; + goto out; } switch (change_datasn) { case 1: @@ -52,11 +53,12 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu scsi_set_uint32(&pdu->outdata.data[36], 1 - datasn); break; } - return 0; +out: + return iscsi_drv_orig.queue_pdu(iscsi, pdu); } void test_iscsi_datasn_invalid(void) -{ +{ int ret; CHECK_FOR_DATALOSS; @@ -77,7 +79,9 @@ void test_iscsi_datasn_invalid(void) sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO; sd->iscsi_ctx->target_max_recv_data_segment_length = block_size; - local_iscsi_queue_pdu = my_iscsi_queue_pdu; + /* override transport queue_pdu callback for PDU manipulation */ + iscsi_drv_orig = *sd->iscsi_ctx->drv; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); @@ -89,81 +93,63 @@ void test_iscsi_datasn_invalid(void) if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] WRITE10 is not implemented."); CU_PASS("WRITE10 is not implemented."); - local_iscsi_queue_pdu = NULL; - return; - } + goto out_ctx_restore; + } CU_ASSERT_NOT_EQUAL(ret, 0); + /* avoid changing DataSN during reconnect */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); - logging(LOG_VERBOSE, "Send Data-Out PDU with DataSN==27. Should fail"); change_datasn = 2; sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO; sd->iscsi_ctx->target_max_recv_data_segment_length = block_size; - local_iscsi_queue_pdu = my_iscsi_queue_pdu; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); ret = write10(sd, 100, block_size, block_size, 0, 0, 0, 0, 0, scratch, EXPECT_STATUS_GOOD); - if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] WRITE10 is not implemented."); - CU_PASS("WRITE10 is not implemented."); - local_iscsi_queue_pdu = NULL; - return; - } CU_ASSERT_NOT_EQUAL(ret, 0); + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); - logging(LOG_VERBOSE, "Send Data-Out PDU with DataSN==-1. Should fail"); change_datasn = 3; sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO; sd->iscsi_ctx->target_max_recv_data_segment_length = block_size; - local_iscsi_queue_pdu = my_iscsi_queue_pdu; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); ret = write10(sd, 100, block_size, block_size, 0, 0, 0, 0, 0, scratch, EXPECT_STATUS_GOOD); - if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] WRITE10 is not implemented."); - CU_PASS("WRITE10 is not implemented."); - local_iscsi_queue_pdu = NULL; - return; - } CU_ASSERT_NOT_EQUAL(ret, 0); + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); - - logging(LOG_VERBOSE, "Send Data-Out PDU's in reverse order (DataSN == 1,0). Should fail"); change_datasn = 4; sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO; sd->iscsi_ctx->target_max_recv_data_segment_length = block_size; - local_iscsi_queue_pdu = my_iscsi_queue_pdu; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); ret = write10(sd, 100, 2 * block_size, block_size, 0, 0, 0, 0, 0, scratch, EXPECT_STATUS_GOOD); - if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] WRITE10 is not implemented."); - CU_PASS("WRITE10 is not implemented."); - local_iscsi_queue_pdu = NULL; - return; - } CU_ASSERT_NOT_EQUAL(ret, 0); - - local_iscsi_queue_pdu = NULL; +out_ctx_restore: + /* restore transport callbacks and autoreconnect */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); } From fdc45fadfa06f2543a12abe8eefe7f87d5dab0c2 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 15:40:00 +0200 Subject: [PATCH 06/12] test-tool/BlockEraseReserved: skip unless iSCSI This test performs PDU manipulation so should only be run against iSCSI devices. Signed-off-by: David Disseldorp --- test-tool/test_sanitize_block_erase_reserved.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test-tool/test_sanitize_block_erase_reserved.c b/test-tool/test_sanitize_block_erase_reserved.c index 55c85d9..fcb862e 100644 --- a/test-tool/test_sanitize_block_erase_reserved.c +++ b/test-tool/test_sanitize_block_erase_reserved.c @@ -56,6 +56,13 @@ void test_sanitize_block_erase_reserved(void) CHECK_FOR_SANITIZE; CHECK_FOR_DATALOSS; + if (sd->iscsi_ctx == NULL) { + const char *err = "[SKIPPED] This test is " + "only supported for iSCSI backends"; + logging(LOG_NORMAL, "%s", err); + CU_PASS(err); + return; + } local_iscsi_queue_pdu = my_iscsi_queue_pdu; From b705f9e5240583fb862f16d603e5cf2120e5d54c Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:46:28 +0200 Subject: [PATCH 07/12] test-tool/BlockEraseReserved: override driver queue_pdu() callback In preparation for removing the test-tool iscsi_queue_pdu() dlsym overload hack, convert this test to use the regular transport driver callback for this purpose. Signed-off-by: David Disseldorp --- test-tool/test_sanitize_block_erase_reserved.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test-tool/test_sanitize_block_erase_reserved.c b/test-tool/test_sanitize_block_erase_reserved.c index fcb862e..4a0d2cb 100644 --- a/test-tool/test_sanitize_block_erase_reserved.c +++ b/test-tool/test_sanitize_block_erase_reserved.c @@ -25,8 +25,9 @@ #include "iscsi-test-cu.h" static int change_num; +static struct iscsi_transport iscsi_drv_orig; -static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu) +static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) { switch (change_num) { case 1: @@ -43,12 +44,12 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu break; } - change_num = 0; - return 0; + change_num = 0; + return iscsi_drv_orig.queue_pdu(iscsi, pdu); } void test_sanitize_block_erase_reserved(void) -{ +{ int i; logging(LOG_VERBOSE, LOG_BLANK_LINE); @@ -64,8 +65,9 @@ void test_sanitize_block_erase_reserved(void) return; } - local_iscsi_queue_pdu = my_iscsi_queue_pdu; - + /* override transport queue_pdu callback for PDU manipulation */ + iscsi_drv_orig = *sd->iscsi_ctx->drv; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; logging(LOG_VERBOSE, "Send SANITIZE command with the reserved " "bit in byte 1 set to 1"); @@ -81,4 +83,7 @@ void test_sanitize_block_erase_reserved(void) SANITIZE(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL, EXPECT_INVALID_FIELD_IN_CDB); } + + /* restore transport callbacks */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; } From c830a3b55e91fe8b1cb97e6899ef872691c8804e Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 15:40:00 +0200 Subject: [PATCH 08/12] test-tool/CryptoEraseReserved: skip unless iSCSI This test performs PDU manipulation so should only be run against iSCSI devices. Signed-off-by: David Disseldorp --- test-tool/test_sanitize_crypto_erase_reserved.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test-tool/test_sanitize_crypto_erase_reserved.c b/test-tool/test_sanitize_crypto_erase_reserved.c index c713ab5..00bbf34 100644 --- a/test-tool/test_sanitize_crypto_erase_reserved.c +++ b/test-tool/test_sanitize_crypto_erase_reserved.c @@ -56,6 +56,13 @@ void test_sanitize_crypto_erase_reserved(void) CHECK_FOR_SANITIZE; CHECK_FOR_DATALOSS; + if (sd->iscsi_ctx == NULL) { + const char *err = "[SKIPPED] This test is " + "only supported for iSCSI backends"; + logging(LOG_NORMAL, "%s", err); + CU_PASS(err); + return; + } local_iscsi_queue_pdu = my_iscsi_queue_pdu; From 77279dd44fd19167c22cfada2eec377058e1bde9 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:46:28 +0200 Subject: [PATCH 09/12] test-tool/CryptoEraseReserved: override driver queue_pdu() callback In preparation for removing the test-tool iscsi_queue_pdu() dlsym overload hack, convert this test to use the regular transport driver callback for this purpose. Signed-off-by: David Disseldorp --- test-tool/test_sanitize_crypto_erase_reserved.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test-tool/test_sanitize_crypto_erase_reserved.c b/test-tool/test_sanitize_crypto_erase_reserved.c index 00bbf34..646cbea 100644 --- a/test-tool/test_sanitize_crypto_erase_reserved.c +++ b/test-tool/test_sanitize_crypto_erase_reserved.c @@ -25,8 +25,9 @@ #include "iscsi-test-cu.h" static int change_num; +static struct iscsi_transport iscsi_drv_orig; -static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu) +static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) { switch (change_num) { case 1: @@ -43,12 +44,12 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu break; } - change_num = 0; - return 0; + change_num = 0; + return iscsi_drv_orig.queue_pdu(iscsi, pdu); } void test_sanitize_crypto_erase_reserved(void) -{ +{ int i; logging(LOG_VERBOSE, LOG_BLANK_LINE); @@ -64,8 +65,9 @@ void test_sanitize_crypto_erase_reserved(void) return; } - local_iscsi_queue_pdu = my_iscsi_queue_pdu; - + /* override transport queue_pdu callback for PDU manipulation */ + iscsi_drv_orig = *sd->iscsi_ctx->drv; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; logging(LOG_VERBOSE, "Send SANITIZE command with the reserved " "bit in byte 1 set to 1"); @@ -81,4 +83,7 @@ void test_sanitize_crypto_erase_reserved(void) SANITIZE(sd, 0, 0, SCSI_SANITIZE_CRYPTO_ERASE, 0, NULL, EXPECT_INVALID_FIELD_IN_CDB); } + + /* restore transport callbacks */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; } From e5cc079e7c2678997b3aa157331ebf34c8b10932 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 15:40:00 +0200 Subject: [PATCH 10/12] test-tool/OverwriteReserved: skip unless iSCSI This test performs PDU manipulation so should only be run against iSCSI devices. Signed-off-by: David Disseldorp --- test-tool/test_sanitize_overwrite_reserved.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test-tool/test_sanitize_overwrite_reserved.c b/test-tool/test_sanitize_overwrite_reserved.c index 20a0779..79f8a92 100644 --- a/test-tool/test_sanitize_overwrite_reserved.c +++ b/test-tool/test_sanitize_overwrite_reserved.c @@ -67,6 +67,13 @@ void test_sanitize_overwrite_reserved(void) CHECK_FOR_SANITIZE; CHECK_FOR_DATALOSS; + if (sd->iscsi_ctx == NULL) { + const char *err = "[SKIPPED] This test is " + "only supported for iSCSI backends"; + logging(LOG_NORMAL, "%s", err); + CU_PASS(err); + return; + } local_iscsi_queue_pdu = my_iscsi_queue_pdu; From 2ae45ac15d8c1d4a4f68a085dadb7f43e2f2e280 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 14:46:28 +0200 Subject: [PATCH 11/12] test-tool/OverwriteReserved: override driver queue_pdu() callback In preparation for removing the test-tool iscsi_queue_pdu() dlsym overload hack, convert this test to use the regular transport driver callback for this purpose. Signed-off-by: David Disseldorp --- test-tool/test_sanitize_overwrite_reserved.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test-tool/test_sanitize_overwrite_reserved.c b/test-tool/test_sanitize_overwrite_reserved.c index 79f8a92..91090b4 100644 --- a/test-tool/test_sanitize_overwrite_reserved.c +++ b/test-tool/test_sanitize_overwrite_reserved.c @@ -26,8 +26,9 @@ #include "iscsi-test-cu.h" static int change_num; +static struct iscsi_transport iscsi_drv_orig; -static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu) +static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) { switch (change_num) { case 1: @@ -44,12 +45,12 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu break; } - change_num = 0; - return 0; + change_num = 0; + return iscsi_drv_orig.queue_pdu(iscsi, pdu); } void test_sanitize_overwrite_reserved(void) -{ +{ int i; struct iscsi_data data; @@ -75,7 +76,9 @@ void test_sanitize_overwrite_reserved(void) return; } - local_iscsi_queue_pdu = my_iscsi_queue_pdu; + /* override transport queue_pdu callback for PDU manipulation */ + iscsi_drv_orig = *sd->iscsi_ctx->drv; + sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu; logging(LOG_VERBOSE, "Send SANITIZE command with the reserved " "bit in byte 1 set to 1"); @@ -91,4 +94,7 @@ void test_sanitize_overwrite_reserved(void) SANITIZE(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data, EXPECT_INVALID_FIELD_IN_CDB); } + + /* restore transport callbacks */ + *(sd->iscsi_ctx->drv) = iscsi_drv_orig; } From dd17293bcc188dbefc420ee23b77bc9bb7c5e9a2 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 16 Sep 2019 16:02:36 +0200 Subject: [PATCH 12/12] test-tool: remove unused iscsi_queue_pdu() symbol overload All users have now been changed to overload via the iscsi_ctx transport callback, so the dlsym based overloading can now be dropped. Signed-off-by: David Disseldorp --- test-tool/iscsi-support.c | 11 ----------- test-tool/iscsi-support.h | 1 - test-tool/iscsi-test-cu.c | 15 --------------- 3 files changed, 27 deletions(-) diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index 4b49478..169d2b0 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -119,8 +119,6 @@ int readonly; int sbc3_support; int maximum_transfer_length; -int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu); - static const unsigned char zeroBlock[4096]; /** @@ -569,15 +567,6 @@ wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state * } } -int -iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) -{ - if (local_iscsi_queue_pdu != NULL) { - local_iscsi_queue_pdu(iscsi, pdu); - } - return real_iscsi_queue_pdu(iscsi, pdu); -} - int orwrite(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index aee00ca..2b20a1f 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -782,7 +782,6 @@ struct iscsi_async_state { void wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state *test_state); struct iscsi_pdu; -int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu); struct scsi_command_descriptor *get_command_descriptor(int opcode, int sa); diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c index eafda39..26e1b05 100644 --- a/test-tool/iscsi-test-cu.c +++ b/test-tool/iscsi-test-cu.c @@ -59,12 +59,6 @@ int loglevel = LOG_NORMAL; struct scsi_device *sd = NULL; /* mp_sds[0] alias */ static unsigned int maxsectors; -/* - * this allows us to redefine how PDU are queued, at times, for - * testing purposes - */ -int (*real_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu); - /***************************************************************** * * list of tests and test suites @@ -805,7 +799,6 @@ test_setup(void) { task = NULL; read_write_buf = NULL; - local_iscsi_queue_pdu = NULL; } void @@ -1214,14 +1207,6 @@ main(int argc, char *argv[]) mp_num_sds++; } - /* So that we can override iscsi_queue_pdu in tests - * and replace or mutate the blob that we are about to write to the - * wire. - * This allows such tests to do their mutates and then call out - * to the real queueing function once they have modified the data. - */ - real_iscsi_queue_pdu = dlsym(RTLD_NEXT, "iscsi_queue_pdu"); - if ((mp_num_sds == 0) || (mp_sds[0]->iscsi_url == NULL && mp_sds[0]->sgio_dev == NULL)) { #ifdef HAVE_SG_IO