Commit 08a89c28 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-direct check for highmem pages in dma_direct_alloc_pages 



Check for highmem pages from CMA, just like in the dma_direct_alloc path.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 9f4df96b

kernel/dma/direct.c

+11 −0
Original line number Diff line number Diff line
@@ -309,6 +309,17 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, 
	page = __dma_direct_alloc_pages(dev, size, gfp);

	if (!page)

		return NULL;

	if (PageHighMem(page)) {

		/*

		 * Depending on the cma= arguments and per-arch setup

		 * dma_alloc_contiguous could return highmem pages.

		 * Without remapping there is no way to return them here,

		 * so log an error and fail.

		 */

		dev_info(dev, "Rejecting highmem page from CMA.\n");

		goto out_free_pages;

	}



	ret = page_address(page);

	if (force_dma_unencrypted(dev)) {

		if (set_memory_decrypted((unsigned long)ret,