dma/pool: Ensure DMA_DIRECT_REMAP allocations are decrypted
Subsystems (2)
PATCH v2 1/1 dma/pool: Ensure DMA_DIRECT_REMAP allocations are decrypted
When CONFIG_DMA_DIRECT_REMAP is enabled, atomic pool pages are remapped via dma_common_contiguous_remap() using the supplied pgprot. Currently, the mapping uses pgprot_dmacoherent(PAGE_KERNEL), which leaves the memory encrypted on systems with memory encryption enabled (e.g., ARM CCA Realms).
This can cause the DMA layer to fail or crash when accessing the memory, as the underlying physical pages are not configured as expected.
Fix this by requesting a decrypted mapping in the vmap() call:
pgprot_decrypted(pgprot_dmacoherent(PAGE_KERNEL))
This ensures that atomic pool memory is consistently mapped unencrypted.
--- kernel/dma/pool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/dma/pool.c +2 -2
@@ -102,8 +102,8 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,#ifdef CONFIG_DMA_DIRECT_REMAP addr =dma_common_contiguous_remap (page, pool_size, -pgprot_dmacoherent (PAGE_KERNEL ), -__builtin_return_address (0 )); +pgprot_decrypted (pgprot_dmacoherent (PAGE_KERNEL )), +__builtin_return_address (0 ));if (!addr) goto free_page;#else
Signature · 1 line
2.25.1
Quoted 10 lines · Shanker Donthineni
When
CONFIG_DMA_DIRECT_REMAPis enabled, atomic pool pages are remapped viadma_common_contiguous_remap()using the supplied pgprot. Currently, the mapping usespgprot_dmacoherent(PAGE_KERNEL), which leaves the memory encrypted on systems with memory encryption enabled (e.g., ARM CCA Realms).This can cause the DMA layer to fail or crash when accessing the memory, as the underlying physical pages are not configured as expected.
Quoted 8 lines
Fix this by requesting a decrypted mapping in the
vmap()call:
pgprot_decrypted(pgprot_dmacoherent(PAGE_KERNEL))This ensures that atomic pool memory is consistently mapped unencrypted.
Signed-off-by Shanker Donthineni <[email protected]>
Quoted 10 lines · Shanker Donthineni
When
CONFIG_DMA_DIRECT_REMAPis enabled, atomic pool pages are remapped viadma_common_contiguous_remap()using the supplied pgprot. Currently, the mapping usespgprot_dmacoherent(PAGE_KERNEL), which leaves the memory encrypted on systems with memory encryption enabled (e.g., ARM CCA Realms).This can cause the DMA layer to fail or crash when accessing the memory, as the underlying physical pages are not configured as expected.
Quoted 8 lines
Fix this by requesting a decrypted mapping in the
vmap()call:
pgprot_decrypted(pgprot_dmacoherent(PAGE_KERNEL))This ensures that atomic pool memory is consistently mapped unencrypted.
Signed-off-by Shanker Donthineni <[email protected]>
Thanks, applied to dma-mapping-fixes branch.
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland