Skip to content

Commit 817fc97

Browse files
willdeaconmstsirkin
authored andcommitted
virtio_ring: Fix querying of maximum DMA mapping size for virtio device
virtio_max_dma_size() returns the maximum DMA mapping size of the virtio device by querying dma_max_mapping_size() for the device when the DMA API is in use for the vring. Unfortunately, the device passed is initialised by register_virtio_device() and does not inherit the DMA configuration from its parent, resulting in SWIOTLB errors when bouncing is enabled and the default 256K mapping limit (IO_TLB_SEGSIZE) is not respected: | virtio-pci 0000:00:01.0: swiotlb buffer is full (sz: 294912 bytes), total 1024 (slots), used 725 (slots) Follow the pattern used elsewhere in the virtio_ring code when calling into the DMA layer and pass the parent device to dma_max_mapping_size() instead. Cc: Marc Zyngier <[email protected]> Cc: Quentin Perret <[email protected]> Cc: "Michael S. Tsirkin" <[email protected]> Cc: Jason Wang <[email protected]> Signed-off-by: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Jason Wang <[email protected]> Tested-by: Suzuki K Poulose <[email protected]> Fixes: e6d6dd6 ("virtio: Introduce virtio_max_dma_size()") Cc: Joerg Roedel <[email protected]> Cc: Konrad Rzeszutek Wilk <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Robin Murphy <[email protected]> Signed-off-by: Steven Price <[email protected]> Signed-off-by: Suzuki K Poulose <[email protected]> Cc: [email protected] Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 27d9839 commit 817fc97

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/virtio/virtio_ring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ size_t virtio_max_dma_size(struct virtio_device *vdev)
268268
size_t max_segment_size = SIZE_MAX;
269269

270270
if (vring_use_dma_api(vdev))
271-
max_segment_size = dma_max_mapping_size(&vdev->dev);
271+
max_segment_size = dma_max_mapping_size(vdev->dev.parent);
272272

273273
return max_segment_size;
274274
}

0 commit comments

Comments
 (0)