From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org,
Jens Axboe <axboe@kernel.dk>, 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 v15 09/19] scsi: sd: Add a unit test for sd_cmp_sector()
Date: Tue, 14 Nov 2023 13:16:17 -0800 [thread overview]
Message-ID: <20231114211804.1449162-10-bvanassche@acm.org> (raw)
In-Reply-To: <20231114211804.1449162-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 | 5 +++
drivers/scsi/sd.c | 4 ++
drivers/scsi/sd_test.c | 86 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)
create mode 100644 drivers/scsi/sd_test.c
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 2e57afdbbc4d..ba2b81ddd7f8 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -237,6 +237,11 @@ config SCSI_ERROR_TEST
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
+
menu "SCSI Transports"
depends on SCSI
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 63bb01ddadde..d52ea605ada8 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -4141,3 +4141,7 @@ void sd_print_result(const struct scsi_disk *sdkp, const char *msg, int result)
"%s: Result: hostbyte=0x%02x driverbyte=%s\n",
msg, host_byte(result), "DRIVER_OK");
}
+
+#ifdef CONFIG_SD_TEST
+#include "sd_test.c"
+#endif
diff --git a/drivers/scsi/sd_test.c b/drivers/scsi/sd_test.c
new file mode 100644
index 000000000000..b9c3d2bf311e
--- /dev/null
+++ b/drivers/scsi/sd_test.c
@@ -0,0 +1,86 @@
+// 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(type, ...) \
+ ({ \
+ type *obj; \
+ obj = kmalloc(sizeof(*obj), GFP_KERNEL); \
+ if (obj) \
+ *obj = (type){ __VA_ARGS__ }; \
+ obj; \
+ })
+
+#define ALLOC_Q(...) ALLOC(struct request_queue, __VA_ARGS__)
+
+#define ALLOC_CMD(...) ALLOC(struct rq_and_cmd, __VA_ARGS__)
+
+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-11-14 21:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 21:16 [PATCH v15 00/19] Improve write performance for zoned UFS devices Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 01/19] block: Introduce more member variables related to zone write locking Bart Van Assche
2023-11-19 23:29 ` Damien Le Moal
2023-11-20 20:44 ` Bart Van Assche
2023-11-20 23:02 ` Damien Le Moal
2023-11-20 23:58 ` Bart Van Assche
2023-11-21 1:21 ` Damien Le Moal
2023-11-21 2:12 ` Damien Le Moal
2023-11-14 21:16 ` [PATCH v15 02/19] block: Only use write locking if necessary Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 03/19] block: Preserve the order of requeued zoned writes Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 04/19] block/mq-deadline: Only use zone locking if necessary Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 05/19] scsi: Pass SCSI host pointer to scsi_eh_flush_done_q() Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 06/19] scsi: core: Introduce a mechanism for reordering requests in the error handler Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 07/19] scsi: core: Add unit tests for scsi_call_prepare_resubmit() Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 08/19] scsi: sd: Support sorting commands by LBA before resubmitting Bart Van Assche
2023-11-14 21:16 ` Bart Van Assche [this message]
2023-11-14 21:16 ` [PATCH v15 10/19] scsi: core: Retry unaligned zoned writes Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 11/19] scsi: sd_zbc: Only require an I/O scheduler if needed Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 12/19] scsi: scsi_debug: Add the preserves_write_order module parameter Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 13/19] scsi: scsi_debug: Support injecting unaligned write errors Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 14/19] scsi: ufs: hisi: Rework the code that disables auto-hibernation Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 15/19] scsi: ufs: Rename ufshcd_auto_hibern8_enable() and make it static Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 16/19] scsi: ufs: Change the return type of ufshcd_auto_hibern8_update() Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 17/19] scsi: ufs: Simplify ufshcd_auto_hibern8_update() Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 18/19] scsi: ufs: Forbid auto-hibernation without I/O scheduler Bart Van Assche
2023-11-14 21:16 ` [PATCH v15 19/19] scsi: ufs: Inform the block layer about write ordering Bart Van Assche
2023-11-28 1:45 ` Can Guo
2023-11-28 21:49 ` Bart Van Assche
2023-11-27 7:09 ` [PATCH v15 00/19] Improve write performance for zoned UFS devices Christoph Hellwig
2023-11-27 19:35 ` [PATCH v15 00/19] Improve write performance for zoned UFS devices Bart Van Assche
2023-11-28 12:53 ` Christoph Hellwig
2023-11-28 17:36 ` 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=20231114211804.1449162-10-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