AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

dma-remap: align the size in dma_common_*_remap()

Browse Source 
Running a guest with a virtio-iommu protecting virtio devices
is broken since commit 515e5b6d90 ("dma-mapping: use vmap insted
of reimplementing it"). Before the conversion, the size was
page aligned in __get_vm_area_node(). Doing so fixes the
regression.

Fixes: 515e5b6d90 ("dma-mapping: use vmap insted of reimplementing it")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Eric Auger 2020-06-23 14:07:55 +02:00 committed by Christoph Hellwig
parent d07ae4c486
commit 8e36baf97b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/dma/remap.c
View File

@ -24,7 +24,8 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
{ {
void *vaddr; void *vaddr;
vaddr = vmap(pages, size >> PAGE_SHIFT, VM_DMA_COHERENT, prot); vaddr = vmap(pages, PAGE_ALIGN(size) >> PAGE_SHIFT,
VM_DMA_COHERENT, prot);
if (vaddr) if (vaddr)
find_vm_area(vaddr)->pages = pages; find_vm_area(vaddr)->pages = pages;
return vaddr; return vaddr;
@ -37,7 +38,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
void *dma_common_contiguous_remap(struct page *page, size_t size, void *dma_common_contiguous_remap(struct page *page, size_t size,
pgprot_t prot, const void *caller) pgprot_t prot, const void *caller)
{ {
int count = size >> PAGE_SHIFT; int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
struct page **pages; struct page **pages;
void *vaddr; void *vaddr;
int i; int i;