| Message ID | 20241115162003.3908-3-Kai.Makisara@kolumbus.fi (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: st: More reset patches | expand |
Reviewed-by: John Meneghini <jmeneghi@redhat.com> Tested-by: John Meneghini <jmeneghi@redhat.com> On 11/15/24 11:20, Kai Mäkisara wrote: > Some of the allowed operations put the tape into a known position > to continue operation, assuming only the tape position has changed. > But reset sets partition, density and block size to drive default > values. These should be restored to the values before reset. This > is only done for the operations not starting a new tape session. > > Normally the current block size and density are stored by the drive. > If the settings have been changed, the changed values have to be > saved by the driver across reset. > > Signed-off-by: Kai Mäkisara <Kai.Makisara@kolumbus.fi> > --- > drivers/scsi/st.c | 22 ++++++++++++++++++++-- > drivers/scsi/st.h | 2 ++ > 2 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c > index 3acaa3561c81..0008843e33a8 100644 > --- a/drivers/scsi/st.c > +++ b/drivers/scsi/st.c > @@ -955,7 +955,6 @@ static void reset_state(struct scsi_tape *STp) > STp->partition = find_partition(STp); > if (STp->partition < 0) > STp->partition = 0; > - STp->new_partition = STp->partition; > } > } > > @@ -2928,14 +2927,17 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon > if (cmd_in == MTSETDENSITY) { > (STp->buffer)->b_data[4] = arg; > STp->density_changed = 1; /* At least we tried ;-) */ > + STp->changed_density = arg; > } else if (cmd_in == SET_DENS_AND_BLK) > (STp->buffer)->b_data[4] = arg >> 24; > else > (STp->buffer)->b_data[4] = STp->density; > if (cmd_in == MTSETBLK || cmd_in == SET_DENS_AND_BLK) { > ltmp = arg & MT_ST_BLKSIZE_MASK; > - if (cmd_in == MTSETBLK) > + if (cmd_in == MTSETBLK) { > STp->blksize_changed = 1; /* At least we tried ;-) */ > + STp->changed_blksize = arg; > + } > } else > ltmp = STp->block_size; > (STp->buffer)->b_data[9] = (ltmp >> 16); > @@ -3635,6 +3637,22 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) > goto out; > } > reset_state(STp); /* Clears pos_unknown */ > + > + /* Fix the device settings after reset, ignore errors */ > + if (mtc.mt_op == MTREW || mtc.mt_op == MTSEEK || > + mtc.mt_op == MTEOM) { > + if (STp->can_partitions) { > + /* STp->new_partition contains the > + * latest partition set > + */ > + STp->partition = 0; > + switch_partition(STp); > + } > + if (STp->density_changed) > + st_int_ioctl(STp, MTSETDENSITY, STp->changed_density); > + if (STp->blksize_changed) > + st_int_ioctl(STp, MTSETBLK, STp->changed_blksize); > + } > } > > if (mtc.mt_op != MTNOP && mtc.mt_op != MTSETBLK && > diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h > index 7a68eaba7e81..2105c6a5b458 100644 > --- a/drivers/scsi/st.h > +++ b/drivers/scsi/st.h > @@ -165,12 +165,14 @@ struct scsi_tape { > unsigned char compression_changed; > unsigned char drv_buffer; > unsigned char density; > + unsigned char changed_density; > unsigned char door_locked; > unsigned char autorew_dev; /* auto-rewind device */ > unsigned char rew_at_close; /* rewind necessary at close */ > unsigned char inited; > unsigned char cleaning_req; /* cleaning requested? */ > int block_size; > + int changed_blksize; > int min_block; > int max_block; > int recover_count; /* From tape opening */
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 3acaa3561c81..0008843e33a8 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -955,7 +955,6 @@ static void reset_state(struct scsi_tape *STp) STp->partition = find_partition(STp); if (STp->partition < 0) STp->partition = 0; - STp->new_partition = STp->partition; } } @@ -2928,14 +2927,17 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon if (cmd_in == MTSETDENSITY) { (STp->buffer)->b_data[4] = arg; STp->density_changed = 1; /* At least we tried ;-) */ + STp->changed_density = arg; } else if (cmd_in == SET_DENS_AND_BLK) (STp->buffer)->b_data[4] = arg >> 24; else (STp->buffer)->b_data[4] = STp->density; if (cmd_in == MTSETBLK || cmd_in == SET_DENS_AND_BLK) { ltmp = arg & MT_ST_BLKSIZE_MASK; - if (cmd_in == MTSETBLK) + if (cmd_in == MTSETBLK) { STp->blksize_changed = 1; /* At least we tried ;-) */ + STp->changed_blksize = arg; + } } else ltmp = STp->block_size; (STp->buffer)->b_data[9] = (ltmp >> 16); @@ -3635,6 +3637,22 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) goto out; } reset_state(STp); /* Clears pos_unknown */ + + /* Fix the device settings after reset, ignore errors */ + if (mtc.mt_op == MTREW || mtc.mt_op == MTSEEK || + mtc.mt_op == MTEOM) { + if (STp->can_partitions) { + /* STp->new_partition contains the + * latest partition set + */ + STp->partition = 0; + switch_partition(STp); + } + if (STp->density_changed) + st_int_ioctl(STp, MTSETDENSITY, STp->changed_density); + if (STp->blksize_changed) + st_int_ioctl(STp, MTSETBLK, STp->changed_blksize); + } } if (mtc.mt_op != MTNOP && mtc.mt_op != MTSETBLK && diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h index 7a68eaba7e81..2105c6a5b458 100644 --- a/drivers/scsi/st.h +++ b/drivers/scsi/st.h @@ -165,12 +165,14 @@ struct scsi_tape { unsigned char compression_changed; unsigned char drv_buffer; unsigned char density; + unsigned char changed_density; unsigned char door_locked; unsigned char autorew_dev; /* auto-rewind device */ unsigned char rew_at_close; /* rewind necessary at close */ unsigned char inited; unsigned char cleaning_req; /* cleaning requested? */ int block_size; + int changed_blksize; int min_block; int max_block; int recover_count; /* From tape opening */
Some of the allowed operations put the tape into a known position to continue operation, assuming only the tape position has changed. But reset sets partition, density and block size to drive default values. These should be restored to the values before reset. This is only done for the operations not starting a new tape session. Normally the current block size and density are stored by the drive. If the settings have been changed, the changed values have to be saved by the driver across reset. Signed-off-by: Kai Mäkisara <Kai.Makisara@kolumbus.fi> --- drivers/scsi/st.c | 22 ++++++++++++++++++++-- drivers/scsi/st.h | 2 ++ 2 files changed, 22 insertions(+), 2 deletions(-)