xtensa dma-mapping tidyups
Hi Chris and Max,
this small series has a few tweaks to the xtensa dma-mapping code.
It is against the dma-mapping tree:
git://git.infradead.org/users/hch/dma-mapping.git for-next
Gitweb:
http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/for-next
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/3 xtensa: remove partial support for DMA buffers in high memory
This reverts commit 6137e4166004e2ec383ac05d5ca15831f4668806.
We explicitly clear GFP_HIGHMEM from the allowed dma flags at the beginning of the function (and the generic dma_alloc_attr function calling us does the same!), so this code just adds dead wood.
--- arch/xtensa/kernel/pci-dma.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
arch/xtensa/kernel/pci-dma.c +2 -18
@@ -171,20 +171,6 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,return page; } -#ifdef CONFIG_MMU -if (PageHighMem (page)) { -void *p; - - p =dma_common_contiguous_remap (page, size,VM_MAP , -pgprot_noncached (PAGE_KERNEL ), -__builtin_return_address (0 )); -if (!p) { -if (!dma_release_from_contiguous (dev, page, count)) -__free_pages (page,get_order (size)); - } -return p; - } -#endif BUG_ON (!platform_vaddr_cached (page_address (page)));__invalidate_dcache_range ((unsigned long )page_address (page), size);return platform_vaddr_to_uncached (page_address (page));
@@ -201,10 +187,8 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, }else if (platform_vaddr_uncached (vaddr)) { page =virt_to_page (platform_vaddr_to_cached (vaddr)); }else { -#ifdef CONFIG_MMU -dma_common_free_remap (vaddr, size,VM_MAP ); -#endif - page =pfn_to_page (PHYS_PFN (dma_to_phys (dev, dma_handle))); +WARN_ON_ONCE (1 ); +return ; }if (!dma_release_from_contiguous (dev, page, count))
Signature · 1 line
2.18.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 1/3] xtensa: remove partial support for DMA buffers in high memory
Hi Christoph,
Quoted 5 lines · Christoph Hellwig
This reverts commit
6137e4166004e2ec383ac05d5ca15831f4668806.We explicitly clear
GFP_HIGHMEMfrom the allowed dma flags at the beginning of the function (and the genericdma_alloc_attrfunction calling us does the same!), so this code just adds dead wood.
No, not really: dma_alloc_from_contiguous does not accept flags (only no_warn bit)
and may return arbitrary pages. That's the case that this code is handling.
Signature · 2 lines
Thanks. -- Max
A message that is not in the archive (sent off-list or not yet received): CAMo8BfKyW+3t+L+oQ+nDyEs8KcASPC8CeUP3QPoANQC=XKP9hg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 1/3] xtensa: remove partial support for DMA buffers in high memory
Quoted 5 lines · Max Filippov
Hi Christoph,
Quoted 2 lines · Christoph Hellwig
This reverts commit
6137e4166004e2ec383ac05d5ca15831f4668806.
Quoted 7 lines
Quoted 3 lines
We explicitly clear
GFP_HIGHMEMfrom the allowed dma flags at the beginning of the function (and the genericdma_alloc_attrfunction calling us does the same!), so this code just adds dead wood.No, not really:
dma_alloc_from_contiguousdoes not accept flags (onlyno_warnbit)
and may return arbitrary pages. That's the case that this code is handling.
dma_alloc_from_contiguous calls cma_alloc to do the actual allocation, and that uses alloc_contig_range with the GFP_KERNEL flag. How do you end up getting highmem patches from it?
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 1/3] xtensa: remove partial support for DMA buffers in high memory
Quoted 10 lines · Christoph Hellwig
Quoted 9 lines · Max Filippov
Hi Christoph,
Quoted 5 lines · Christoph Hellwig
This reverts commit
6137e4166004e2ec383ac05d5ca15831f4668806.We explicitly clear
GFP_HIGHMEMfrom the allowed dma flags at the beginning of the function (and the genericdma_alloc_attrfunction calling us does the same!), so this code just adds dead wood.
Quoted 7 lines
Quoted 3 lines
No, not really:
dma_alloc_from_contiguousdoes not accept flags (onlyno_warnbit)
and may return arbitrary pages. That's the case that this code is handling.
dma_alloc_from_contiguouscallscma_allocto do the actual allocation, and that usesalloc_contig_rangewith theGFP_KERNELflag. How do you end up getting highmem patches from it?
I'm not familiar with the details of alloc_contig_range implementation, but I don't see how gfp_mask is used to limit allocation to non-high memory. So when alloc_contig_range gets start and end PFNs in high memory (from the CMA region allocated in high memory) it just returns high memory pages -- that's what I see.
Signature · 2 lines
Thanks. -- Max
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 1/3] xtensa: remove partial support for DMA buffers in high memory
Quoted 6 lines · Max Filippov
Quoted 5 lines
I'm not familiar with the details of
alloc_contig_rangeimplementation, but I don't see howgfp_maskis used to limit allocation to non-high memory. So whenalloc_contig_rangegets start and end PFNs in high memory (from the CMA region allocated in high memory) it just returns high memory pages
Correct. alloc_contig_range doesn’t care where the PFNs are. The gpf_mask is completely ignored in this regard.
Quoted 1 line
Quoted 1 line
-- that's what I see.
Quoted 1 line · Christoph Hellwig
I can't see what prevents people from doing a CMA in high memory either,
That’s a feature. CMA can be configured such that different devices use different regions. One use case is separation of devices; another is devices with different address limits.
Quoted 5 lines
which is bad as except for arm non of the callers handles it completely (and that includes xtensa, more below).
CMA maintainers - is it intentional that CMA can be used to reserve and return highmem pages?
What Joonsoo said. I’ll just add that what you want to look at are invocations of dma_contiguous_reserve. For xtensa it’s:
arch/xtensa/mm/init.c: dma_contiguous_reserve(PFN_PHYS(max_low_pfn));
which means that CMA’s default region will be placed below max_low_pfn. Undesired high memory CMA allocations on a given platform indicate that platform’s init code incorrectly places CMA region or the region is incorrectly configured in device tree.
Signature · 7 lines
Best regards ミハウ “𝓶𝓲𝓷𝓪86” ナザレヴイツ «If at first you don’t succeed, give up skydiving» _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 1/3] xtensa: remove partial support for DMA buffers in high memory
In reply to a message not in the archiveQuoted 10 lines · Christoph Hellwig
Quoted 5 lines · Max Filippov
I'm not familiar with the details of
alloc_contig_rangeimplementation, but I don't see howgfp_maskis used to limit allocation to non-high memory. So whenalloc_contig_rangegets start and end PFNs in high memory (from the CMA region allocated in high memory) it just returns high memory pages -- that's what I see.I can't see what prevents people from doing a CMA in high memory either, which is bad as except for arm non of the callers handles it completely (and that includes xtensa, more below).
So far it was useful and sufficient for us.
Quoted 3 lines
xtensa is partially prepared for
it as it can remap indma_alloc, but it is missing handling in either the ->mmap or ->get_sgtable methods.
I'd rather implement the missing parts or put a WARN there if implementing it is too hard or impossible than remove the existing partial support.
Signature · 2 lines
Thanks. -- Max
PATCH 2/3 xtensa: remove ZONE_DMA
In reply to a message not in the archiveZONE_DMA is intended for magic < 32-bit pools (usually ISA DMA), which isn't required on xtensa. Move all the non-highmem memory into ZONE_NORMAL instead to match other architectures.
--- arch/xtensa/Kconfig | 3 --- arch/xtensa/mm/init.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
arch/xtensa/Kconfig +0 -3
@@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -config ZONE_DMA - def_bool y - config XTENSA def_bool y select ARCH_HAS_SYNC_DMA_FOR_CPU
arch/xtensa/mm/init.c +1 -1
@@ -71,7 +71,7 @@ void __init zones_init(void) {/* All pages are DMA-able, so we put them all in the DMA zone. */ unsigned long zones_size[MAX_NR_ZONES ] = { - [ZONE_DMA ] = max_low_pfn -ARCH_PFN_OFFSET , + [ZONE_NORMAL ] = max_low_pfn -ARCH_PFN_OFFSET , #ifdef CONFIG_HIGHMEM [ZONE_HIGHMEM ] = max_pfn - max_low_pfn, #endif
Signature · 1 line
2.18.0
PATCH 3/3 xtensa: use dma_direct_{alloc,free}_pages
In reply to a message not in the archiveUse the generic helpers for dma allocation instead of opencoding them with slightly less bells and whistles.
--- arch/xtensa/kernel/pci-dma.c | 48 ++++++++++-------------------------- 1 file changed, 13 insertions(+), 35 deletions(-)
arch/xtensa/kernel/pci-dma.c +13 -35
@@ -141,56 +141,34 @@ void __attribute__((weak)) *platform_vaddr_to_cached(void *p)* Note: We assume that the full memory space is always mapped to 'kseg' * Otherwise we have to use page attributes (not implemented). */ - -void *arch_dma_alloc (struct device *dev,size_t size,dma_addr_t *handle, -gfp_t flag,unsigned long attrs) +void *arch_dma_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle, +gfp_t gfp,unsigned long attrs) { -unsigned long count =PAGE_ALIGN (size) >>PAGE_SHIFT ; -struct page *page =NULL ; - -/* ignore region speicifiers */ - - flag &= ~(__GFP_DMA | __GFP_HIGHMEM); - -if (dev ==NULL || (dev->coherent_dma_mask <0xffffffff )) - flag |=GFP_DMA ; - -if (gfpflags_allow_blocking (flag)) - page =dma_alloc_from_contiguous (dev, count,get_order (size), - flag & __GFP_NOWARN); +void *vaddr; -if (!page) - page =alloc_pages (flag,get_order (size)); - -if (!page) + vaddr =dma_direct_alloc_pages (dev, size, dma_handle, gfp, attrs); +if (!vaddr)return NULL ; - *handle =phys_to_dma (dev,page_to_phys (page)); +if (attrs &DMA_ATTR_NO_KERNEL_MAPPING ) +return virt_to_page (vaddr);/* just a random cookie */ -if (attrs &DMA_ATTR_NO_KERNEL_MAPPING ) { -return page; - } - -BUG_ON (!platform_vaddr_cached (page_address (page))); -__invalidate_dcache_range ((unsigned long )page_address (page), size); -return platform_vaddr_to_uncached (page_address (page)); +BUG_ON (!platform_vaddr_cached (vaddr)); +__invalidate_dcache_range ((unsigned long )vaddr, size); +return platform_vaddr_to_uncached (vaddr); }void arch_dma_free (struct device *dev,size_t size,void *vaddr,dma_addr_t dma_handle,unsigned long attrs) { -unsigned long count =PAGE_ALIGN (size) >>PAGE_SHIFT ; -struct page *page; -if (attrs &DMA_ATTR_NO_KERNEL_MAPPING ) { - page = vaddr; + vaddr =page_to_virt ((struct page *)vaddr);/* decode cookie */ }else if (platform_vaddr_uncached (vaddr)) { - page =virt_to_page (platform_vaddr_to_cached (vaddr)); + vaddr =platform_vaddr_to_cached (vaddr); }else {WARN_ON_ONCE (1 );return ; } -if (!dma_release_from_contiguous (dev, page, count)) -__free_pages (page,get_order (size)); +dma_direct_free_pages (dev, size, vaddr, dma_handle, attrs); }
Signature · 1 line
2.18.0