From: Bart Van Assche <bvanassche@acm.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Christoph Hellwig <hch@lst.de>,
Bart Van Assche <bvanassche@acm.org>,
Damien Le Moal <dlemoal@kernel.org>,
Ming Lei <ming.lei@redhat.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH v13 08/18] scsi: sd: Add a unit test for sd_cmp_sector()
Date: Wed, 18 Oct 2023 10:54:30 -0700 [thread overview]
Message-ID: <20231018175602.2148415-9-bvanassche@acm.org> (raw)
In-Reply-To: <20231018175602.2148415-1-bvanassche@acm.org>
Make it easier to test sd_cmp_sector() by adding a unit test for this
function.
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/Kconfig.kunit | 5 ++
drivers/scsi/Makefile.kunit | 1 +
drivers/scsi/sd.c | 7 ++-
drivers/scsi/sd.h | 2 +
drivers/scsi/sd_test.c | 91 +++++++++++++++++++++++++++++++++++++
5 files changed, 104 insertions(+), 2 deletions(-)
create mode 100644 drivers/scsi/sd_test.c
diff --git a/drivers/scsi/Kconfig.kunit b/drivers/scsi/Kconfig.kunit
index 90984a6ec7cc..907798967b6f 100644
--- a/drivers/scsi/Kconfig.kunit
+++ b/drivers/scsi/Kconfig.kunit
@@ -2,3 +2,8 @@ config SCSI_ERROR_TEST
tristate "scsi_error.c unit tests" if !KUNIT_ALL_TESTS
depends on SCSI && KUNIT
default KUNIT_ALL_TESTS
+
+config SD_TEST
+ tristate "sd.c unit tests" if !KUNIT_ALL_TESTS
+ depends on SCSI && BLK_DEV_SD && KUNIT
+ default KUNIT_ALL_TESTS
diff --git a/drivers/scsi/Makefile.kunit b/drivers/scsi/Makefile.kunit
index 3e98053b2709..dc0a21d7749f 100644
--- a/drivers/scsi/Makefile.kunit
+++ b/drivers/scsi/Makefile.kunit
@@ -1 +1,2 @@
obj-$(CONFIG_SCSI_ERROR_TEST) += scsi_error_test.o
+obj-$(CONFIG_SD_TEST) += sd_test.o
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6f26d6d6f50b..c4a89300d3f9 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1988,8 +1988,8 @@ static bool sd_needs_prepare_resubmit(struct scsi_cmnd *cmd)
blk_rq_is_seq_zoned_write(rq);
}
-static int sd_cmp_sector(void *priv, const struct list_head *_a,
- const struct list_head *_b)
+int sd_cmp_sector(void *priv, const struct list_head *_a,
+ const struct list_head *_b)
{
struct scsi_cmnd *a = list_entry(_a, typeof(*a), eh_entry);
struct scsi_cmnd *b = list_entry(_b, typeof(*b), eh_entry);
@@ -2009,6 +2009,9 @@ static int sd_cmp_sector(void *priv, const struct list_head *_a,
return use_zwl_a > use_zwl_b;
return blk_rq_pos(rq_a) > blk_rq_pos(rq_b);
}
+#if IS_MODULE(CONFIG_SD_TEST)
+EXPORT_SYMBOL_GPL(scsi_call_prepare_resubmit);
+#endif
static void sd_prepare_resubmit(struct list_head *cmd_list)
{
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 5eea762f84d1..35b7cdb7bf3b 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -292,6 +292,8 @@ static inline blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd,
#endif /* CONFIG_BLK_DEV_ZONED */
+int sd_cmp_sector(void *priv, const struct list_head *_a,
+ const struct list_head *_b);
void sd_print_sense_hdr(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr);
void sd_print_result(const struct scsi_disk *sdkp, const char *msg, int result);
diff --git a/drivers/scsi/sd_test.c b/drivers/scsi/sd_test.c
new file mode 100644
index 000000000000..0dc0f4c67b96
--- /dev/null
+++ b/drivers/scsi/sd_test.c
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2023 Google LLC
+ */
+#include <kunit/test.h>
+#include <linux/cleanup.h>
+#include <linux/list_sort.h>
+#include <linux/slab.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_driver.h>
+#include "sd.h"
+
+#define ALLOC_Q(...) \
+ ({ \
+ struct request_queue *q; \
+ q = kmalloc(sizeof(*q), GFP_KERNEL); \
+ if (q) \
+ *q = (struct request_queue){ __VA_ARGS__ }; \
+ q; \
+ })
+
+#define ALLOC_CMD(...) \
+ ({ \
+ struct rq_and_cmd *cmd; \
+ cmd = kmalloc(sizeof(*cmd), GFP_KERNEL); \
+ if (cmd) \
+ *cmd = (struct rq_and_cmd){ __VA_ARGS__ }; \
+ cmd; \
+ })
+
+struct rq_and_cmd {
+ struct request rq;
+ struct scsi_cmnd cmd;
+};
+
+/*
+ * Verify that sd_cmp_sector() does what it is expected to do.
+ */
+static void test_sd_cmp_sector(struct kunit *test)
+{
+ struct request_queue *q1 __free(kfree) =
+ ALLOC_Q(.limits.use_zone_write_lock = true);
+ struct request_queue *q2 __free(kfree) =
+ ALLOC_Q(.limits.use_zone_write_lock = false);
+ struct rq_and_cmd *cmd1 __free(kfree) = ALLOC_CMD(.rq = {
+ .q = q1,
+ .__sector = 7,
+ });
+ struct rq_and_cmd *cmd2 __free(kfree) = ALLOC_CMD(.rq = {
+ .q = q1,
+ .__sector = 5,
+ });
+ struct rq_and_cmd *cmd3 __free(kfree) = ALLOC_CMD(.rq = {
+ .q = q2,
+ .__sector = 7,
+ });
+ struct rq_and_cmd *cmd4 __free(kfree) = ALLOC_CMD(.rq = {
+ .q = q2,
+ .__sector = 5,
+ });
+ LIST_HEAD(cmd_list);
+
+ list_add_tail(&cmd1->cmd.eh_entry, &cmd_list);
+ list_add_tail(&cmd2->cmd.eh_entry, &cmd_list);
+ list_add_tail(&cmd3->cmd.eh_entry, &cmd_list);
+ list_add_tail(&cmd4->cmd.eh_entry, &cmd_list);
+ KUNIT_EXPECT_EQ(test, list_count_nodes(&cmd_list), 4);
+ list_sort(NULL, &cmd_list, sd_cmp_sector);
+ KUNIT_EXPECT_EQ(test, list_count_nodes(&cmd_list), 4);
+ KUNIT_EXPECT_PTR_EQ(test, cmd_list.next, &cmd4->cmd.eh_entry);
+ KUNIT_EXPECT_PTR_EQ(test, cmd_list.next->next, &cmd3->cmd.eh_entry);
+ KUNIT_EXPECT_PTR_EQ(test, cmd_list.next->next->next,
+ &cmd1->cmd.eh_entry);
+ KUNIT_EXPECT_PTR_EQ(test, cmd_list.next->next->next->next,
+ &cmd2->cmd.eh_entry);
+}
+
+static struct kunit_case sd_test_cases[] = {
+ KUNIT_CASE(test_sd_cmp_sector),
+ {}
+};
+
+static struct kunit_suite sd_test_suite = {
+ .name = "sd",
+ .test_cases = sd_test_cases,
+};
+kunit_test_suite(sd_test_suite);
+
+MODULE_DESCRIPTION("SCSI disk (sd) driver unit tests");
+MODULE_AUTHOR("Bart Van Assche");
+MODULE_LICENSE("GPL");
next prev parent reply other threads:[~2023-10-18 17:56 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 17:54 [PATCH v13 00/18] Improve write performance for zoned UFS devices Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 01/18] block: Introduce more member variables related to zone write locking Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 02/18] block: Only use write locking if necessary Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 03/18] block: Preserve the order of requeued zoned writes Bart Van Assche
2023-10-19 0:15 ` Damien Le Moal
2023-10-20 19:17 ` Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 04/18] block/mq-deadline: Only use zone locking if necessary Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 05/18] scsi: core: Introduce a mechanism for reordering requests in the error handler Bart Van Assche
2023-10-19 0:24 ` Damien Le Moal
2023-10-19 17:53 ` Bart Van Assche
2023-10-19 19:50 ` Bart Van Assche
2023-10-19 22:49 ` Damien Le Moal
2023-10-18 17:54 ` [PATCH v13 06/18] scsi: core: Add unit tests for scsi_call_prepare_resubmit() Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 07/18] scsi: sd: Sort commands by LBA before resubmitting Bart Van Assche
2023-10-18 17:54 ` Bart Van Assche [this message]
2023-10-18 17:54 ` [PATCH v13 09/18] scsi: core: Retry unaligned zoned writes Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 10/18] scsi: sd_zbc: Only require an I/O scheduler if needed Bart Van Assche
2023-10-19 0:26 ` Damien Le Moal
2023-10-19 16:54 ` Bart Van Assche
2023-10-19 22:43 ` Damien Le Moal
2023-10-18 17:54 ` [PATCH v13 11/18] scsi: scsi_debug: Add the preserves_write_order module parameter Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 12/18] scsi: scsi_debug: Support injecting unaligned write errors Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 13/18] scsi: ufs: hisi: Rework the code that disables auto-hibernation Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 14/18] scsi: ufs: Rename ufshcd_auto_hibern8_enable() and make it static Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 15/18] scsi: ufs: Change the return type of ufshcd_auto_hibern8_update() Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 16/18] scsi: ufs: Simplify ufshcd_auto_hibern8_update() Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 17/18] scsi: ufs: Forbid auto-hibernation without I/O scheduler Bart Van Assche
2023-10-18 17:54 ` [PATCH v13 18/18] scsi: ufs: Inform the block layer about write ordering Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231018175602.2148415-9-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=dlemoal@kernel.org \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox