diff options
| author | Eric Auger <eric.auger@redhat.com> | 2020-06-23 15:07:55 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-06-23 15:14:41 +0300 |
| commit | 8e36baf97b252cdcafa53589e8227cbb1e85f0b0 (patch) | |
| tree | 01f841655986c81328cd65e4a66b75c7ba0e1acb /kernel/dma | |
| parent | d07ae4c486908615ab336b987c7c367d132fd844 (diff) | |
| download | linux-8e36baf97b252cdcafa53589e8227cbb1e85f0b0.tar.xz | |
dma-remap: align the size in dma_common_*_remap()
Running a guest with a virtio-iommu protecting virtio devices
is broken since commit 515e5b6d90d4 ("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: 515e5b6d90d4 ("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>
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/remap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c index e739a6eea6e7..78b23f089cf1 100644 --- a/kernel/dma/remap.c +++ b/kernel/dma/remap.c @@ -24,7 +24,8 @@ void *dma_common_pages_remap(struct page **pages, size_t size, { 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) find_vm_area(vaddr)->pages = pages; 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, pgprot_t prot, const void *caller) { - int count = size >> PAGE_SHIFT; + int count = PAGE_ALIGN(size) >> PAGE_SHIFT; struct page **pages; void *vaddr; int i; |