mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

scsi: virtio_scsi: fix pi_bytes{out,in} on 4 KiB block size devices

Browse source 
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: e6dc783a38 ("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>
This commit is contained in:
Greg Edwards 2018-07-26 15:52:54 -04:00 committed by Jens Axboe
parent 359f642700
commit cdcdcaae84
1 changed files with 4 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/scsi/virtio_scsi.c
View file

@ -513,12 +513,12 @@ static void virtio_scsi_init_hdr_pi(struct virtio_device *vdev,
if (sc->sc_data_direction == DMA_TO_DEVICE) if (sc->sc_data_direction == DMA_TO_DEVICE)
cmd_pi->pi_bytesout = cpu_to_virtio32(vdev, cmd_pi->pi_bytesout = cpu_to_virtio32(vdev,
blk_rq_sectors(rq) * bio_integrity_bytes(bi,
bi->tuple_size); blk_rq_sectors(rq)));
else if (sc->sc_data_direction == DMA_FROM_DEVICE) else if (sc->sc_data_direction == DMA_FROM_DEVICE)
cmd_pi->pi_bytesin = cpu_to_virtio32(vdev, cmd_pi->pi_bytesin = cpu_to_virtio32(vdev,
blk_rq_sectors(rq) * bio_integrity_bytes(bi,
bi->tuple_size); blk_rq_sectors(rq)));
} }
#endif #endif