* [PATCH v3] mpt3sas: Force request partial completion alignment
@ 2017-01-26 18:37 Guilherme G. Piccoli
2017-02-01 3:34 ` Martin K. Petersen
0 siblings, 1 reply; 3+ messages in thread
From: Guilherme G. Piccoli @ 2017-01-26 18:37 UTC (permalink / raw)
To: linux-scsi, MPT-FusionLinux.pdl
Cc: sathya.prakash, chaitra.basappa, suganath-prabu.subramani,
brking, gpiccoli, mauricfo, linuxram, martin.petersen
From: Ram Pai <linuxram@us.ibm.com>
The firmware or device, possibly under a heavy I/O load, can return
on a partial unaligned boundary. Scsi-ml expects these requests to be
completed on an alignment boundary. Scsi-ml blindly requeues the I/O
without checking the alignment boundary of the I/O request for the
remaining bytes. This leads to errors, since devices cannot perform
non-aligned read/write operations.
This patch fixes the issue in the driver. It aligns unaligned
completions of FS requests, by truncating them to the nearest
alignment boundary.
Reported-by: Mauricio Faria De Oliveira <mauricfo@linux.vnet.ibm.com>
Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Acked-by: Sreekanth Reddy <Sreekanth.Reddy@broadcom.com>
---
v2->v3:
* Changed division to round_down() [suggestion by Martin].
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 75f3fce..a6b6f58 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -4657,6 +4657,8 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
struct MPT3SAS_DEVICE *sas_device_priv_data;
u32 response_code = 0;
unsigned long flags;
+ unsigned int sector_sz;
+ struct request *req;
mpi_reply = mpt3sas_base_get_reply_virt_addr(ioc, reply);
scmd = _scsih_scsi_lookup_get_clear(ioc, smid);
@@ -4715,6 +4717,21 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
}
xfer_cnt = le32_to_cpu(mpi_reply->TransferCount);
+
+ /* In case of bogus fw or device, we could end up having
+ * unaligned partial completion. We can force alignment here,
+ * then scsi-ml does not need to handle this misbehavior.
+ */
+ sector_sz = scmd->device->sector_size;
+ req = scmd->request;
+ if (unlikely(sector_sz && req && (req->cmd_type == REQ_TYPE_FS) &&
+ (xfer_cnt % sector_sz))) {
+ sdev_printk(KERN_INFO, scmd->device,
+ "unaligned partial completion avoided (xfer_cnt=%u, sector_sz=%u)\n",
+ xfer_cnt, sector_sz);
+ xfer_cnt = round_down(xfer_cnt, sector_sz);
+ }
+
scsi_set_resid(scmd, scsi_bufflen(scmd) - xfer_cnt);
if (ioc_status & MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE)
log_info = le32_to_cpu(mpi_reply->IOCLogInfo);
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] mpt3sas: Force request partial completion alignment
2017-01-26 18:37 [PATCH v3] mpt3sas: Force request partial completion alignment Guilherme G. Piccoli
@ 2017-02-01 3:34 ` Martin K. Petersen
2017-02-01 11:48 ` Guilherme G. Piccoli
0 siblings, 1 reply; 3+ messages in thread
From: Martin K. Petersen @ 2017-02-01 3:34 UTC (permalink / raw)
To: Guilherme G. Piccoli
Cc: linux-scsi, MPT-FusionLinux.pdl, sathya.prakash, chaitra.basappa,
suganath-prabu.subramani, brking, mauricfo, linuxram,
martin.petersen
>>>>> "Guilherme" == Guilherme G Piccoli <gpiccoli@linux.vnet.ibm.com> writes:
Guilherme> The firmware or device, possibly under a heavy I/O load, can
Guilherme> return on a partial unaligned boundary. Scsi-ml expects these
Guilherme> requests to be completed on an alignment boundary. Scsi-ml
Guilherme> blindly requeues the I/O without checking the alignment
Guilherme> boundary of the I/O request for the remaining bytes. This
Guilherme> leads to errors, since devices cannot perform non-aligned
Guilherme> read/write operations.
Guilherme> This patch fixes the issue in the driver. It aligns unaligned
Guilherme> completions of FS requests, by truncating them to the nearest
Guilherme> alignment boundary.
Applied to 4.10/scsi-fixes.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] mpt3sas: Force request partial completion alignment
2017-02-01 3:34 ` Martin K. Petersen
@ 2017-02-01 11:48 ` Guilherme G. Piccoli
0 siblings, 0 replies; 3+ messages in thread
From: Guilherme G. Piccoli @ 2017-02-01 11:48 UTC (permalink / raw)
To: Martin K. Petersen
Cc: linux-scsi, MPT-FusionLinux.pdl, sathya.prakash, chaitra.basappa,
suganath-prabu.subramani, brking, mauricfo, linuxram
On 01/02/2017 01:34, Martin K. Petersen wrote:
>>>>>> "Guilherme" == Guilherme G Piccoli <gpiccoli@linux.vnet.ibm.com> writes:
>
> Guilherme> The firmware or device, possibly under a heavy I/O load, can
> Guilherme> return on a partial unaligned boundary. Scsi-ml expects these
> Guilherme> requests to be completed on an alignment boundary. Scsi-ml
> Guilherme> blindly requeues the I/O without checking the alignment
> Guilherme> boundary of the I/O request for the remaining bytes. This
> Guilherme> leads to errors, since devices cannot perform non-aligned
> Guilherme> read/write operations.
>
> Guilherme> This patch fixes the issue in the driver. It aligns unaligned
> Guilherme> completions of FS requests, by truncating them to the nearest
> Guilherme> alignment boundary.
>
> Applied to 4.10/scsi-fixes.
>
Thanks Martin!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-01 11:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-26 18:37 [PATCH v3] mpt3sas: Force request partial completion alignment Guilherme G. Piccoli
2017-02-01 3:34 ` Martin K. Petersen
2017-02-01 11:48 ` Guilherme G. Piccoli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.