scsi: sd: Remove zone write locking
The block layer now handles zone write locking. [mkp: removed SCMD_ZONE_WRITE_LOCK reference in scsi_debugfs] Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
23349ca93a
commit
39051dd85f
|
@ -8,7 +8,6 @@
|
|||
static const char *const scsi_cmd_flags[] = {
|
||||
SCSI_CMD_FLAG_NAME(TAGGED),
|
||||
SCSI_CMD_FLAG_NAME(UNCHECKED_ISA_DMA),
|
||||
SCSI_CMD_FLAG_NAME(ZONE_WRITE_LOCK),
|
||||
SCSI_CMD_FLAG_NAME(INITIALIZED),
|
||||
};
|
||||
#undef SCSI_CMD_FLAG_NAME
|
||||
|
|
|
@ -851,16 +851,13 @@ static int sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd)
|
|||
struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
|
||||
u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9);
|
||||
u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
|
||||
int ret;
|
||||
|
||||
if (!(rq->cmd_flags & REQ_NOUNMAP)) {
|
||||
switch (sdkp->zeroing_mode) {
|
||||
case SD_ZERO_WS16_UNMAP:
|
||||
ret = sd_setup_write_same16_cmnd(cmd, true);
|
||||
goto out;
|
||||
return sd_setup_write_same16_cmnd(cmd, true);
|
||||
case SD_ZERO_WS10_UNMAP:
|
||||
ret = sd_setup_write_same10_cmnd(cmd, true);
|
||||
goto out;
|
||||
return sd_setup_write_same10_cmnd(cmd, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -868,15 +865,9 @@ static int sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd)
|
|||
return BLKPREP_INVALID;
|
||||
|
||||
if (sdkp->ws16 || sector > 0xffffffff || nr_sectors > 0xffff)
|
||||
ret = sd_setup_write_same16_cmnd(cmd, false);
|
||||
else
|
||||
ret = sd_setup_write_same10_cmnd(cmd, false);
|
||||
return sd_setup_write_same16_cmnd(cmd, false);
|
||||
|
||||
out:
|
||||
if (sd_is_zoned(sdkp) && ret == BLKPREP_OK)
|
||||
return sd_zbc_write_lock_zone(cmd);
|
||||
|
||||
return ret;
|
||||
return sd_setup_write_same10_cmnd(cmd, false);
|
||||
}
|
||||
|
||||
static void sd_config_write_same(struct scsi_disk *sdkp)
|
||||
|
@ -964,12 +955,6 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
|
|||
|
||||
BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size);
|
||||
|
||||
if (sd_is_zoned(sdkp)) {
|
||||
ret = sd_zbc_write_lock_zone(cmd);
|
||||
if (ret != BLKPREP_OK)
|
||||
return ret;
|
||||
}
|
||||
|
||||
sector >>= ilog2(sdp->sector_size) - 9;
|
||||
nr_sectors >>= ilog2(sdp->sector_size) - 9;
|
||||
|
||||
|
@ -1004,9 +989,6 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
|
|||
ret = scsi_init_io(cmd);
|
||||
rq->__data_len = nr_bytes;
|
||||
|
||||
if (sd_is_zoned(sdkp) && ret != BLKPREP_OK)
|
||||
sd_zbc_write_unlock_zone(cmd);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1036,19 +1018,12 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
|
|||
sector_t threshold;
|
||||
unsigned int this_count = blk_rq_sectors(rq);
|
||||
unsigned int dif, dix;
|
||||
bool zoned_write = sd_is_zoned(sdkp) && rq_data_dir(rq) == WRITE;
|
||||
int ret;
|
||||
unsigned char protect;
|
||||
|
||||
if (zoned_write) {
|
||||
ret = sd_zbc_write_lock_zone(SCpnt);
|
||||
if (ret != BLKPREP_OK)
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = scsi_init_io(SCpnt);
|
||||
if (ret != BLKPREP_OK)
|
||||
goto out;
|
||||
return ret;
|
||||
WARN_ON_ONCE(SCpnt != rq->special);
|
||||
|
||||
/* from here on until we're complete, any goto out
|
||||
|
@ -1267,9 +1242,6 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
|
|||
*/
|
||||
ret = BLKPREP_OK;
|
||||
out:
|
||||
if (zoned_write && ret != BLKPREP_OK)
|
||||
sd_zbc_write_unlock_zone(SCpnt);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1314,9 +1286,6 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt)
|
|||
struct request *rq = SCpnt->request;
|
||||
u8 *cmnd;
|
||||
|
||||
if (SCpnt->flags & SCMD_ZONE_WRITE_LOCK)
|
||||
sd_zbc_write_unlock_zone(SCpnt);
|
||||
|
||||
if (rq->rq_flags & RQF_SPECIAL_PAYLOAD)
|
||||
__free_page(rq->special_vec.bv_page);
|
||||
|
||||
|
|
|
@ -77,7 +77,6 @@ struct scsi_disk {
|
|||
unsigned int nr_zones;
|
||||
unsigned int zone_blocks;
|
||||
unsigned int zone_shift;
|
||||
unsigned long *zones_wlock;
|
||||
unsigned int zones_optimal_open;
|
||||
unsigned int zones_optimal_nonseq;
|
||||
unsigned int zones_max_open;
|
||||
|
@ -283,8 +282,6 @@ static inline int sd_is_zoned(struct scsi_disk *sdkp)
|
|||
extern int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buffer);
|
||||
extern void sd_zbc_remove(struct scsi_disk *sdkp);
|
||||
extern void sd_zbc_print_zones(struct scsi_disk *sdkp);
|
||||
extern int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd);
|
||||
extern void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd);
|
||||
extern int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd);
|
||||
extern int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd);
|
||||
extern void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes,
|
||||
|
@ -302,14 +299,6 @@ static inline void sd_zbc_remove(struct scsi_disk *sdkp) {}
|
|||
|
||||
static inline void sd_zbc_print_zones(struct scsi_disk *sdkp) {}
|
||||
|
||||
static inline int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd)
|
||||
{
|
||||
/* Let the drive fail requests */
|
||||
return BLKPREP_OK;
|
||||
}
|
||||
|
||||
static inline void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd) {}
|
||||
|
||||
static inline int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd)
|
||||
{
|
||||
return BLKPREP_INVALID;
|
||||
|
|
|
@ -229,17 +229,6 @@ static inline sector_t sd_zbc_zone_sectors(struct scsi_disk *sdkp)
|
|||
return logical_to_sectors(sdkp->device, sdkp->zone_blocks);
|
||||
}
|
||||
|
||||
/**
|
||||
* sd_zbc_zone_no - Get the number of the zone conataining a sector.
|
||||
* @sdkp: The target disk
|
||||
* @sector: 512B sector address contained in the zone
|
||||
*/
|
||||
static inline unsigned int sd_zbc_zone_no(struct scsi_disk *sdkp,
|
||||
sector_t sector)
|
||||
{
|
||||
return sectors_to_logical(sdkp->device, sector) >> sdkp->zone_shift;
|
||||
}
|
||||
|
||||
/**
|
||||
* sd_zbc_setup_reset_cmnd - Prepare a RESET WRITE POINTER scsi command.
|
||||
* @cmd: the command to setup
|
||||
|
@ -278,78 +267,6 @@ int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd)
|
|||
return BLKPREP_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* sd_zbc_write_lock_zone - Write lock a sequential zone.
|
||||
* @cmd: write command
|
||||
*
|
||||
* Called from sd_init_cmd() for write requests (standard write, write same or
|
||||
* write zeroes operations). If the request target zone is not already locked,
|
||||
* the zone is locked and BLKPREP_OK returned, allowing the request to proceed
|
||||
* through dispatch in scsi_request_fn(). Otherwise, BLKPREP_DEFER is returned,
|
||||
* forcing the request to wait for the zone to be unlocked, that is, for the
|
||||
* previously issued write request targeting the same zone to complete.
|
||||
*
|
||||
* This is called from blk_peek_request() context with the queue lock held and
|
||||
* before the request is removed from the scheduler. As a result, multiple
|
||||
* contexts executing concurrently scsi_request_fn() cannot result in write
|
||||
* sequence reordering as only a single write request per zone is allowed to
|
||||
* proceed.
|
||||
*/
|
||||
int sd_zbc_write_lock_zone(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);
|
||||
sector_t zone_sectors = sd_zbc_zone_sectors(sdkp);
|
||||
unsigned int zno = sd_zbc_zone_no(sdkp, sector);
|
||||
|
||||
/*
|
||||
* Note: Checks of the alignment of the write command on
|
||||
* logical blocks is done in sd.c
|
||||
*/
|
||||
|
||||
/* Do not allow zone boundaries crossing on host-managed drives */
|
||||
if (blk_queue_zoned_model(sdkp->disk->queue) == BLK_ZONED_HM &&
|
||||
(sector & (zone_sectors - 1)) + blk_rq_sectors(rq) > zone_sectors)
|
||||
return BLKPREP_KILL;
|
||||
|
||||
/*
|
||||
* Do not issue more than one write at a time per
|
||||
* zone. This solves write ordering problems due to
|
||||
* the unlocking of the request queue in the dispatch
|
||||
* path in the non scsi-mq case.
|
||||
*/
|
||||
if (sdkp->zones_wlock &&
|
||||
test_and_set_bit(zno, sdkp->zones_wlock))
|
||||
return BLKPREP_DEFER;
|
||||
|
||||
WARN_ON_ONCE(cmd->flags & SCMD_ZONE_WRITE_LOCK);
|
||||
cmd->flags |= SCMD_ZONE_WRITE_LOCK;
|
||||
|
||||
return BLKPREP_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* sd_zbc_write_unlock_zone - Write unlock a sequential zone.
|
||||
* @cmd: write command
|
||||
*
|
||||
* Called from sd_uninit_cmd(). Unlocking the request target zone will allow
|
||||
* dispatching the next write request for the zone.
|
||||
*/
|
||||
void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd)
|
||||
{
|
||||
struct request *rq = cmd->request;
|
||||
struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
|
||||
|
||||
if (sdkp->zones_wlock && cmd->flags & SCMD_ZONE_WRITE_LOCK) {
|
||||
unsigned int zno = sd_zbc_zone_no(sdkp, blk_rq_pos(rq));
|
||||
WARN_ON_ONCE(!test_bit(zno, sdkp->zones_wlock));
|
||||
cmd->flags &= ~SCMD_ZONE_WRITE_LOCK;
|
||||
clear_bit_unlock(zno, sdkp->zones_wlock);
|
||||
smp_mb__after_atomic();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* sd_zbc_complete - ZBC command post processing.
|
||||
* @cmd: Completed command
|
||||
|
|
|
@ -58,8 +58,7 @@ struct scsi_pointer {
|
|||
/* for scmd->flags */
|
||||
#define SCMD_TAGGED (1 << 0)
|
||||
#define SCMD_UNCHECKED_ISA_DMA (1 << 1)
|
||||
#define SCMD_ZONE_WRITE_LOCK (1 << 2)
|
||||
#define SCMD_INITIALIZED (1 << 3)
|
||||
#define SCMD_INITIALIZED (1 << 2)
|
||||
/* flags preserved across unprep / reprep */
|
||||
#define SCMD_PRESERVED_FLAGS (SCMD_UNCHECKED_ISA_DMA | SCMD_INITIALIZED)
|
||||
|
||||
|
|
Loading…
Reference in a new issue