From: John Meneghini <jmeneghi@redhat.com>
To: "Kai Mäkisara" <Kai.Makisara@kolumbus.fi>,
linux-scsi@vger.kernel.org, dgilbert@interlog.com
Subject: Re: [RFC PATCH 1/6] scsi: scsi_debug: First fixes for tapes
Date: Thu, 30 Jan 2025 12:58:10 -0500 [thread overview]
Message-ID: <34dbab52-c3e1-4f12-9cd5-ff3be3baf4b8@redhat.com> (raw)
In-Reply-To: <20250128142250.163901-2-Kai.Makisara@kolumbus.fi>
This is great. My scsi_debug tests are no longer complaining about failing Mode Sense commands.
Reviewed-by: John Meneghini <jmeneghi@redhat.com>
Tested-by: John Meneghini <jmeneghi@redhat.com>
On 1/28/25 9:22 AM, Kai Mäkisara wrote:
> Patch includes the following:
> - enable MODE SENSE/SELECT without actual page (to read/write only
> the Block Descriptor)
> - store the density code and block size in the Block Descriptor
> - fix REWIND not to use the wrong page filling function
>
> Signed-off-by: Kai Mäkisara <Kai.Makisara@kolumbus.fi>
> ---
> drivers/scsi/scsi_debug.c | 38 +++++++++++++++++++++++++++++++++-----
> 1 file changed, 33 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index 680ba180a672..00daa77f636c 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -173,6 +173,10 @@ static const char *sdebug_version_date = "20210520";
> #define DEF_ZBC_MAX_OPEN_ZONES 8
> #define DEF_ZBC_NR_CONV_ZONES 1
>
> +/* Default parameters for tape drives */
> +#define TAPE_DEF_DENSITY 0x0
> +#define TAPE_DEF_BLKSIZE 0
> +
> #define SDEBUG_LUN_0_VAL 0
>
> /* bit mask values for sdebug_opts */
> @@ -363,6 +367,10 @@ struct sdebug_dev_info {
> ktime_t create_ts; /* time since bootup that this device was created */
> struct sdeb_zone_state *zstate;
>
> + /* For tapes */
> + unsigned int tape_blksize;
> + unsigned int tape_density;
> +
> struct dentry *debugfs_entry;
> struct spinlock list_lock;
> struct list_head inject_err_list;
> @@ -773,7 +781,7 @@ static const struct opcode_info_t opcode_info_arr[SDEB_I_LAST_ELEM_P1 + 1] = {
> /* 20 */
> {0, 0x1e, 0, 0, NULL, NULL, /* ALLOW REMOVAL */
> {6, 0, 0, 0, 0x3, 0xc7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
> - {0, 0x1, 0, 0, resp_start_stop, NULL, /* REWIND ?? */
> + {0, 0x1, 0, 0, NULL, NULL, /* REWIND ?? */
> {6, 0x1, 0, 0, 0, 0xc7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
> {0, 0, 0, F_INV_OP | FF_RESPOND, NULL, NULL, /* ATA_PT */
> {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
> @@ -2742,7 +2750,7 @@ static int resp_mode_sense(struct scsi_cmnd *scp,
> unsigned char *ap;
> unsigned char *arr __free(kfree);
> unsigned char *cmd = scp->cmnd;
> - bool dbd, llbaa, msense_6, is_disk, is_zbc;
> + bool dbd, llbaa, msense_6, is_disk, is_zbc, is_tape;
>
> arr = kzalloc(SDEBUG_MAX_MSENSE_SZ, GFP_ATOMIC);
> if (!arr)
> @@ -2755,7 +2763,8 @@ static int resp_mode_sense(struct scsi_cmnd *scp,
> llbaa = msense_6 ? false : !!(cmd[1] & 0x10);
> is_disk = (sdebug_ptype == TYPE_DISK);
> is_zbc = devip->zoned;
> - if ((is_disk || is_zbc) && !dbd)
> + is_tape = (sdebug_ptype == TYPE_TAPE);
> + if ((is_disk || is_zbc || is_tape) && !dbd)
> bd_len = llbaa ? 16 : 8;
> else
> bd_len = 0;
> @@ -2793,7 +2802,11 @@ static int resp_mode_sense(struct scsi_cmnd *scp,
> put_unaligned_be32(0xffffffff, ap + 0);
> else
> put_unaligned_be32(sdebug_capacity, ap + 0);
> - put_unaligned_be16(sdebug_sector_size, ap + 6);
> + if (is_tape) {
> + ap[0] = devip->tape_density;
> + put_unaligned_be16(devip->tape_blksize, ap + 6);
> + } else
> + put_unaligned_be16(sdebug_sector_size, ap + 6);
> offset += bd_len;
> ap = arr + offset;
> } else if (16 == bd_len) {
> @@ -2802,6 +2815,8 @@ static int resp_mode_sense(struct scsi_cmnd *scp,
> offset += bd_len;
> ap = arr + offset;
> }
> + if (cmd[2] == 0)
> + goto only_bd; /* Only block descriptor requested */
>
> /*
> * N.B. If len>0 before resp_*_pg() call, then form of that call should be:
> @@ -2902,6 +2917,7 @@ static int resp_mode_sense(struct scsi_cmnd *scp,
> default:
> goto bad_pcode;
> }
> +only_bd:
> if (msense_6)
> arr[0] = offset - 1;
> else
> @@ -2945,7 +2961,14 @@ static int resp_mode_select(struct scsi_cmnd *scp,
> __func__, param_len, res);
> md_len = mselect6 ? (arr[0] + 1) : (get_unaligned_be16(arr + 0) + 2);
> bd_len = mselect6 ? arr[3] : get_unaligned_be16(arr + 6);
> - off = bd_len + (mselect6 ? 4 : 8);
> + off = (mselect6 ? 4 : 8);
> + if (sdebug_ptype == TYPE_TAPE) {
> + devip->tape_density = arr[off];
> + devip->tape_blksize = get_unaligned_be16(arr + off + 6);
> + }
> + off += bd_len;
> + if (res <= off)
> + goto only_bd; /* No page written, just descriptors */
> if (md_len > 2 || off >= res) {
> mk_sense_invalid_fld(scp, SDEB_IN_DATA, 0, -1);
> return check_condition_result;
> @@ -2998,6 +3021,7 @@ static int resp_mode_select(struct scsi_cmnd *scp,
> return check_condition_result;
> set_mode_changed_ua:
> set_bit(SDEBUG_UA_MODE_CHANGED, devip->uas_bm);
> +only_bd:
> return 0;
> }
>
> @@ -5835,6 +5859,10 @@ static struct sdebug_dev_info *sdebug_device_create(
> } else {
> devip->zoned = false;
> }
> + if (sdebug_ptype == TYPE_TAPE) {
> + devip->tape_density = TAPE_DEF_DENSITY;
> + devip->tape_blksize = TAPE_DEF_BLKSIZE;
> + }
> devip->create_ts = ktime_get_boottime();
> atomic_set(&devip->stopped, (sdeb_tur_ms_to_ready > 0 ? 2 : 0));
> spin_lock_init(&devip->list_lock);
next prev parent reply other threads:[~2025-01-30 17:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-28 14:22 [RFC PATCH 0/6] scsi: scsi_debug: Add more tape support Kai Mäkisara
2025-01-28 14:22 ` [RFC PATCH 1/6] scsi: scsi_debug: First fixes for tapes Kai Mäkisara
2025-01-30 17:58 ` John Meneghini [this message]
2025-01-28 14:22 ` [RFC PATCH 2/6] scsi: scsi_debug: Add READ BLOCK LIMITS and modify LOAD " Kai Mäkisara
2025-01-28 17:32 ` Bart Van Assche
2025-01-30 18:01 ` John Meneghini
2025-01-28 14:22 ` [RFC PATCH 3/6] scsi: scsi_debug: Add tape write support with block lengths and 4 bytes of data Kai Mäkisara
2025-01-30 21:45 ` John Meneghini
2025-01-28 14:22 ` [RFC PATCH 4/6] scsi: scsi_debug: Add read support and update locate for tapes Kai Mäkisara
2025-01-30 21:46 ` John Meneghini
2025-01-28 14:22 ` [RFC PATCH 5/6] scsi: scsi_debug: Add compression mode page " Kai Mäkisara
2025-01-30 21:49 ` John Meneghini
2025-01-28 14:22 ` [RFC PATCH 6/6] scsi: scsi_debug: Reset tape setting at device reset Kai Mäkisara
2025-01-30 21:58 ` John Meneghini
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=34dbab52-c3e1-4f12-9cd5-ff3be3baf4b8@redhat.com \
--to=jmeneghi@redhat.com \
--cc=Kai.Makisara@kolumbus.fi \
--cc=dgilbert@interlog.com \
--cc=linux-scsi@vger.kernel.org \
/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