Make it easier to test sd_cmp_sector() by adding a unit test for this
function.
Cc: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Cc: Damien Le Moal <dlemoal@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Ming Lei <ming.lei@xxxxxxxxxx>
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
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 | 86 +++++++++++++++++++++++++++++++++++++
5 files changed, 99 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 c9de909ad506..82abc721b543 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1980,8 +1980,8 @@ static int sd_eh_action(struct scsi_cmnd *scmd, int eh_disp)
return eh_disp;
}
-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);
@@ -2001,6 +2001,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(sd_cmp_sector);
+#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..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");
