dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING (cf14be0b) · Commits · 戴 / test

The new DMA_ATTR_NO_KERNEL_MAPPING needs to actually assign a dma_addr to work. Also skip it if the architecture needs forced decryption handling, as that needs a kernel virtual address. Fixes: (dma-direct: handle DMA_ATTR_NO_KERNEL_MAPPING in common code) Signed-off-by:

Christoph Hellwig <hch@lst.de> Reviewed-by:

Lucas Stach <l.stach@pengutronix.de>

kernel/dma/direct.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -130,10 +130,12 @@ void dma_direct_alloc_pages(struct device dev, size_t size,
		if (!page)
		return NULL;

		if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
		if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) &&
		!force_dma_unencrypted(dev)) {
		/* remove any dirty cache lines on the kernel alias */
		if (!PageHighMem(page))
		arch_dma_prep_coherent(page, size);
		*dma_handle = phys_to_dma(dev, page_to_phys(page));
		/* return the page pointer as the opaque cookie */
		return page;
		}
		@@ -178,7 +180,8 @@ void dma_direct_free_pages(struct device dev, size_t size, void cpu_addr,
		{
		unsigned int page_order = get_order(size);

		if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
		if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) &&
		!force_dma_unencrypted(dev)) {
		/* cpu_addr is a struct page cookie, not a kernel address */
		__dma_direct_free_pages(dev, size, cpu_addr);
		return;

Admin message