Message ID | 20241031010032.117296-4-jmeneghi@redhat.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | scsi: st: improve pos_unknown handling after reset | expand |
On 31. Oct 2024, at 3.00, John Meneghini <jmeneghi@redhat.com> wrote: > > From: Kai Makisara <kai.makisara@kolumbus.fi> > The patch in this message is a WIP patch discussed in Bugzilla. It is not meant to be submitted as such. (In addition to changes, it contains a bug fix not related to the changes.) Those interested in the progress can look at the Bugzilla entry shown below. > Fixes: 3d882cca73be ("scsi: st: Fix input/output error on empty drive reset") > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219419 > Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ I have NOT signed of this patch. > Tested-by: John Meneghini <jmeneghi@redhat.com> John has done extensive tests to see if the patch works. > --- > drivers/scsi/st.c | 31 ++++++++++++++++++++++--------- > 1 file changed, 22 insertions(+), 9 deletions(-) > > diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c > index e9d1cb6c8a86..0260361d19fa 100644 > --- a/drivers/scsi/st.c > +++ b/drivers/scsi/st.c ...
On 10/31/24 10:17, "Kai Mäkisara (Kolumbus)" wrote: > On 31. Oct 2024, at 3.00, John Meneghini <jmeneghi@redhat.com> wrote: >> >> From: Kai Makisara <kai.makisara@kolumbus.fi> >> > > The patch in this message is a WIP patch discussed in Bugzilla. It is not > meant to be submitted as such. (In addition to changes, it contains a bug > fix not related to the changes.) Those interested in the progress can look > at the Bugzilla entry shown below. Agreed. >> Fixes: 3d882cca73be ("scsi: st: Fix input/output error on empty drive reset") >> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219419 >> Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi> > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > I have NOT signed of this patch. Sorry, I added this because I wanted to publish the changes and checkpatch.pl was complaining that your name wasn't contained in the signed-off. >> Tested-by: John Meneghini <jmeneghi@redhat.com> > > John has done extensive tests to see if the patch works. Yes, please see the bugzilla for more information. /John
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index e9d1cb6c8a86..0260361d19fa 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -3538,6 +3538,7 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) int i, cmd_nr, cmd_type, bt; int retval = 0; unsigned int blk; + bool cmd_mtiocget; struct scsi_tape *STp = file->private_data; struct st_modedef *STm; struct st_partstat *STps; @@ -3651,6 +3652,7 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) */ if (mtc.mt_op != MTREW && mtc.mt_op != MTOFFL && + mtc.mt_op != MTLOAD && mtc.mt_op != MTRETEN && mtc.mt_op != MTERASE && mtc.mt_op != MTSEEK && @@ -3764,17 +3766,28 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) goto out; } + cmd_mtiocget = cmd_type == _IOC_TYPE(MTIOCGET) && cmd_nr == _IOC_NR(MTIOCGET); + if ((i = flush_buffer(STp, 0)) < 0) { - retval = i; - goto out; - } - if (STp->can_partitions && - (i = switch_partition(STp)) < 0) { - retval = i; - goto out; + /* flush fails -> modify status accordingly */ + if (cmd_mtiocget && STp->pos_unknown) { + reset_state(STp); + STp->pos_unknown = 1; + } else { /* return error */ + retval = i; + goto out; + } + } else { /* flush_buffer succeeds */ + if (STp->can_partitions) { + i = switch_partition(STp); + if (i < 0) { + retval = i; + goto out; + } + } } - if (cmd_type == _IOC_TYPE(MTIOCGET) && cmd_nr == _IOC_NR(MTIOCGET)) { + if (cmd_mtiocget) { struct mtget mt_status; if (_IOC_SIZE(cmd_in) != sizeof(struct mtget)) { @@ -3788,7 +3801,7 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) ((STp->density << MT_ST_DENSITY_SHIFT) & MT_ST_DENSITY_MASK); mt_status.mt_blkno = STps->drv_block; mt_status.mt_fileno = STps->drv_file; - if (STp->block_size != 0) { + if (STp->block_size != 0 && mt_status.mt_blkno >= 0) { if (STps->rw == ST_WRITING) mt_status.mt_blkno += (STp->buffer)->buffer_bytes / STp->block_size;