linux-stable.git/kernel/dma/direct.c, branch v5.7.7

dma-direct: add missing set_memory_decrypted() for coherent mapping

2020-06-30T19:36:07+00:00

[ Upstream commit 1a2b3357e860d890f8045367b179c7e7e802cd71 ]

When a coherent mapping is created in dma_direct_alloc_pages(), it needs
to be decrypted if the device requires unencrypted DMA before returning.

Fixes: 3acac065508f ("dma-mapping: merge the generic remapping helpers into dma-direct")
Signed-off-by: David Rientjes 
Signed-off-by: Christoph Hellwig 
Signed-off-by: Sasha Levin

dma-direct: check return value when encrypting or decrypting memory

2020-06-30T19:36:03+00:00

[ Upstream commit 56fccf21d1961a06e2a0c96ce446ebf036651062 ]

__change_page_attr() can fail which will cause set_memory_encrypted() and
set_memory_decrypted() to return non-zero.

If the device requires unencrypted DMA memory and decryption fails, simply
free the memory and fail.

If attempting to re-encrypt in the failure path and that encryption fails,
there is no alternative other than to leak the memory.

Fixes: c10f07aa27da ("dma/direct: Handle force decryption for DMA coherent buffers in common code")
Signed-off-by: David Rientjes 
Signed-off-by: Christoph Hellwig 
Signed-off-by: Sasha Levin

dma-direct: re-encrypt memory if dma_direct_alloc_pages() fails

2020-06-30T19:36:03+00:00

[ Upstream commit 96a539fa3bb71f443ae08e57b9f63d6e5bb2207c ]

If arch_dma_set_uncached() fails after memory has been decrypted, it needs
to be re-encrypted before freeing.

Fixes: fa7e2247c572 ("dma-direct: make uncached_kernel_address more general")
Signed-off-by: David Rientjes 
Signed-off-by: Christoph Hellwig 
Signed-off-by: Sasha Levin

dma-direct: fix data truncation in dma_direct_get_required_mask()

2020-04-08T18:52:24+00:00

The upper 32-bit physical address gets truncated inadvertently
when dma_direct_get_required_mask() invokes phys_to_dma_direct().
This results in dma_addressing_limited() return incorrect value
when used in platforms with LPAE enabled.
Fix it here by explicitly type casting 'max_pfn' to phys_addr_t
in order to prevent overflow of intermediate value while evaluating
'(max_pfn - 1) << PAGE_SHIFT'.

Signed-off-by: Kishon Vijay Abraham I 
Signed-off-by: Christoph Hellwig

Merge tag 'dma-mapping-5.7' of git://git.infradead.org/users/hch/dma-mapping

2020-04-04T17:12:47+00:00

Pull dma-mapping updates from Christoph Hellwig:

 - fix an integer overflow in the coherent pool (Kevin Grandemange)

 - provide support for in-place uncached remapping and use that for
   openrisc

 - fix the arm coherent allocator to take the bus limit into account

* tag 'dma-mapping-5.7' of git://git.infradead.org/users/hch/dma-mapping:
  ARM/dma-mapping: merge __dma_supported into arm_dma_supported
  ARM/dma-mapping: take the bus limit into account in __dma_alloc
  ARM/dma-mapping: remove get_coherent_dma_mask
  openrisc: use the generic in-place uncached DMA allocator
  dma-direct: provide a arch_dma_clear_uncached hook
  dma-direct: make uncached_kernel_address more general
  dma-direct: consolidate the error handling in dma_direct_alloc_pages
  dma-direct: remove the cached_kernel_address hook
  dma-coherent: fix integer overflow in the reserved-memory dma allocation

dma-direct: provide a arch_dma_clear_uncached hook

2020-03-16T09:48:12+00:00

This allows the arch code to reset the page tables to cached access when
freeing a dma coherent allocation that was set to uncached using
arch_dma_set_uncached.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Robin Murphy

dma-direct: make uncached_kernel_address more general

2020-03-16T09:48:09+00:00

Rename the symbol to arch_dma_set_uncached, and pass a size to it as
well as allow an error return.  That will allow reusing this hook for
in-place pagetable remapping.

As the in-place remap doesn't always require an explicit cache flush,
also detangle ARCH_HAS_DMA_PREP_COHERENT from ARCH_HAS_DMA_SET_UNCACHED.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Robin Murphy

dma-direct: consolidate the error handling in dma_direct_alloc_pages

2020-03-16T09:48:06+00:00

Use a goto label to merge two error return cases.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Robin Murphy

dma-direct: improve DMA mask overflow reporting

2020-02-05T17:53:41+00:00

Remove the unset dma_mask case as that won't get into mapping calls
anymore, and also report the other errors unconditonally and with a
slightly improved message.  Remove the now pointless report_addr helper.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Konrad Rzeszutek Wilk

dma-direct: improve swiotlb error reporting

2020-02-05T17:53:05+00:00

Untangle the way how dma_direct_map_page calls into swiotlb to be able
to properly report errors where the swiotlb DMA address overflows the
mask separately from overflows in the !swiotlb case.  This means that
siotlb_map now has to do a little more work that duplicates
dma_direct_map_page, but doing so greatly simplifies the calling
convention.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Konrad Rzeszutek Wilk