diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-01-04 18:31:48 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-01-05 08:28:29 +0100 |
| commit | 8270f3a11ceef64bdb0ab141180e8d2f17c619ec (patch) | |
| tree | 15e02d8bce01367246670de4ff4c533ea9d46244 /kernel | |
| parent | 06f55fd2d22742ed7e725124dfea68936d12ce40 (diff) | |
| download | linux-8270f3a11ceef64bdb0ab141180e8d2f17c619ec.tar.gz linux-8270f3a11ceef64bdb0ab141180e8d2f17c619ec.tar.bz2 linux-8270f3a11ceef64bdb0ab141180e8d2f17c619ec.zip | |
dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING for remapped allocations
We need to return a dma_addr_t even if we don't have a kernel mapping.
Do so by consolidating the phys_to_dma call in a single place and jump
to it from all the branches that return successfully.
Fixes: bfd56cd60521 ("dma-mapping: support highmem in the generic remap allocator")
Reported-by: Liviu Dudau <liviu@dudau.co.uk
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Liviu Dudau <liviu@dudau.co.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/remap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c index 18cc09fc27b9..7a723194ecbe 100644 --- a/kernel/dma/remap.c +++ b/kernel/dma/remap.c @@ -204,8 +204,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, ret = dma_alloc_from_pool(size, &page, flags); if (!ret) return NULL; - *dma_handle = phys_to_dma(dev, page_to_phys(page)); - return ret; + goto done; } page = __dma_direct_alloc_pages(dev, size, dma_handle, flags, attrs); @@ -215,8 +214,10 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, /* remove any dirty cache lines on the kernel alias */ arch_dma_prep_coherent(page, size); - if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) - return page; /* opaque cookie */ + if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) { + ret = page; /* opaque cookie */ + goto done; + } /* create a coherent mapping */ ret = dma_common_contiguous_remap(page, size, VM_USERMAP, @@ -227,9 +228,9 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, return ret; } - *dma_handle = phys_to_dma(dev, page_to_phys(page)); memset(ret, 0, size); - +done: + *dma_handle = phys_to_dma(dev, page_to_phys(page)); return ret; } |