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,
linux-fsdevel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
Christoph Hellwig <hch@lst.de>,
Daejun Park <daejun7.park@samsung.com>,
Kanchan Joshi <joshi.k@samsung.com>,
Bart Van Assche <bvanassche@acm.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH v9 10/19] scsi: scsi_proto: Add structures and constants related to I/O groups and streams
Date: Tue, 30 Jan 2024 13:48:36 -0800 [thread overview]
Message-ID: <20240130214911.1863909-11-bvanassche@acm.org> (raw)
In-Reply-To: <20240130214911.1863909-1-bvanassche@acm.org>
Prepare for adding code that will query the I/O advice hints group
descriptors and for adding code that will retrieve the stream status.
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/Kconfig | 5 +++
drivers/scsi/Makefile | 2 +
drivers/scsi/scsi_proto_test.c | 56 ++++++++++++++++++++++++
include/scsi/scsi_proto.h | 78 ++++++++++++++++++++++++++++++++++
4 files changed, 141 insertions(+)
create mode 100644 drivers/scsi/scsi_proto_test.c
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e20af95a912b..3328052c8715 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -241,6 +241,11 @@ config SCSI_SCAN_ASYNC
Note that this setting also affects whether resuming from
system suspend will be performed asynchronously.
+config SCSI_PROTO_TEST
+ tristate "scsi_proto.h unit tests" if !KUNIT_ALL_TESTS
+ depends on SCSI && KUNIT
+ default KUNIT_ALL_TESTS
+
menu "SCSI Transports"
depends on SCSI
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index f055bfd54a68..1313ddf2fd1a 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -24,6 +24,8 @@ obj-$(CONFIG_SCSI_COMMON) += scsi_common.o
obj-$(CONFIG_RAID_ATTRS) += raid_class.o
+obj-$(CONFIG_SCSI_PROTO_TEST) += scsi_proto_test.o
+
# --- NOTE ORDERING HERE ---
# For kernel non-modular link, transport attributes need to
# be initialised before drivers
diff --git a/drivers/scsi/scsi_proto_test.c b/drivers/scsi/scsi_proto_test.c
new file mode 100644
index 000000000000..7fa0a78a2ad1
--- /dev/null
+++ b/drivers/scsi/scsi_proto_test.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2023 Google LLC
+ */
+#include <kunit/test.h>
+#include <asm-generic/unaligned.h>
+#include <scsi/scsi_proto.h>
+
+static void test_scsi_proto(struct kunit *test)
+{
+ static const union {
+ struct scsi_io_group_descriptor desc;
+ u8 arr[sizeof(struct scsi_io_group_descriptor)];
+ } d = { .arr = { 0x45, 0, 0, 0, 0xb0, 0xe4, 0xe3 } };
+ KUNIT_EXPECT_EQ(test, d.desc.io_advice_hints_mode + 0, 1);
+ KUNIT_EXPECT_EQ(test, d.desc.st_enble + 0, 1);
+ KUNIT_EXPECT_EQ(test, d.desc.cs_enble + 0, 0);
+ KUNIT_EXPECT_EQ(test, d.desc.ic_enable + 0, 1);
+ KUNIT_EXPECT_EQ(test, d.desc.acdlu + 0, 1);
+ KUNIT_EXPECT_EQ(test, d.desc.rlbsr + 0, 3);
+ KUNIT_EXPECT_EQ(test, d.desc.lbm_descriptor_type + 0, 0);
+ KUNIT_EXPECT_EQ(test, d.desc.params[0] + 0, 0xe4);
+ KUNIT_EXPECT_EQ(test, d.desc.params[1] + 0, 0xe3);
+
+ static const union {
+ struct scsi_stream_status s;
+ u8 arr[sizeof(struct scsi_stream_status)];
+ } ss = { .arr = { 0x80, 0, 0x12, 0x34, 0x3f } };
+ KUNIT_EXPECT_EQ(test, ss.s.perm + 0, 1);
+ KUNIT_EXPECT_EQ(test, get_unaligned_be16(&ss.s.stream_identifier),
+ 0x1234);
+ KUNIT_EXPECT_EQ(test, ss.s.rel_lifetime + 0, 0x3f);
+
+ static const union {
+ struct scsi_stream_status_header h;
+ u8 arr[sizeof(struct scsi_stream_status_header)];
+ } sh = { .arr = { 1, 2, 3, 4, 0, 0, 5, 6 } };
+ KUNIT_EXPECT_EQ(test, get_unaligned_be32(&sh.h.len), 0x1020304);
+ KUNIT_EXPECT_EQ(test, get_unaligned_be16(&sh.h.number_of_open_streams),
+ 0x506);
+}
+
+static struct kunit_case scsi_proto_test_cases[] = {
+ KUNIT_CASE(test_scsi_proto),
+ {}
+};
+
+static struct kunit_suite scsi_proto_test_suite = {
+ .name = "scsi_proto",
+ .test_cases = scsi_proto_test_cases,
+};
+kunit_test_suite(scsi_proto_test_suite);
+
+MODULE_DESCRIPTION("<scsi/scsi_proto.h> unit tests");
+MODULE_AUTHOR("Bart Van Assche");
+MODULE_LICENSE("GPL");
diff --git a/include/scsi/scsi_proto.h b/include/scsi/scsi_proto.h
index 07d65c1f59db..843106e1109f 100644
--- a/include/scsi/scsi_proto.h
+++ b/include/scsi/scsi_proto.h
@@ -10,6 +10,7 @@
#ifndef _SCSI_PROTO_H_
#define _SCSI_PROTO_H_
+#include <linux/build_bug.h>
#include <linux/types.h>
/*
@@ -126,6 +127,7 @@
#define SAI_READ_CAPACITY_16 0x10
#define SAI_GET_LBA_STATUS 0x12
#define SAI_REPORT_REFERRALS 0x13
+#define SAI_GET_STREAM_STATUS 0x16
/* values for maintenance in */
#define MI_REPORT_IDENTIFYING_INFORMATION 0x05
#define MI_REPORT_TARGET_PGS 0x0a
@@ -275,6 +277,82 @@ struct scsi_lun {
__u8 scsi_lun[8];
};
+/* SBC-5 IO advice hints group descriptor */
+struct scsi_io_group_descriptor {
+#if defined(__BIG_ENDIAN)
+ u8 io_advice_hints_mode: 2;
+ u8 reserved1: 3;
+ u8 st_enble: 1;
+ u8 cs_enble: 1;
+ u8 ic_enable: 1;
+#elif defined(__LITTLE_ENDIAN)
+ u8 ic_enable: 1;
+ u8 cs_enble: 1;
+ u8 st_enble: 1;
+ u8 reserved1: 3;
+ u8 io_advice_hints_mode: 2;
+#else
+#error
+#endif
+ u8 reserved2[3];
+ /* Logical block markup descriptor */
+#if defined(__BIG_ENDIAN)
+ u8 acdlu: 1;
+ u8 reserved3: 1;
+ u8 rlbsr: 2;
+ u8 lbm_descriptor_type: 4;
+#elif defined(__LITTLE_ENDIAN)
+ u8 lbm_descriptor_type: 4;
+ u8 rlbsr: 2;
+ u8 reserved3: 1;
+ u8 acdlu: 1;
+#else
+#error
+#endif
+ u8 params[2];
+ u8 reserved4;
+ u8 reserved5[8];
+};
+
+static_assert(sizeof(struct scsi_io_group_descriptor) == 16);
+
+/* SCSI stream status descriptor */
+struct scsi_stream_status {
+#if defined(__BIG_ENDIAN)
+ u8 perm: 1;
+ u8 reserved1: 7;
+#elif defined(__LITTLE_ENDIAN)
+ u8 reserved1: 7;
+ u8 perm: 1;
+#else
+#error
+#endif
+ u8 reserved2;
+ __be16 stream_identifier;
+#if defined(__BIG_ENDIAN)
+ u8 reserved3: 2;
+ u8 rel_lifetime: 6;
+#elif defined(__LITTLE_ENDIAN)
+ u8 rel_lifetime: 6;
+ u8 reserved3: 2;
+#else
+#error
+#endif
+ u8 reserved4[3];
+};
+
+static_assert(sizeof(struct scsi_stream_status) == 8);
+
+/* GET STREAM STATUS parameter data */
+struct scsi_stream_status_header {
+ __be32 len; /* length in bytes of stream_status[] array. */
+ u16 reserved;
+ __be16 number_of_open_streams;
+ DECLARE_FLEX_ARRAY(struct scsi_stream_status, stream_status);
+};
+
+static_assert(sizeof(struct scsi_stream_status_header) == 8);
+
/* SPC asymmetric access states */
#define SCSI_ACCESS_STATE_OPTIMAL 0x00
#define SCSI_ACCESS_STATE_ACTIVE 0x01
next prev parent reply other threads:[~2024-01-30 21:49 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-30 21:48 [PATCH v9 00/19] Pass data lifetime information to SCSI disk devices Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 01/19] fs: Fix rw_hint validation Bart Van Assche
2024-01-31 13:56 ` Christian Brauner
2024-01-31 21:07 ` Bart Van Assche
2024-02-22 2:46 ` Bart Van Assche
2024-02-22 8:51 ` Christian Brauner
2024-01-31 14:51 ` Kanchan Joshi
2024-01-30 21:48 ` [PATCH v9 02/19] fs: Verify write lifetime constants at compile time Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 03/19] fs: Split fcntl_rw_hint() Bart Van Assche
2024-01-31 14:52 ` Kanchan Joshi
2024-01-30 21:48 ` [PATCH v9 04/19] fs: Move enum rw_hint into a new header file Bart Van Assche
2024-01-31 7:48 ` Chao Yu
2024-01-30 21:48 ` [PATCH v9 05/19] fs: Propagate write hints to the struct block_device inode Bart Van Assche
2024-01-31 14:55 ` Kanchan Joshi
2024-01-30 21:48 ` [PATCH v9 06/19] block, fs: Restore the per-bio/request data lifetime fields Bart Van Assche
2024-01-31 14:55 ` Kanchan Joshi
2024-01-30 21:48 ` [PATCH v9 07/19] fs/f2fs: Restore the whint_mode mount option Bart Van Assche
2024-02-01 10:27 ` Chao Yu
2024-01-30 21:48 ` [PATCH v9 08/19] fs/f2fs: Restore support for tracing data lifetimes Bart Van Assche
2024-02-01 10:27 ` Chao Yu
2024-01-30 21:48 ` [PATCH v9 09/19] scsi: core: Query the Block Limits Extension VPD page Bart Van Assche
2024-01-30 21:48 ` Bart Van Assche [this message]
2024-01-30 21:48 ` [PATCH v9 11/19] scsi: sd: Translate data lifetime information Bart Van Assche
2024-02-15 21:33 ` Martin K. Petersen
2024-02-15 21:51 ` Bart Van Assche
2024-02-15 22:00 ` Martin K. Petersen
2024-02-16 0:22 ` Bart Van Assche
2024-02-16 0:32 ` Martin K. Petersen
2024-06-11 20:57 ` Andy Shevchenko
2024-06-11 21:21 ` Christian Heusel
2024-06-11 23:08 ` Bart Van Assche
2024-06-12 1:48 ` Martin K. Petersen
2024-06-12 5:35 ` Andy Shevchenko
2024-06-12 5:42 ` Andy Shevchenko
2024-01-30 21:48 ` [PATCH v9 12/19] scsi: scsi_debug: Reduce code duplication Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 13/19] scsi: scsi_debug: Support the block limits extension VPD page Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 14/19] scsi: scsi_debug: Rework page code error handling Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 15/19] scsi: scsi_debug: Rework subpage " Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 16/19] scsi: scsi_debug: Allocate the MODE SENSE response from the heap Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 17/19] scsi: scsi_debug: Implement the IO Advice Hints Grouping mode page Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 18/19] scsi: scsi_debug: Implement GET STREAM STATUS Bart Van Assche
2024-01-30 21:48 ` [PATCH v9 19/19] scsi: scsi_debug: Maintain write statistics per group number 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=20240130214911.1863909-11-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=daejun7.park@samsung.com \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=joshi.k@samsung.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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;
as well as URLs for NNTP newsgroup(s).