dma-pool: Only allocate from CMA when in same memory zone (d7e673ec) · Commits · 戴 / test

kernel/dma/pool.c

+30 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,9 @@
		* Copyright (C) 2012 ARM Ltd.
		* Copyright (C) 2020 Google LLC
		*/
		#include <linux/cma.h>
		#include <linux/debugfs.h>
		#include <linux/dma-contiguous.h>
		#include <linux/dma-direct.h>
		#include <linux/dma-noncoherent.h>
		#include <linux/init.h>
		@@ -55,6 +57,29 @@ static void dma_atomic_pool_size_add(gfp_t gfp, size_t size)
		pool_size_kernel += size;
		}

		static bool cma_in_zone(gfp_t gfp)
		{
		unsigned long size;
		phys_addr_t end;
		struct cma *cma;

		cma = dev_get_cma_area(NULL);
		if (!cma)
		return false;

		size = cma_get_size(cma);
		if (!size)
		return false;

		/* CMA can't cross zone boundaries, see cma_activate_area() */
		end = cma_get_base(cma) + size - 1;
		if (IS_ENABLED(CONFIG_ZONE_DMA) && (gfp & GFP_DMA))
		return end <= DMA_BIT_MASK(zone_dma_bits);
		if (IS_ENABLED(CONFIG_ZONE_DMA32) && (gfp & GFP_DMA32))
		return end <= DMA_BIT_MASK(32);
		return true;
		}

		static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,
		gfp_t gfp)
		{
		@@ -68,6 +93,10 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,

		do {
		pool_size = 1 << (PAGE_SHIFT + order);
		if (cma_in_zone(gfp))
		page = dma_alloc_from_contiguous(NULL, 1 << order,
		order, false);
		if (!page)
		page = alloc_pages(gfp, order);
		} while (!page && order-- > 0);
		if (!page)