From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@infradead.org>,
linux-block <linux-block@vger.kernel.org>,
Damien Le Moal <Damien.LeMoal@wdc.com>,
Keith Busch <kbusch@kernel.org>,
"linux-scsi @ vger . kernel . org" <linux-scsi@vger.kernel.org>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
"linux-fsdevel @ vger . kernel . org"
<linux-fsdevel@vger.kernel.org>, Daniel Wagner <dwagner@suse.de>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH v7 07/11] scsi: sd_zbc: factor out sanity checks for zoned commands
Date: Fri, 17 Apr 2020 21:15:32 +0900 [thread overview]
Message-ID: <20200417121536.5393-8-johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <20200417121536.5393-1-johannes.thumshirn@wdc.com>
Factor sanity checks for zoned commands from sd_zbc_setup_zone_mgmt_cmnd().
This will help with the introduction of an emulated ZONE_APPEND command.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
drivers/scsi/sd_zbc.c | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index f45c22b09726..ee156fbf3780 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -209,6 +209,26 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector,
return ret;
}
+static blk_status_t sd_zbc_cmnd_checks(struct scsi_cmnd *cmd)
+{
+ struct request *rq = cmd->request;
+ struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
+ sector_t sector = blk_rq_pos(rq);
+
+ if (!sd_is_zoned(sdkp))
+ /* Not a zoned device */
+ return BLK_STS_IOERR;
+
+ if (sdkp->device->changed)
+ return BLK_STS_IOERR;
+
+ if (sector & (sd_zbc_zone_sectors(sdkp) - 1))
+ /* Unaligned request */
+ return BLK_STS_IOERR;
+
+ return BLK_STS_OK;
+}
+
/**
* sd_zbc_setup_zone_mgmt_cmnd - Prepare a zone ZBC_OUT command. The operations
* can be RESET WRITE POINTER, OPEN, CLOSE or FINISH.
@@ -223,20 +243,14 @@ blk_status_t sd_zbc_setup_zone_mgmt_cmnd(struct scsi_cmnd *cmd,
unsigned char op, bool all)
{
struct request *rq = cmd->request;
- struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
sector_t sector = blk_rq_pos(rq);
+ struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
sector_t block = sectors_to_logical(sdkp->device, sector);
+ blk_status_t ret;
- if (!sd_is_zoned(sdkp))
- /* Not a zoned device */
- return BLK_STS_IOERR;
-
- if (sdkp->device->changed)
- return BLK_STS_IOERR;
-
- if (sector & (sd_zbc_zone_sectors(sdkp) - 1))
- /* Unaligned request */
- return BLK_STS_IOERR;
+ ret = sd_zbc_cmnd_checks(cmd);
+ if (ret != BLK_STS_OK)
+ return ret;
cmd->cmd_len = 16;
memset(cmd->cmnd, 0, cmd->cmd_len);
--
2.24.1
next prev parent reply other threads:[~2020-04-17 12:16 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-17 12:15 [PATCH v7 00/11] Introduce Zone Append for writing to zoned block devices Johannes Thumshirn
2020-04-17 12:15 ` [PATCH v7 01/11] scsi: free sgtables in case command setup fails Johannes Thumshirn
2020-04-18 16:02 ` Bart Van Assche
2020-04-20 7:10 ` Johannes Thumshirn
2020-04-20 10:46 ` Johannes Thumshirn
2020-04-22 6:44 ` hch
2020-04-17 12:15 ` [PATCH v7 02/11] block: provide fallbacks for blk_queue_zone_is_seq and blk_queue_zone_no Johannes Thumshirn
2020-04-18 16:03 ` Bart Van Assche
2020-04-17 12:15 ` [PATCH v7 03/11] block: rename __bio_add_pc_page to bio_add_hw_page Johannes Thumshirn
2020-04-17 12:15 ` [PATCH v7 04/11] block: Introduce REQ_OP_ZONE_APPEND Johannes Thumshirn
2020-04-18 16:46 ` Bart Van Assche
2020-04-20 0:30 ` Damien Le Moal
2020-04-20 0:49 ` Bart Van Assche
2020-04-20 1:08 ` Damien Le Moal
2020-04-22 6:46 ` hch
2020-04-17 12:15 ` [PATCH v7 05/11] block: introduce blk_req_zone_write_trylock Johannes Thumshirn
2020-04-18 16:52 ` Bart Van Assche
2020-04-17 12:15 ` [PATCH v7 06/11] block: Modify revalidate zones Johannes Thumshirn
2020-04-22 6:47 ` Christoph Hellwig
2020-04-17 12:15 ` Johannes Thumshirn [this message]
2020-04-18 16:56 ` [PATCH v7 07/11] scsi: sd_zbc: factor out sanity checks for zoned commands Bart Van Assche
2020-04-17 12:15 ` [PATCH v7 08/11] scsi: sd_zbc: emulate ZONE_APPEND commands Johannes Thumshirn
2020-04-22 6:49 ` Christoph Hellwig
2020-04-17 12:15 ` [PATCH v7 09/11] null_blk: Support REQ_OP_ZONE_APPEND Johannes Thumshirn
2020-04-17 12:15 ` [PATCH v7 10/11] block: export bio_release_pages and bio_iov_iter_get_pages Johannes Thumshirn
2020-04-17 12:15 ` [PATCH v7 11/11] zonefs: use REQ_OP_ZONE_APPEND for sync DIO Johannes Thumshirn
2020-04-18 21:45 ` Bart Van Assche
2020-04-20 0:36 ` Damien Le Moal
2020-04-17 16:03 ` [PATCH v7 00/11] Introduce Zone Append for writing to zoned block devices Theodore Y. Ts'o
2020-04-17 17:48 ` Johannes Thumshirn
2020-04-18 1:00 ` Theodore Y. Ts'o
2020-04-18 8:57 ` Johannes Thumshirn
2020-04-19 22:51 ` Damien Le Moal
2020-04-18 15:56 ` Bart Van Assche
2020-04-20 0:21 ` Damien Le Moal
2020-04-20 1:06 ` Douglas Gilbert
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=20200417121536.5393-8-johannes.thumshirn@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=Damien.LeMoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=dwagner@suse.de \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--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).