| Message ID | 20201207221021.28243-1-emilne@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: sd: suppress suprious block errors when WRITE SAME is being disabled | expand |
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
On Mon, 7 Dec 2020 17:10:21 -0500, Ewan D. Milne wrote: > The block layer code will split a large zeroout request into multiple bios > and if WRITE SAME is disabled because the storage device reports that it > does not support it (or support the length used), we can get an error message > from the block layer despite the setting of RQF_QUIET on the first request. > This is because more than one request may have already been submitted. > > Fix this by setting RQF_QUIET when BLK_STS_TARGET is returned to fail the > request early, we don't need to log a message because we did not actually > submit the command to the device, and the block layer code will handle the > error by submitting individual write bios. Applied to 5.11/scsi-fixes, thanks! [1/1] scsi: sd: suppress suprious block errors when WRITE SAME is being disabled https://git.kernel.org/mkp/scsi/c/e5cc9002caaf -- Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index b1267f1f3a89..1032905bbe76 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -874,8 +874,10 @@ static blk_status_t sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd) } } - if (sdp->no_write_same) + if (sdp->no_write_same) { + rq->rq_flags |= RQF_QUIET; return BLK_STS_TARGET; + } if (sdkp->ws16 || lba > 0xffffffff || nr_blocks > 0xffff) return sd_setup_write_same16_cmnd(cmd, false);
The block layer code will split a large zeroout request into multiple bios and if WRITE SAME is disabled because the storage device reports that it does not support it (or support the length used), we can get an error message from the block layer despite the setting of RQF_QUIET on the first request. This is because more than one request may have already been submitted. Fix this by setting RQF_QUIET when BLK_STS_TARGET is returned to fail the request early, we don't need to log a message because we did not actually submit the command to the device, and the block layer code will handle the error by submitting individual write bios. Signed-off-by: Ewan D. Milne <emilne@redhat.com> --- drivers/scsi/sd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)