leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/virtio: use virtio_max_dma_size

Browse Source 
We must make sure our scatterlist segments are not too big, otherwise
we might see swiotlb failures (happens with sev, also reproducable with
swiotlb=force).

Suggested-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190821111210.27165-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-08-21 13:12:09 +02:00
parent 8090f7eb31
commit 9b2a0a1ef6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/virtio/virtgpu_object.c
View File

@ -204,6 +204,7 @@ int virtio_gpu_object_get_sg_table(struct virtio_gpu_device *qdev,
.interruptible = false, .interruptible = false,
.no_wait_gpu = false .no_wait_gpu = false
}; };
size_t max_segment;
/* wtf swapping */ /* wtf swapping */
if (bo->pages) if (bo->pages)
@ -215,8 +216,13 @@ int virtio_gpu_object_get_sg_table(struct virtio_gpu_device *qdev,
if (!bo->pages) if (!bo->pages)
goto out; goto out;
ret = sg_alloc_table_from_pages(bo->pages, pages, nr_pages, 0, max_segment = virtio_max_dma_size(qdev->vdev);
nr_pages << PAGE_SHIFT, GFP_KERNEL); max_segment &= PAGE_MASK;
if (max_segment > SCATTERLIST_MAX_SEGMENT)
max_segment = SCATTERLIST_MAX_SEGMENT;
ret = __sg_alloc_table_from_pages(bo->pages, pages, nr_pages, 0,
nr_pages << PAGE_SHIFT,
max_segment, GFP_KERNEL);
if (ret) if (ret)
goto out; goto out;
return 0; return 0;