Commit 52c9aa1a authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Marek Szyprowski
Browse files

ARM: dma-mapping: Reduce struct page exposure in arch_sync_dma*() 



As a preparation to changing from .map_page to use .map_phys DMA
callbacks, convert arch_sync_dma*() functions to use physical addresses
instead of struct page.

Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20251015-remove-map-page-v5-3-3bbfe3a25cdf@kernel.org
parent 45fa6d19

arch/arm/mm/dma-mapping.c

+31 −51
Original line number Diff line number Diff line
@@ -624,16 +624,14 @@ static void __arm_dma_free(struct device *dev, size_t size, void *cpu_addr, 
	kfree(buf);

}



static void dma_cache_maint_page(struct page *page, unsigned long offset,

	size_t size, enum dma_data_direction dir,

static void dma_cache_maint_page(phys_addr_t phys, size_t size,

	enum dma_data_direction dir,

	void (*op)(const void *, size_t, int))

{

	unsigned long pfn;

	unsigned long offset = offset_in_page(phys);

	unsigned long pfn = __phys_to_pfn(phys);

	size_t left = size;



	pfn = page_to_pfn(page) + offset / PAGE_SIZE;

	offset %= PAGE_SIZE;



	/*

	 * A single sg entry may refer to multiple physically contiguous

	 * pages.  But we still need to process highmem pages individually.
@@ -644,17 +642,18 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, 
		size_t len = left;

		void *vaddr;



		page = pfn_to_page(pfn);



		if (PageHighMem(page)) {

		phys = __pfn_to_phys(pfn);

		if (PhysHighMem(phys)) {

			if (len + offset > PAGE_SIZE)

				len = PAGE_SIZE - offset;



			if (cache_is_vipt_nonaliasing()) {

				vaddr = kmap_atomic(page);

				vaddr = kmap_atomic_pfn(pfn);

				op(vaddr + offset, len, dir);

				kunmap_atomic(vaddr);

			} else {

				struct page *page = phys_to_page(phys);



				vaddr = kmap_high_get(page);

				if (vaddr) {

					op(vaddr + offset, len, dir);
@@ -662,7 +661,8 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, 
				}

			}

		} else {

			vaddr = page_address(page) + offset;

			phys += offset;

			vaddr = phys_to_virt(phys);

			op(vaddr, len, dir);

		}

		offset = 0;
@@ -676,14 +676,11 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, 
 * Note: Drivers should NOT use this function directly.

 * Use the driver DMA support - see dma-mapping.h (dma_sync_*)

 */

static void __dma_page_cpu_to_dev(struct page *page, unsigned long off,

	size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,

			      enum dma_data_direction dir)

{

	phys_addr_t paddr;



	dma_cache_maint_page(page, off, size, dir, dmac_map_area);

	dma_cache_maint_page(paddr, size, dir, dmac_map_area);



	paddr = page_to_phys(page) + off;

	if (dir == DMA_FROM_DEVICE) {

		outer_inv_range(paddr, paddr + size);

	} else {
@@ -692,17 +689,15 @@ static void __dma_page_cpu_to_dev(struct page *page, unsigned long off, 
	/* FIXME: non-speculating: flush on bidirectional mappings? */

}



static void __dma_page_dev_to_cpu(struct page *page, unsigned long off,

	size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,

			   enum dma_data_direction dir)

{

	phys_addr_t paddr = page_to_phys(page) + off;



	/* FIXME: non-speculating: not required */

	/* in any case, don't bother invalidating if DMA to device */

	if (dir != DMA_TO_DEVICE) {

		outer_inv_range(paddr, paddr + size);



		dma_cache_maint_page(page, off, size, dir, dmac_unmap_area);

		dma_cache_maint_page(paddr, size, dir, dmac_unmap_area);

	}



	/*
@@ -1205,7 +1200,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, 
		unsigned int len = PAGE_ALIGN(s->offset + s->length);



		if (!dev->dma_coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))

			__dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir);

			arch_sync_dma_for_device(sg_phys(s), s->length, dir);



		prot = __dma_info_to_prot(dir, attrs);
@@ -1307,8 +1302,7 @@ static void arm_iommu_unmap_sg(struct device *dev, 
			__iommu_remove_mapping(dev, sg_dma_address(s),

					       sg_dma_len(s));

		if (!dev->dma_coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))

			__dma_page_dev_to_cpu(sg_page(s), s->offset,

					      s->length, dir);

			arch_sync_dma_for_cpu(sg_phys(s), s->length, dir);

	}

}
@@ -1330,7 +1324,7 @@ static void arm_iommu_sync_sg_for_cpu(struct device *dev, 
		return;



	for_each_sg(sg, s, nents, i)

		__dma_page_dev_to_cpu(sg_page(s), s->offset, s->length, dir);

		arch_sync_dma_for_cpu(sg_phys(s), s->length, dir);



}
@@ -1352,7 +1346,7 @@ static void arm_iommu_sync_sg_for_device(struct device *dev, 
		return;



	for_each_sg(sg, s, nents, i)

		__dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir);

		arch_sync_dma_for_device(sg_phys(s), s->length, dir);

}



/**
@@ -1374,7 +1368,7 @@ static dma_addr_t arm_iommu_map_page(struct device *dev, struct page *page, 
	int ret, prot, len = PAGE_ALIGN(size + offset);



	if (!dev->dma_coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))

		__dma_page_cpu_to_dev(page, offset, size, dir);

		arch_sync_dma_for_device(page_to_phys(page), offset, size, dir);



	dma_addr = __alloc_iova(mapping, len);

	if (dma_addr == DMA_MAPPING_ERROR)
@@ -1407,7 +1401,6 @@ static void arm_iommu_unmap_page(struct device *dev, dma_addr_t handle, 
{

	struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);

	dma_addr_t iova = handle & PAGE_MASK;

	struct page *page;

	int offset = handle & ~PAGE_MASK;

	int len = PAGE_ALIGN(size + offset);
@@ -1415,8 +1408,9 @@ static void arm_iommu_unmap_page(struct device *dev, dma_addr_t handle, 
		return;



	if (!dev->dma_coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) {

		page = phys_to_page(iommu_iova_to_phys(mapping->domain, iova));

		__dma_page_dev_to_cpu(page, offset, size, dir);

		phys_addr_t phys = iommu_iova_to_phys(mapping->domain, iova);



		arch_sync_dma_for_cpu(phys + offset, size, dir);

	}



	iommu_unmap(mapping->domain, iova, len);
@@ -1485,14 +1479,14 @@ static void arm_iommu_sync_single_for_cpu(struct device *dev, 
{

	struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);

	dma_addr_t iova = handle & PAGE_MASK;

	struct page *page;

	unsigned int offset = handle & ~PAGE_MASK;

	phys_addr_t phys;



	if (dev->dma_coherent || !iova)

		return;



	page = phys_to_page(iommu_iova_to_phys(mapping->domain, iova));

	__dma_page_dev_to_cpu(page, offset, size, dir);

	phys = iommu_iova_to_phys(mapping->domain, iova);

	arch_sync_dma_for_cpu(phys + offset, size, dir);

}



static void arm_iommu_sync_single_for_device(struct device *dev,
@@ -1500,14 +1494,14 @@ static void arm_iommu_sync_single_for_device(struct device *dev, 
{

	struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);

	dma_addr_t iova = handle & PAGE_MASK;

	struct page *page;

	unsigned int offset = handle & ~PAGE_MASK;

	phys_addr_t phys;



	if (dev->dma_coherent || !iova)

		return;



	page = phys_to_page(iommu_iova_to_phys(mapping->domain, iova));

	__dma_page_cpu_to_dev(page, offset, size, dir);

	phys = iommu_iova_to_phys(mapping->domain, iova);

	arch_sync_dma_for_device(phys + offset, size, dir);

}



static const struct dma_map_ops iommu_ops = {
@@ -1794,20 +1788,6 @@ void arch_teardown_dma_ops(struct device *dev) 
	set_dma_ops(dev, NULL);

}



void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	__dma_page_cpu_to_dev(phys_to_page(paddr), paddr & (PAGE_SIZE - 1),

			      size, dir);

}



void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,

		enum dma_data_direction dir)

{

	__dma_page_dev_to_cpu(phys_to_page(paddr), paddr & (PAGE_SIZE - 1),

			      size, dir);

}



void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,

		gfp_t gfp, unsigned long attrs)

{