| Message ID | 20230503183821.1473305-15-john.g.garry@oracle.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | block atomic writes | expand |
On 5/3/23 11:38, John Garry wrote: > +static blk_status_t sd_setup_atomic_cmnd(struct scsi_cmnd *cmd, > + sector_t lba, unsigned int nr_blocks, > + unsigned char flags) > +{ > + cmd->cmd_len = 16; > + cmd->cmnd[0] = WRITE_ATOMIC_16; > + cmd->cmnd[1] = flags; > + put_unaligned_be64(lba, &cmd->cmnd[2]); > + cmd->cmnd[10] = 0; > + cmd->cmnd[11] = 0; > + put_unaligned_be16(nr_blocks, &cmd->cmnd[12]); > + cmd->cmnd[14] = 0; > + cmd->cmnd[15] = 0; > + > + return BLK_STS_OK; > +} A single space in front of the assignment operator please. > + > static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) > { > struct request *rq = scsi_cmd_to_rq(cmd); > @@ -1149,6 +1166,7 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) > unsigned int nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq)); > unsigned int mask = logical_to_sectors(sdp, 1) - 1; > bool write = rq_data_dir(rq) == WRITE; > + bool atomic_write = !!(rq->cmd_flags & REQ_ATOMIC) && write; Isn't the !! superfluous in the above expression? I have not yet seen any other kernel code where a flag test is used in a boolean expression and where !! occurs in front of the flag test. Thanks, Bart.
On 03/05/2023 19:48, Bart Van Assche wrote: > On 5/3/23 11:38, John Garry wrote: >> +static blk_status_t sd_setup_atomic_cmnd(struct scsi_cmnd *cmd, >> + sector_t lba, unsigned int nr_blocks, >> + unsigned char flags) >> +{ >> + cmd->cmd_len = 16; >> + cmd->cmnd[0] = WRITE_ATOMIC_16; >> + cmd->cmnd[1] = flags; >> + put_unaligned_be64(lba, &cmd->cmnd[2]); >> + cmd->cmnd[10] = 0; >> + cmd->cmnd[11] = 0; >> + put_unaligned_be16(nr_blocks, &cmd->cmnd[12]); >> + cmd->cmnd[14] = 0; >> + cmd->cmnd[15] = 0; >> + >> + return BLK_STS_OK; >> +} > > A single space in front of the assignment operator please. ok > >> + >> static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) >> { >> struct request *rq = scsi_cmd_to_rq(cmd); >> @@ -1149,6 +1166,7 @@ static blk_status_t >> sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) >> unsigned int nr_blocks = sectors_to_logical(sdp, >> blk_rq_sectors(rq)); >> unsigned int mask = logical_to_sectors(sdp, 1) - 1; >> bool write = rq_data_dir(rq) == WRITE; >> + bool atomic_write = !!(rq->cmd_flags & REQ_ATOMIC) && write; > > Isn't the !! superfluous in the above expression? I have not yet seen > any other kernel code where a flag test is used in a boolean expression > and where !! occurs in front of the flag test. So you think that && means that (rq->cmd_flags & REQ_ATOMIC) will be auto a bool. Fine, I can change that. Thanks, John
diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c index 41a950075913..3e47c4472a80 100644 --- a/drivers/scsi/scsi_trace.c +++ b/drivers/scsi/scsi_trace.c @@ -325,6 +325,26 @@ scsi_trace_zbc_out(struct trace_seq *p, unsigned char *cdb, int len) return ret; } +static const char * +scsi_trace_atomic_write16_out(struct trace_seq *p, unsigned char *cdb, int len) +{ + const char *ret = trace_seq_buffer_ptr(p); + unsigned int boundary_size; + unsigned int nr_blocks; + sector_t lba; + + lba = get_unaligned_be64(&cdb[2]); + boundary_size = get_unaligned_be16(&cdb[10]); + nr_blocks = get_unaligned_be16(&cdb[12]); + + trace_seq_printf(p, "lba=%llu txlen=%u boundary_size=%u", + lba, nr_blocks, boundary_size); + + trace_seq_putc(p, 0); + + return ret; +} + static const char * scsi_trace_varlen(struct trace_seq *p, unsigned char *cdb, int len) { @@ -385,6 +405,8 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len) return scsi_trace_zbc_in(p, cdb, len); case ZBC_OUT: return scsi_trace_zbc_out(p, cdb, len); + case WRITE_ATOMIC_16: + return scsi_trace_atomic_write16_out(p, cdb, len); default: return scsi_trace_misc(p, cdb, len); } diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 8db8b9389227..e69473fa2dd7 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1139,6 +1139,23 @@ static blk_status_t sd_setup_rw6_cmnd(struct scsi_cmnd *cmd, bool write, return BLK_STS_OK; } +static blk_status_t sd_setup_atomic_cmnd(struct scsi_cmnd *cmd, + sector_t lba, unsigned int nr_blocks, + unsigned char flags) +{ + cmd->cmd_len = 16; + cmd->cmnd[0] = WRITE_ATOMIC_16; + cmd->cmnd[1] = flags; + put_unaligned_be64(lba, &cmd->cmnd[2]); + cmd->cmnd[10] = 0; + cmd->cmnd[11] = 0; + put_unaligned_be16(nr_blocks, &cmd->cmnd[12]); + cmd->cmnd[14] = 0; + cmd->cmnd[15] = 0; + + return BLK_STS_OK; +} + static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) { struct request *rq = scsi_cmd_to_rq(cmd); @@ -1149,6 +1166,7 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) unsigned int nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq)); unsigned int mask = logical_to_sectors(sdp, 1) - 1; bool write = rq_data_dir(rq) == WRITE; + bool atomic_write = !!(rq->cmd_flags & REQ_ATOMIC) && write; unsigned char protect, fua; blk_status_t ret; unsigned int dif; @@ -1208,6 +1226,8 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) if (protect && sdkp->protection_type == T10_PI_TYPE2_PROTECTION) { ret = sd_setup_rw32_cmnd(cmd, write, lba, nr_blocks, protect | fua); + } else if (atomic_write) { + ret = sd_setup_atomic_cmnd(cmd, lba, nr_blocks, protect | fua); } else if (sdp->use_16_for_rw || (nr_blocks > 0xffff)) { ret = sd_setup_rw16_cmnd(cmd, write, lba, nr_blocks, protect | fua); diff --git a/include/scsi/scsi_proto.h b/include/scsi/scsi_proto.h index fbe5bdfe4d6e..c449be9cba60 100644 --- a/include/scsi/scsi_proto.h +++ b/include/scsi/scsi_proto.h @@ -119,6 +119,7 @@ #define WRITE_SAME_16 0x93 #define ZBC_OUT 0x94 #define ZBC_IN 0x95 +#define WRITE_ATOMIC_16 0x9c #define SERVICE_ACTION_BIDIRECTIONAL 0x9d #define SERVICE_ACTION_IN_16 0x9e #define SERVICE_ACTION_OUT_16 0x9f
Add function sd_setup_atomic_cmnd() to setup an WRITE_ATOMIC_16 CDB for when REQ_ATOMIC flag is set for the request. Also add trace info. Signed-off-by: John Garry <john.g.garry@oracle.com> --- drivers/scsi/scsi_trace.c | 22 ++++++++++++++++++++++ drivers/scsi/sd.c | 20 ++++++++++++++++++++ include/scsi/scsi_proto.h | 1 + 3 files changed, 43 insertions(+)