diff options
| author | Greg Edwards <gedwards@ddn.com> | 2018-07-26 15:52:54 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-12-16 22:08:27 +0000 |
| commit | 56b0417092e4c12793276637e010e53b4482d658 (patch) | |
| tree | 23f8ba88ffda1f18b7dfff8c682c98d8c03494fd /drivers/scsi | |
| parent | ed1a4f65447b5475afaf2f13a74cddf332e3e5ad (diff) | |
| download | linux-stable-56b0417092e4c12793276637e010e53b4482d658.tar.gz linux-stable-56b0417092e4c12793276637e010e53b4482d658.tar.bz2 linux-stable-56b0417092e4c12793276637e010e53b4482d658.zip | |
scsi: virtio_scsi: fix pi_bytes{out,in} on 4 KiB block size devices
commit cdcdcaae8450a975e7d07e1bfec21f9b8c016d0c upstream.
When the underlying device is a 4 KiB logical block size device with a
protection interval exponent of 0, i.e. 4096 bytes data + 8 bytes PI, the
driver miscalculates the pi_bytes{out,in} by a factor of 8x (64 bytes).
This leads to errors on all reads and writes on 4 KiB logical block size
devices when CONFIG_BLK_DEV_INTEGRITY is enabled and the
VIRTIO_SCSI_F_T10_PI feature bit has been negotiated.
Fixes: e6dc783a38ec0 ("virtio-scsi: Enable DIF/DIX modes in SCSI host LLD")
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Edwards <gedwards@ddn.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/virtio_scsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 42ecf4c18e2e..b8d67f9f9077 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -500,9 +500,11 @@ static void virtio_scsi_init_hdr_pi(struct virtio_scsi_cmd_req_pi *cmd_pi, bi = blk_get_integrity(rq->rq_disk); if (sc->sc_data_direction == DMA_TO_DEVICE) - cmd_pi->pi_bytesout = blk_rq_sectors(rq) * bi->tuple_size; + cmd_pi->pi_bytesout = bio_integrity_bytes(bi, + blk_rq_sectors(rq)); else if (sc->sc_data_direction == DMA_FROM_DEVICE) - cmd_pi->pi_bytesin = blk_rq_sectors(rq) * bi->tuple_size; + cmd_pi->pi_bytesin = bio_integrity_bytes(bi, + blk_rq_sectors(rq)); } static int virtscsi_queuecommand(struct virtio_scsi *vscsi, |