use generic dma-direct and swiotlb code for x86 V3
Subsystems (15)
Hi all,
this series switches the x86 code the the dma-direct implementation for direct (non-iommu) dma and the generic swiotlb ops. This includes getting rid of the special ops for the AMD memory encryption case and the STA2x11 SOC. The generic implementations are based on the x86 code, so they provide the same functionality.
Changes since V2:
- minor changelog tweaks
- made is_sta2x11 a plain bool
Changes since V1:
- fix the length in the set_memory_decrypted call
- fix the SEV case
PATCH 1/14 x86: remove X86_PPRO_FENCE
There were only a few Pentium Pro multiprocessors systems where this errata applied. They are more than 20 years old now, and we've slowly dropped places where put the workarounds in and discouraged anyone from enabling the workaround.
Get rid of it for good.
--- arch/x86/Kconfig.cpu | 13 ------------- arch/x86/entry/vdso/vdso32/vclock_gettime.c | 2 -- arch/x86/include/asm/barrier.h | 30 ----------------------------- arch/x86/include/asm/io.h | 15 --------------- arch/x86/kernel/pci-nommu.c | 19 ------------------ arch/x86/um/asm/barrier.h | 4 ---- 6 files changed, 83 deletions(-)
arch/x86/Kconfig.cpu +0 -13
@@ -315,19 +315,6 @@ config X86_L1_CACHE_SHIFT default "4" if MELAN || M486 || MGEODEGX1 default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX -config X86_PPRO_FENCE - bool "PentiumPro memory ordering errata workaround" - depends on M686 || M586MMX || M586TSC || M586 || M486 || MGEODEGX1 - ---help--- - Old PentiumPro multiprocessor systems had errata that could cause - memory operations to violate the x86 ordering standard in rare cases. - Enabling this option will attempt to work around some (but not all) - occurrences of this problem, at the cost of much heavier spinlock and - memory barrier operations. - - If unsure, say n here. Even distro kernels should think twice before - enabling this: there are few systems, and an unlikely bug. - config X86_F00F_BUG def_bool y depends on M586MMX || M586TSC || M586 || M486
arch/x86/entry/vdso/vdso32/vclock_gettime.c +0 -2
@@ -5,8 +5,6 @@#undef CONFIG_OPTIMIZE_INLINING#endif -#undef CONFIG_X86_PPRO_FENCE -#ifdef CONFIG_X86_64 /*
arch/x86/include/asm/barrier.h +0 -30
@@ -52,11 +52,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,#define barrier_nospec () alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, \ "lfence", X86_FEATURE_LFENCE_RDTSC) -#ifdef CONFIG_X86_PPRO_FENCE -#define dma_rmb () rmb() -#else #define dma_rmb () barrier() -#endif #define dma_wmb () barrier()#ifdef CONFIG_X86_32
@@ -68,30 +64,6 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,#define __smp_wmb () barrier()#define __smp_store_mb (var, value) do { (void)xchg(&var, value); } while (0) -#if defined(CONFIG_X86_PPRO_FENCE ) - -/* -* For this option x86 doesn't have a strong TSO memory -* model and we should fall back to full barriers. -*/ - -#define __smp_store_release (p, v) \ -do { \ - compiletime_assert_atomic_type(*p); \ - __smp_mb(); \ - WRITE_ONCE(*p, v); \ -} while (0) - -#define __smp_load_acquire (p) \ -({ \ - typeof(*p) ___p1 = READ_ONCE(*p); \ - compiletime_assert_atomic_type(*p); \ - __smp_mb(); \ - ___p1; \ -}) - -#else /* regular x86 TSO memory ordering */ -#define __smp_store_release (p, v) \ do { \ compiletime_assert_atomic_type(*p); \
@@ -107,8 +79,6 @@ do { \ ___p1; \ }) -#endif -/* Atomic operations are already serializing on x86 */ #define __smp_mb__before_atomic () barrier()#define __smp_mb__after_atomic () barrier()
arch/x86/include/asm/io.h +0 -15
@@ -232,21 +232,6 @@ extern void set_iounmap_nonlazy(void);*/ #define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) -/* -* Cache management -* -* This needed for two cases -* 1. Out of order aware processors -* 2. Accidentally out of order processors (PPro errata #51) -*/ - -static inline void flush_write_buffers (void ) -{ -#if defined(CONFIG_X86_PPRO_FENCE ) - asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); -#endif -} -#endif /* __KERNEL__ */ extern void native_io_delay (void );
arch/x86/kernel/pci-nommu.c +0 -19
@@ -37,7 +37,6 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page,WARN_ON (size ==0 );if (!check_addr ("map_single" , dev, bus, size))return NOMMU_MAPPING_ERROR ; -flush_write_buffers ();return bus; }
@@ -72,25 +71,9 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,return 0 ; s->dma_length = s->length; } -flush_write_buffers ();return nents; } -static void nommu_sync_single_for_device (struct device *dev, -dma_addr_t addr,size_t size, -enum dma_data_direction dir) -{ -flush_write_buffers (); -} - - -static void nommu_sync_sg_for_device (struct device *dev, -struct scatterlist *sg,int nelems, -enum dma_data_direction dir) -{ -flush_write_buffers (); -} -static int nommu_mapping_error (struct device *dev,dma_addr_t dma_addr) {return dma_addr ==NOMMU_MAPPING_ERROR ;
@@ -101,8 +84,6 @@ const struct dma_map_ops nommu_dma_ops = { .free = dma_generic_free_coherent, .map_sg = nommu_map_sg, .map_page = nommu_map_page, - .sync_single_for_device = nommu_sync_single_for_device, - .sync_sg_for_device = nommu_sync_sg_for_device, .is_phys = 1, .mapping_error = nommu_mapping_error, .dma_supported = x86_dma_supported,
arch/x86/um/asm/barrier.h +0 -4
@@ -30,11 +30,7 @@#endif /* CONFIG_X86_32 */ -#ifdef CONFIG_X86_PPRO_FENCE -#define dma_rmb () rmb() -#else /* CONFIG_X86_PPRO_FENCE */ #define dma_rmb () barrier() -#endif /* CONFIG_X86_PPRO_FENCE */ #define dma_wmb () barrier()#include <asm-generic/barrier.h>
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/pti] x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk
x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk
Commit-ID: 5927145efd5de71976e62e2822511b13014d7e56 Gitweb: https://git.kernel.org/tip/5927145efd5de71976e62e2822511b13014d7e56 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:13 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:05 +0100
x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk
There were only a few Pentium Pro multiprocessors systems where this errata applied. They are more than 20 years old now, and we've slowly dropped places which put the workarounds in and discouraged anyone from enabling the workaround.
Get rid of it for good.
--- arch/x86/Kconfig.cpu | 13 ------------- arch/x86/entry/vdso/vdso32/vclock_gettime.c | 2 -- arch/x86/include/asm/barrier.h | 30 ----------------------------- arch/x86/include/asm/io.h | 15 --------------- arch/x86/kernel/pci-nommu.c | 19 ------------------ arch/x86/um/asm/barrier.h | 4 ---- 6 files changed, 83 deletions(-)
arch/x86/Kconfig.cpu +0 -13
@@ -315,19 +315,6 @@ config X86_L1_CACHE_SHIFT default "4" if MELAN || M486 || MGEODEGX1 default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX -config X86_PPRO_FENCE - bool "PentiumPro memory ordering errata workaround" - depends on M686 || M586MMX || M586TSC || M586 || M486 || MGEODEGX1 - ---help--- - Old PentiumPro multiprocessor systems had errata that could cause - memory operations to violate the x86 ordering standard in rare cases. - Enabling this option will attempt to work around some (but not all) - occurrences of this problem, at the cost of much heavier spinlock and - memory barrier operations. - - If unsure, say n here. Even distro kernels should think twice before - enabling this: there are few systems, and an unlikely bug. - config X86_F00F_BUG def_bool y depends on M586MMX || M586TSC || M586 || M486
arch/x86/entry/vdso/vdso32/vclock_gettime.c +0 -2
@@ -5,8 +5,6 @@#undef CONFIG_OPTIMIZE_INLINING#endif -#undef CONFIG_X86_PPRO_FENCE -#ifdef CONFIG_X86_64 /*
arch/x86/include/asm/barrier.h +0 -30
@@ -52,11 +52,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,#define barrier_nospec () alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, \ "lfence", X86_FEATURE_LFENCE_RDTSC) -#ifdef CONFIG_X86_PPRO_FENCE -#define dma_rmb () rmb() -#else #define dma_rmb () barrier() -#endif #define dma_wmb () barrier()#ifdef CONFIG_X86_32
@@ -68,30 +64,6 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,#define __smp_wmb () barrier()#define __smp_store_mb (var, value) do { (void)xchg(&var, value); } while (0) -#if defined(CONFIG_X86_PPRO_FENCE ) - -/* -* For this option x86 doesn't have a strong TSO memory -* model and we should fall back to full barriers. -*/ - -#define __smp_store_release (p, v) \ -do { \ - compiletime_assert_atomic_type(*p); \ - __smp_mb(); \ - WRITE_ONCE(*p, v); \ -} while (0) - -#define __smp_load_acquire (p) \ -({ \ - typeof(*p) ___p1 = READ_ONCE(*p); \ - compiletime_assert_atomic_type(*p); \ - __smp_mb(); \ - ___p1; \ -}) - -#else /* regular x86 TSO memory ordering */ -#define __smp_store_release (p, v) \ do { \ compiletime_assert_atomic_type(*p); \
@@ -107,8 +79,6 @@ do { \ ___p1; \ }) -#endif -/* Atomic operations are already serializing on x86 */ #define __smp_mb__before_atomic () barrier()#define __smp_mb__after_atomic () barrier()
arch/x86/include/asm/io.h +0 -15
@@ -232,21 +232,6 @@ extern void set_iounmap_nonlazy(void);*/ #define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) -/* -* Cache management -* -* This needed for two cases -* 1. Out of order aware processors -* 2. Accidentally out of order processors (PPro errata #51) -*/ - -static inline void flush_write_buffers (void ) -{ -#if defined(CONFIG_X86_PPRO_FENCE ) - asmvolatile ("lock; addl $0,0(%%esp)" : : :"memory" ); -#endif -} -#endif /* __KERNEL__ */ extern void native_io_delay (void );
arch/x86/kernel/pci-nommu.c +0 -19
@@ -37,7 +37,6 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page,WARN_ON (size ==0 );if (!check_addr ("map_single" , dev, bus, size))return NOMMU_MAPPING_ERROR ; -flush_write_buffers ();return bus; }
@@ -72,25 +71,9 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,return 0 ; s->dma_length = s->length; } -flush_write_buffers ();return nents; } -static void nommu_sync_single_for_device (struct device *dev, -dma_addr_t addr,size_t size, -enum dma_data_direction dir) -{ -flush_write_buffers (); -} - - -static void nommu_sync_sg_for_device (struct device *dev, -struct scatterlist *sg,int nelems, -enum dma_data_direction dir) -{ -flush_write_buffers (); -} -static int nommu_mapping_error (struct device *dev,dma_addr_t dma_addr) {return dma_addr ==NOMMU_MAPPING_ERROR ;
@@ -101,8 +84,6 @@ const struct dma_map_ops nommu_dma_ops = { .free = dma_generic_free_coherent, .map_sg = nommu_map_sg, .map_page = nommu_map_page, - .sync_single_for_device = nommu_sync_single_for_device, - .sync_sg_for_device = nommu_sync_sg_for_device, .is_phys = 1, .mapping_error = nommu_mapping_error, .dma_supported = x86_dma_supported,
arch/x86/um/asm/barrier.h +0 -4
@@ -30,11 +30,7 @@#endif /* CONFIG_X86_32 */ -#ifdef CONFIG_X86_PPRO_FENCE -#define dma_rmb () rmb() -#else /* CONFIG_X86_PPRO_FENCE */ #define dma_rmb () barrier() -#endif /* CONFIG_X86_PPRO_FENCE */ #define dma_wmb () barrier()#include <asm-generic/barrier.h>
Peter Zijlstra
maintainerRe: [tip:x86/pti] x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk
Quoted 8 lines · tip-bot for Christoph Hellwig
x86/cpu: Remove the
CONFIG_X86_PPRO_FENCE=yquirkThere were only a few Pentium Pro multiprocessors systems where this errata applied. They are more than 20 years old now, and we've slowly dropped places which put the workarounds in and discouraged anyone from enabling the workaround.
Get rid of it for good.
Hoorah!! x86 is back to pure TSO.
PATCH 2/14 x86: remove dma_alloc_coherent_mask
In reply to Christoph HellwigThese days all devices (including the ISA fallback device) have a coherent DMA mask set, so remove the workaround.
--- arch/x86/include/asm/dma-mapping.h | 18 ++---------------- arch/x86/kernel/pci-dma.c | 10 ++++------ arch/x86/mm/mem_encrypt.c | 4 +--- drivers/xen/swiotlb-xen.c | 16 +--------------- 4 files changed, 8 insertions(+), 40 deletions(-)
arch/x86/include/asm/dma-mapping.h +2 -16
@@ -44,26 +44,12 @@ extern void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_addr, unsigned long attrs); -static inline unsigned long dma_alloc_coherent_mask (struct device *dev, -gfp_t gfp) -{ -unsigned long dma_mask =0 ; - - dma_mask = dev->coherent_dma_mask; -if (!dma_mask) - dma_mask = (gfp &GFP_DMA ) ?DMA_BIT_MASK (24 ) :DMA_BIT_MASK (32 ); - -return dma_mask; -} -static inline gfp_t dma_alloc_coherent_gfp_flags (struct device *dev,gfp_t gfp) { -unsigned long dma_mask =dma_alloc_coherent_mask (dev, gfp); - -if (dma_mask <=DMA_BIT_MASK (24 )) +if (dev->coherent_dma_mask <=DMA_BIT_MASK (24 )) gfp |=GFP_DMA ;#ifdef CONFIG_X86_64 -if (dma_mask <=DMA_BIT_MASK (32 ) && !(gfp &GFP_DMA )) +if (dev->coherent_dma_mask <=DMA_BIT_MASK (32 ) && !(gfp &GFP_DMA )) gfp |=GFP_DMA32 ;#endif return gfp;
arch/x86/kernel/pci-dma.c +4 -6
@@ -80,13 +80,10 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, gfp_t flag, unsigned long attrs) { - unsigned long dma_mask; struct page *page;unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ;dma_addr_t addr; - dma_mask =dma_alloc_coherent_mask (dev, flag); - again: page =NULL ;/* CMA can be used only in the context which permits sleeping */
@@ -95,7 +92,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, flag);if (page) { addr =phys_to_dma (dev,page_to_phys (page)); -if (addr + size > dma_mask) { +if (addr + size > dev->coherent_dma_mask) {dma_release_from_contiguous (dev, page, count); page =NULL ; }
@@ -108,10 +105,11 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,return NULL ; addr =phys_to_dma (dev,page_to_phys (page)); -if (addr + size > dma_mask) { +if (addr + size > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); -if (dma_mask <DMA_BIT_MASK (32 ) && !(flag &GFP_DMA )) { +if (dev->coherent_dma_mask <DMA_BIT_MASK (32 ) && + !(flag &GFP_DMA )) { flag = (flag & ~GFP_DMA32 ) |GFP_DMA ; goto again; }
arch/x86/mm/mem_encrypt.c +1 -3
@@ -203,12 +203,10 @@ void __init sme_early_init(void)static void *sev_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t gfp,unsigned long attrs) { -unsigned long dma_mask;unsigned int order;struct page *page;void *vaddr =NULL ; - dma_mask =dma_alloc_coherent_mask (dev, gfp); order =get_order (size);/*
@@ -226,7 +224,7 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,* mask with it already cleared. */ addr =__sme_clr (phys_to_dma (dev,page_to_phys (page))); -if ((addr + size) > dma_mask) { +if ((addr + size) > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); }else { vaddr =page_address (page);
drivers/xen/swiotlb-xen.c +1 -15
@@ -53,20 +53,6 @@* API. */ -#ifndef CONFIG_X86 -static unsigned long dma_alloc_coherent_mask (struct device *dev, -gfp_t gfp) -{ -unsigned long dma_mask =0 ; - - dma_mask = dev->coherent_dma_mask; -if (!dma_mask) - dma_mask = (gfp &GFP_DMA ) ?DMA_BIT_MASK (24 ) :DMA_BIT_MASK (32 ); - -return dma_mask; -} -#endif -#define XEN_SWIOTLB_ERROR_CODE (~(dma_addr_t)0x0)static char *xen_io_tlb_start, *xen_io_tlb_end;
@@ -328,7 +314,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,return ret;if (hwdev && hwdev->coherent_dma_mask) - dma_mask =dma_alloc_coherent_mask (hwdev, flags); + dma_mask = hwdev->coherent_dma_mask;/* At this point dma_handle is the physical address, next we are * going to set it to the machine address.
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] x86/dma: Remove dma_alloc_coherent_mask()
x86/dma: Remove dma_alloc_coherent_mask()
Commit-ID: 038d07a283d62336b32cc23b62aecdf9418cfc11 Gitweb: https://git.kernel.org/tip/038d07a283d62336b32cc23b62aecdf9418cfc11 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:14 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:56 +0100
x86/dma: Remove dma_alloc_coherent_mask()
These days all devices (including the ISA fallback device) have a coherent DMA mask set, so remove the workaround.
--- arch/x86/include/asm/dma-mapping.h | 18 ++---------------- arch/x86/kernel/pci-dma.c | 10 ++++------ arch/x86/mm/mem_encrypt.c | 4 +--- drivers/xen/swiotlb-xen.c | 16 +--------------- 4 files changed, 8 insertions(+), 40 deletions(-)
arch/x86/include/asm/dma-mapping.h +2 -16
@@ -44,26 +44,12 @@ extern void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_addr, unsigned long attrs); -static inline unsigned long dma_alloc_coherent_mask (struct device *dev, -gfp_t gfp) -{ -unsigned long dma_mask =0 ; - - dma_mask = dev->coherent_dma_mask; -if (!dma_mask) - dma_mask = (gfp &GFP_DMA ) ?DMA_BIT_MASK (24 ) :DMA_BIT_MASK (32 ); - -return dma_mask; -} -static inline gfp_t dma_alloc_coherent_gfp_flags (struct device *dev,gfp_t gfp) { -unsigned long dma_mask =dma_alloc_coherent_mask (dev, gfp); - -if (dma_mask <=DMA_BIT_MASK (24 )) +if (dev->coherent_dma_mask <=DMA_BIT_MASK (24 )) gfp |=GFP_DMA ;#ifdef CONFIG_X86_64 -if (dma_mask <=DMA_BIT_MASK (32 ) && !(gfp &GFP_DMA )) +if (dev->coherent_dma_mask <=DMA_BIT_MASK (32 ) && !(gfp &GFP_DMA )) gfp |=GFP_DMA32 ;#endif return gfp;
arch/x86/kernel/pci-dma.c +4 -6
@@ -80,13 +80,10 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, gfp_t flag, unsigned long attrs) { - unsigned long dma_mask; struct page *page;unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ;dma_addr_t addr; - dma_mask =dma_alloc_coherent_mask (dev, flag); - again: page =NULL ;/* CMA can be used only in the context which permits sleeping */
@@ -95,7 +92,7 @@ again: flag);if (page) { addr =phys_to_dma (dev,page_to_phys (page)); -if (addr + size > dma_mask) { +if (addr + size > dev->coherent_dma_mask) {dma_release_from_contiguous (dev, page, count); page =NULL ; }
@@ -108,10 +105,11 @@ again:return NULL ; addr =phys_to_dma (dev,page_to_phys (page)); -if (addr + size > dma_mask) { +if (addr + size > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); -if (dma_mask <DMA_BIT_MASK (32 ) && !(flag &GFP_DMA )) { +if (dev->coherent_dma_mask <DMA_BIT_MASK (32 ) && + !(flag &GFP_DMA )) { flag = (flag & ~GFP_DMA32 ) |GFP_DMA ; goto again; }
arch/x86/mm/mem_encrypt.c +1 -3
@@ -198,12 +198,10 @@ void __init sme_early_init(void)static void *sev_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t gfp,unsigned long attrs) { -unsigned long dma_mask;unsigned int order;struct page *page;void *vaddr =NULL ; - dma_mask =dma_alloc_coherent_mask (dev, gfp); order =get_order (size);/*
@@ -221,7 +219,7 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,* mask with it already cleared. */ addr =__sme_clr (phys_to_dma (dev,page_to_phys (page))); -if ((addr + size) > dma_mask) { +if ((addr + size) > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); }else { vaddr =page_address (page);
drivers/xen/swiotlb-xen.c +1 -15
@@ -53,20 +53,6 @@* API. */ -#ifndef CONFIG_X86 -static unsigned long dma_alloc_coherent_mask (struct device *dev, -gfp_t gfp) -{ -unsigned long dma_mask =0 ; - - dma_mask = dev->coherent_dma_mask; -if (!dma_mask) - dma_mask = (gfp &GFP_DMA ) ?DMA_BIT_MASK (24 ) :DMA_BIT_MASK (32 ); - -return dma_mask; -} -#endif -#define XEN_SWIOTLB_ERROR_CODE (~(dma_addr_t)0x0)static char *xen_io_tlb_start, *xen_io_tlb_end;
@@ -328,7 +314,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,return ret;if (hwdev && hwdev->coherent_dma_mask) - dma_mask =dma_alloc_coherent_mask (hwdev, flags); + dma_mask = hwdev->coherent_dma_mask;/* At this point dma_handle is the physical address, next we are * going to set it to the machine address.
PATCH 3/14 x86: use dma-direct
In reply to Christoph HellwigThe generic dma-direct implementation is now functionally equivalent to the x86 nommu dma_map implementation, so switch over to using it. That includes switching from using x86_dma_supported in various iommu drivers to use dma_direct_supported instead, which provides the same functionality.
--- arch/x86/Kconfig | 1 + arch/x86/include/asm/dma-mapping.h | 8 ----- arch/x86/include/asm/iommu.h | 3 -- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/amd_gart_64.c | 7 ++-- arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/kernel/pci-dma.c | 66 +------------------------------------- arch/x86/kernel/pci-swiotlb.c | 5 ++- arch/x86/pci/sta2x11-fixup.c | 2 +- drivers/iommu/amd_iommu.c | 7 ++-- drivers/iommu/intel-iommu.c | 3 +- 11 files changed, 17 insertions(+), 90 deletions(-)
arch/x86/Kconfig +1 -0
@@ -83,6 +83,7 @@ config X86 select CLOCKSOURCE_VALIDATE_LAST_CYCLE select CLOCKSOURCE_WATCHDOG select DCACHE_WORD_ACCESS + select DMA_DIRECT_OPS select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT select GENERIC_CLOCKEVENTS
arch/x86/include/asm/dma-mapping.h +0 -8
@@ -36,14 +36,6 @@ int arch_dma_supported(struct device *dev, u64 mask);bool arch_dma_alloc_attrs (struct device **dev,gfp_t *gfp);#define arch_dma_alloc_attrs arch_dma_alloc_attrs -extern void *dma_generic_alloc_coherent (struct device *dev,size_t size, -dma_addr_t *dma_addr,gfp_t flag, -unsigned long attrs); - -extern void dma_generic_free_coherent (struct device *dev,size_t size, -void *vaddr,dma_addr_t dma_addr, -unsigned long attrs); -static inline gfp_t dma_alloc_coherent_gfp_flags (struct device *dev,gfp_t gfp) {if (dev->coherent_dma_mask <=DMA_BIT_MASK (24 ))
arch/x86/include/asm/iommu.h +0 -3
@@ -2,13 +2,10 @@#ifndef _ASM_X86_IOMMU_H#define _ASM_X86_IOMMU_H -extern const struct dma_map_ops nommu_dma_ops;extern int force_iommu, no_iommu;extern int iommu_detected;extern int iommu_pass_through; -int x86_dma_supported (struct device *dev,u64 mask); -/* 10 seconds */ #define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)
arch/x86/kernel/Makefile +1 -1
@@ -57,7 +57,7 @@ obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o obj-y += bootflag.o e820.o obj-y += pci-dma.o quirks.o topology.o kdebugfs.o -obj-y += alternative.o i8253.o pci-nommu.o hw_breakpoint.o +obj-y += alternative.o i8253.o hw_breakpoint.o obj-y += tsc.o tsc_msr.o io_delay.o rtc.o obj-y += pci-iommu_table.o obj-y += resource.o
arch/x86/kernel/amd_gart_64.c +3 -4
@@ -501,8 +501,7 @@ gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, }__free_pages (page,get_order (size)); }else -return dma_generic_alloc_coherent (dev, size, dma_addr, flag, - attrs); +return dma_direct_alloc (dev, size, dma_addr, flag, attrs);return NULL ; }
@@ -513,7 +512,7 @@ gart_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_addr, unsigned long attrs) { gart_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL, 0); -dma_generic_free_coherent (dev, size, vaddr, dma_addr, attrs); +dma_direct_free (dev, size, vaddr, dma_addr, attrs); }static int gart_mapping_error (struct device *dev,dma_addr_t dma_addr)
@@ -705,7 +704,7 @@ static const struct dma_map_ops gart_dma_ops = { .alloc = gart_alloc_coherent, .free = gart_free_coherent, .mapping_error = gart_mapping_error, - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported, };static void gart_iommu_shutdown (void )
arch/x86/kernel/pci-calgary_64.c +2 -1
@@ -33,6 +33,7 @@#include <linux/string.h> #include <linux/crash_dump.h> #include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/bitmap.h> #include <linux/pci_ids.h> #include <linux/pci.h>
@@ -493,7 +494,7 @@ static const struct dma_map_ops calgary_dma_ops = { .map_page = calgary_map_page, .unmap_page = calgary_unmap_page, .mapping_error = calgary_mapping_error, - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported, };static inline void __iomem *busno_to_bbar (unsigned char num)
arch/x86/kernel/pci-dma.c +1 -65
84 lines not on this page · raw message
arch/x86/kernel/pci-swiotlb.c +2 -3
@@ -30,8 +30,7 @@ void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,*/ flags |= __GFP_NOWARN; - vaddr =dma_generic_alloc_coherent (hwdev, size, dma_handle, flags, - attrs); + vaddr =dma_direct_alloc (hwdev, size, dma_handle, flags, attrs);if (vaddr)return vaddr;
@@ -45,7 +44,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,if (is_swiotlb_buffer (dma_to_phys (dev, dma_addr)))swiotlb_free_coherent (dev, size, vaddr, dma_addr);else -dma_generic_free_coherent (dev, size, vaddr, dma_addr, attrs); +dma_direct_free (dev, size, vaddr, dma_addr, attrs); }static const struct dma_map_ops x86_swiotlb_dma_ops = {
arch/x86/pci/sta2x11-fixup.c +1 -1
@@ -193,7 +193,7 @@ static const struct dma_map_ops sta2x11_dma_ops = { .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, .sync_sg_for_device = swiotlb_sync_sg_for_device, .mapping_error = swiotlb_dma_mapping_error, - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported, };/* At setup time, we use our own ops if the device is a ConneXt one */
drivers/iommu/amd_iommu.c +4 -3
@@ -28,6 +28,7 @@#include <linux/debugfs.h> #include <linux/scatterlist.h> #include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/iommu-helper.h> #include <linux/iommu.h> #include <linux/delay.h>
@@ -2193,7 +2194,7 @@ static int amd_iommu_add_device(struct device *dev) dev_name(dev));iommu_ignore_device (dev); - dev->dma_ops = &nommu_dma_ops; + dev->dma_ops = &dma_direct_ops; goto out; }init_iommu_group (dev);
@@ -2680,7 +2681,7 @@ static void free_coherent(struct device *dev, size_t size,*/ static int amd_iommu_dma_supported (struct device *dev,u64 mask) { -if (!x86_dma_supported (dev, mask)) +if (!dma_direct_supported (dev, mask))return 0 ;return check_device (dev); }
@@ -2794,7 +2795,7 @@ int __init amd_iommu_init_dma_ops(void)* continue to be SWIOTLB. */ if (!swiotlb) - dma_ops = &nommu_dma_ops; + dma_ops = &dma_direct_ops;if (amd_iommu_unmap_flush)pr_info ("AMD-Vi: IO/TLB flush on unmap enabled\n" );
drivers/iommu/intel-iommu.c +2 -1
@@ -45,6 +45,7 @@#include <linux/pci-ats.h> #include <linux/memblock.h> #include <linux/dma-contiguous.h> +#include <linux/dma-direct.h> #include <linux/crash_dump.h> #include <asm/irq_remapping.h> #include <asm/cacheflush.h>
@@ -3871,7 +3872,7 @@ const struct dma_map_ops intel_dma_ops = { .unmap_page = intel_unmap_page, .mapping_error = intel_mapping_error, #ifdef CONFIG_X86 - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported,#endif };
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)
x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)
Commit-ID: fec777c385b6376048fc4b08f039366545b335cd Gitweb: https://git.kernel.org/tip/fec777c385b6376048fc4b08f039366545b335cd Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:15 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:56 +0100
x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)
The generic DMA-direct (CONFIG_DMA_DIRECT_OPS=y) implementation is now functionally equivalent to the x86 nommu dma_map implementation, so switch over to using it.
That includes switching from using x86_dma_supported in various IOMMU drivers to use dma_direct_supported instead, which provides the same functionality.
--- arch/x86/Kconfig | 1 + arch/x86/include/asm/dma-mapping.h | 8 ----- arch/x86/include/asm/iommu.h | 3 -- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/amd_gart_64.c | 7 ++-- arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/kernel/pci-dma.c | 66 +------------------------------------- arch/x86/kernel/pci-swiotlb.c | 5 ++- arch/x86/pci/sta2x11-fixup.c | 2 +- drivers/iommu/amd_iommu.c | 7 ++-- drivers/iommu/intel-iommu.c | 3 +- 11 files changed, 17 insertions(+), 90 deletions(-)
arch/x86/Kconfig +1 -0
@@ -83,6 +83,7 @@ config X86 select CLOCKSOURCE_VALIDATE_LAST_CYCLE select CLOCKSOURCE_WATCHDOG select DCACHE_WORD_ACCESS + select DMA_DIRECT_OPS select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT select GENERIC_CLOCKEVENTS
arch/x86/include/asm/dma-mapping.h +0 -8
@@ -36,14 +36,6 @@ int arch_dma_supported(struct device *dev, u64 mask);bool arch_dma_alloc_attrs (struct device **dev,gfp_t *gfp);#define arch_dma_alloc_attrs arch_dma_alloc_attrs -extern void *dma_generic_alloc_coherent (struct device *dev,size_t size, -dma_addr_t *dma_addr,gfp_t flag, -unsigned long attrs); - -extern void dma_generic_free_coherent (struct device *dev,size_t size, -void *vaddr,dma_addr_t dma_addr, -unsigned long attrs); -static inline gfp_t dma_alloc_coherent_gfp_flags (struct device *dev,gfp_t gfp) {if (dev->coherent_dma_mask <=DMA_BIT_MASK (24 ))
arch/x86/include/asm/iommu.h +0 -3
@@ -2,13 +2,10 @@#ifndef _ASM_X86_IOMMU_H#define _ASM_X86_IOMMU_H -extern const struct dma_map_ops nommu_dma_ops;extern int force_iommu, no_iommu;extern int iommu_detected;extern int iommu_pass_through; -int x86_dma_supported (struct device *dev,u64 mask); -/* 10 seconds */ #define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)
arch/x86/kernel/Makefile +1 -1
@@ -57,7 +57,7 @@ obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o obj-y += bootflag.o e820.o obj-y += pci-dma.o quirks.o topology.o kdebugfs.o -obj-y += alternative.o i8253.o pci-nommu.o hw_breakpoint.o +obj-y += alternative.o i8253.o hw_breakpoint.o obj-y += tsc.o tsc_msr.o io_delay.o rtc.o obj-y += pci-iommu_table.o obj-y += resource.o
arch/x86/kernel/amd_gart_64.c +3 -4
@@ -501,8 +501,7 @@ gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, }__free_pages (page,get_order (size)); }else -return dma_generic_alloc_coherent (dev, size, dma_addr, flag, - attrs); +return dma_direct_alloc (dev, size, dma_addr, flag, attrs);return NULL ; }
@@ -513,7 +512,7 @@ gart_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_addr, unsigned long attrs) { gart_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL, 0); -dma_generic_free_coherent (dev, size, vaddr, dma_addr, attrs); +dma_direct_free (dev, size, vaddr, dma_addr, attrs); }static int gart_mapping_error (struct device *dev,dma_addr_t dma_addr)
@@ -705,7 +704,7 @@ static const struct dma_map_ops gart_dma_ops = { .alloc = gart_alloc_coherent, .free = gart_free_coherent, .mapping_error = gart_mapping_error, - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported, };static void gart_iommu_shutdown (void )
arch/x86/kernel/pci-calgary_64.c +2 -1
@@ -33,6 +33,7 @@#include <linux/string.h> #include <linux/crash_dump.h> #include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/bitmap.h> #include <linux/pci_ids.h> #include <linux/pci.h>
@@ -493,7 +494,7 @@ static const struct dma_map_ops calgary_dma_ops = { .map_page = calgary_map_page, .unmap_page = calgary_unmap_page, .mapping_error = calgary_mapping_error, - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported, };static inline void __iomem *busno_to_bbar (unsigned char num)
arch/x86/kernel/pci-dma.c +1 -65
84 lines not on this page · raw message
arch/x86/kernel/pci-swiotlb.c +2 -3
@@ -30,8 +30,7 @@ void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,*/ flags |= __GFP_NOWARN; - vaddr =dma_generic_alloc_coherent (hwdev, size, dma_handle, flags, - attrs); + vaddr =dma_direct_alloc (hwdev, size, dma_handle, flags, attrs);if (vaddr)return vaddr;
@@ -45,7 +44,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,if (is_swiotlb_buffer (dma_to_phys (dev, dma_addr)))swiotlb_free_coherent (dev, size, vaddr, dma_addr);else -dma_generic_free_coherent (dev, size, vaddr, dma_addr, attrs); +dma_direct_free (dev, size, vaddr, dma_addr, attrs); }static const struct dma_map_ops x86_swiotlb_dma_ops = {
arch/x86/pci/sta2x11-fixup.c +1 -1
@@ -193,7 +193,7 @@ static const struct dma_map_ops sta2x11_dma_ops = { .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, .sync_sg_for_device = swiotlb_sync_sg_for_device, .mapping_error = swiotlb_dma_mapping_error, - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported, };/* At setup time, we use our own ops if the device is a ConneXt one */
drivers/iommu/amd_iommu.c +4 -3
@@ -28,6 +28,7 @@#include <linux/debugfs.h> #include <linux/scatterlist.h> #include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/iommu-helper.h> #include <linux/iommu.h> #include <linux/delay.h>
@@ -2193,7 +2194,7 @@ static int amd_iommu_add_device(struct device *dev) dev_name(dev));iommu_ignore_device (dev); - dev->dma_ops = &nommu_dma_ops; + dev->dma_ops = &dma_direct_ops; goto out; }init_iommu_group (dev);
@@ -2680,7 +2681,7 @@ free_mem:*/ static int amd_iommu_dma_supported (struct device *dev,u64 mask) { -if (!x86_dma_supported (dev, mask)) +if (!dma_direct_supported (dev, mask))return 0 ;return check_device (dev); }
@@ -2794,7 +2795,7 @@ int __init amd_iommu_init_dma_ops(void)* continue to be SWIOTLB. */ if (!swiotlb) - dma_ops = &nommu_dma_ops; + dma_ops = &dma_direct_ops;if (amd_iommu_unmap_flush)pr_info ("AMD-Vi: IO/TLB flush on unmap enabled\n" );
drivers/iommu/intel-iommu.c +2 -1
@@ -45,6 +45,7 @@#include <linux/pci-ats.h> #include <linux/memblock.h> #include <linux/dma-contiguous.h> +#include <linux/dma-direct.h> #include <linux/crash_dump.h> #include <asm/irq_remapping.h> #include <asm/cacheflush.h>
@@ -3871,7 +3872,7 @@ const struct dma_map_ops intel_dma_ops = { .unmap_page = intel_unmap_page, .mapping_error = intel_mapping_error, #ifdef CONFIG_X86 - .dma_supported = x86_dma_supported, + .dma_supported = dma_direct_supported,#endif };
PATCH 4/14 x86: use generic swiotlb_ops
In reply to Christoph HellwigThe generic swiotlb dma ops were based on the x86 ones and provide equivalent functionality, so use them.
Also fix the sta2x11 case. For that SOC the dma map ops need an additional physical to dma address translations. For swiotlb buffers that is done throught the phys_to_dma helper, but the sta2x11_dma_ops also added an additional translation on the return value from x86_swiotlb_alloc_coherent, which is only correct if that functions returns a direct allocation and not a swiotlb buffer. With the generic swiotlb and dma-direct code phys_to_dma is not always used and the separate sta2x11_dma_ops can be replaced with a simple bit that marks if the additional physical to dma address translation is needed.
--- arch/x86/include/asm/device.h | 3 +++ arch/x86/include/asm/swiotlb.h | 8 ------- arch/x86/kernel/pci-swiotlb.c | 47 +----------------------------------------- arch/x86/pci/sta2x11-fixup.c | 46 +++++------------------------------------ 4 files changed, 9 insertions(+), 95 deletions(-)
arch/x86/include/asm/device.h +3 -0
@@ -6,6 +6,9 @@ struct dev_archdata {#if defined(CONFIG_INTEL_IOMMU ) || defined(CONFIG_AMD_IOMMU )void *iommu;/* hook for IOMMU specific extension */ #endif +#ifdef CONFIG_STA2X11 +bool is_sta2x11; +#endif };#if defined(CONFIG_X86_DEV_DMA_OPS ) && defined(CONFIG_PCI_DOMAINS )
arch/x86/include/asm/swiotlb.h +0 -8
@@ -27,12 +27,4 @@ static inline void pci_swiotlb_late_init(void) { }#endif - -extern void *x86_swiotlb_alloc_coherent (struct device *hwdev,size_t size, -dma_addr_t *dma_handle,gfp_t flags, -unsigned long attrs); -extern void x86_swiotlb_free_coherent (struct device *dev,size_t size, -void *vaddr,dma_addr_t dma_addr, -unsigned long attrs); -#endif /* _ASM_X86_SWIOTLB_H */
arch/x86/kernel/pci-swiotlb.c +1 -46
59 lines not on this page · raw message
arch/x86/pci/sta2x11-fixup.c +5 -41
76 lines not on this page · raw message
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] x86/dma: Use generic swiotlb_ops
x86/dma: Use generic swiotlb_ops
Commit-ID: 6e4bf586778315b3fc53b728c53eefc247cfc3ff Gitweb: https://git.kernel.org/tip/6e4bf586778315b3fc53b728c53eefc247cfc3ff Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:16 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:57 +0100
x86/dma: Use generic swiotlb_ops
The generic swiotlb DMA ops were based on the x86 ones and provide equivalent functionality, so use them.
Also fix the sta2x11 case. For that SOC the DMA map ops need an additional physical to DMA address translations. For swiotlb buffers that is done throught the phys_to_dma helper, but the sta2x11_dma_ops also added an additional translation on the return value from x86_swiotlb_alloc_coherent, which is only correct if that functions returns a direct allocation and not a swiotlb buffer. With the generic swiotlb and DMA-direct code phys_to_dma is not always used and the separate sta2x11_dma_ops can be replaced with a simple bit that marks if the additional physical to DMA address translation is needed.
--- arch/x86/include/asm/device.h | 3 +++ arch/x86/include/asm/swiotlb.h | 8 ------- arch/x86/kernel/pci-swiotlb.c | 47 +----------------------------------------- arch/x86/pci/sta2x11-fixup.c | 46 +++++------------------------------------ 4 files changed, 9 insertions(+), 95 deletions(-)
arch/x86/include/asm/device.h +3 -0
@@ -6,6 +6,9 @@ struct dev_archdata {#if defined(CONFIG_INTEL_IOMMU ) || defined(CONFIG_AMD_IOMMU )void *iommu;/* hook for IOMMU specific extension */ #endif +#ifdef CONFIG_STA2X11 +bool is_sta2x11; +#endif };#if defined(CONFIG_X86_DEV_DMA_OPS ) && defined(CONFIG_PCI_DOMAINS )
arch/x86/include/asm/swiotlb.h +0 -8
@@ -27,12 +27,4 @@ static inline void pci_swiotlb_late_init(void) { }#endif - -extern void *x86_swiotlb_alloc_coherent (struct device *hwdev,size_t size, -dma_addr_t *dma_handle,gfp_t flags, -unsigned long attrs); -extern void x86_swiotlb_free_coherent (struct device *dev,size_t size, -void *vaddr,dma_addr_t dma_addr, -unsigned long attrs); -#endif /* _ASM_X86_SWIOTLB_H */
arch/x86/kernel/pci-swiotlb.c +1 -46
59 lines not on this page · raw message
arch/x86/pci/sta2x11-fixup.c +5 -41
76 lines not on this page · raw message
PATCH 5/14 x86/amd_gart: look at coherent_dma_mask instead of GFP_DMA
In reply to Christoph HellwigWe want to phase out looking at the magic GFP_DMA flag in the dma mapping routines, so switch the gart driver to use the coherent_dma_mask instead, which is used to select the GFP_DMA flag in the caller.
--- arch/x86/kernel/amd_gart_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/amd_gart_64.c +1 -1
@@ -484,7 +484,7 @@ gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr,unsigned long align_mask;struct page *page; -if (force_iommu && !(flag &GFP_DMA )) { +if (force_iommu && dev->coherent_dma_mask >DMA_BIT_MASK (24 )) { flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); page =alloc_pages (flag | __GFP_ZERO,get_order (size));if (!page)
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] x86/dma/amd_gart: Look at dev->coherent_dma_mask instead of GFP_DMA
x86/dma/amd_gart: Look at dev->coherent_dma_mask instead of GFP_DMA
Commit-ID: f3c39d51043dcee5dd4d51dffcfe9ce01a263582 Gitweb: https://git.kernel.org/tip/f3c39d51043dcee5dd4d51dffcfe9ce01a263582 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:17 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:57 +0100
x86/dma/amd_gart: Look at dev->coherent_dma_mask instead of GFP_DMA
We want to phase out looking at the magic GFP_DMA flag in the DMA mapping routines, so switch the gart driver to use the dev->coherent_dma_mask instead, which is used to select the GFP_DMA flag in the caller.
--- arch/x86/kernel/amd_gart_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/amd_gart_64.c +1 -1
@@ -484,7 +484,7 @@ gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr,unsigned long align_mask;struct page *page; -if (force_iommu && !(flag &GFP_DMA )) { +if (force_iommu && dev->coherent_dma_mask >DMA_BIT_MASK (24 )) { flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); page =alloc_pages (flag | __GFP_ZERO,get_order (size));if (!page)
PATCH 6/14 x86/amd_gart: use dma_direct_{alloc,free}
In reply to Christoph HellwigThis gains support for CMA allocations for the force_iommu case, and cleans up the code a bit.
--- arch/x86/kernel/amd_gart_64.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
arch/x86/kernel/amd_gart_64.c +14 -22
@@ -480,29 +480,21 @@ static void * gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, gfp_t flag, unsigned long attrs) { - dma_addr_t paddr; -unsigned long align_mask; -struct page *page; - -if (force_iommu && dev->coherent_dma_mask >DMA_BIT_MASK (24 )) { - flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); - page =alloc_pages (flag | __GFP_ZERO,get_order (size)); -if (!page) -return NULL ; - - align_mask = (1UL <<get_order (size)) -1 ; - paddr =dma_map_area (dev,page_to_phys (page), size, -DMA_BIDIRECTIONAL , align_mask); - -flush_gart (); -if (paddr != bad_dma_addr) { - *dma_addr = paddr; -return page_address (page); - } -__free_pages (page,get_order (size)); - }else -return dma_direct_alloc (dev, size, dma_addr, flag, attrs); + void *vaddr; + + vaddr =dma_direct_alloc (dev, size, dma_addr, flag, attrs); +if (!vaddr || + !force_iommu || dev->coherent_dma_mask <=DMA_BIT_MASK (24 )) +return vaddr; + *dma_addr =dma_map_area (dev,virt_to_phys (vaddr), size, +DMA_BIDIRECTIONAL , (1UL <<get_order (size)) -1 ); +flush_gart (); +if (unlikely (*dma_addr == bad_dma_addr)) + goto out_free; +return vaddr; +out_free: +dma_direct_free (dev, size, vaddr, *dma_addr, attrs);return NULL ; }
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] x86/dma/amd_gart: Use dma_direct_{alloc,free}()
x86/dma/amd_gart: Use dma_direct_{alloc,free}()
Commit-ID: 51c7eeba7975c1d2a02eefd00ece6de25176f5f3 Gitweb: https://git.kernel.org/tip/51c7eeba7975c1d2a02eefd00ece6de25176f5f3 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:18 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:57 +0100
x86/dma/amd_gart: Use dma_direct_{alloc,free}()
This gains support for CMA allocations for the force_iommu case, and cleans up the code a bit.
--- arch/x86/kernel/amd_gart_64.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
arch/x86/kernel/amd_gart_64.c +14 -22
@@ -480,29 +480,21 @@ static void * gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, gfp_t flag, unsigned long attrs) { - dma_addr_t paddr; -unsigned long align_mask; -struct page *page; - -if (force_iommu && dev->coherent_dma_mask >DMA_BIT_MASK (24 )) { - flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); - page =alloc_pages (flag | __GFP_ZERO,get_order (size)); -if (!page) -return NULL ; - - align_mask = (1UL <<get_order (size)) -1 ; - paddr =dma_map_area (dev,page_to_phys (page), size, -DMA_BIDIRECTIONAL , align_mask); - -flush_gart (); -if (paddr != bad_dma_addr) { - *dma_addr = paddr; -return page_address (page); - } -__free_pages (page,get_order (size)); - }else -return dma_direct_alloc (dev, size, dma_addr, flag, attrs); + void *vaddr; + + vaddr =dma_direct_alloc (dev, size, dma_addr, flag, attrs); +if (!vaddr || + !force_iommu || dev->coherent_dma_mask <=DMA_BIT_MASK (24 )) +return vaddr; + *dma_addr =dma_map_area (dev,virt_to_phys (vaddr), size, +DMA_BIDIRECTIONAL , (1UL <<get_order (size)) -1 ); +flush_gart (); +if (unlikely (*dma_addr == bad_dma_addr)) + goto out_free; +return vaddr; +out_free: +dma_direct_free (dev, size, vaddr, *dma_addr, attrs);return NULL ; }
PATCH 7/14 iommu/amd_iommu: use dma_direct_{alloc,free}
In reply to Christoph HellwigThis cleans up the code a lot by removing duplicate logic.
--- drivers/iommu/Kconfig | 1 + drivers/iommu/amd_iommu.c | 68 +++++++++++++++-------------------------------- 2 files changed, 22 insertions(+), 47 deletions(-)
drivers/iommu/Kconfig +1 -0
@@ -107,6 +107,7 @@ config IOMMU_PGTABLES_L2 # AMD IOMMU support config AMD_IOMMU bool "AMD IOMMU support" + select DMA_DIRECT_OPS select SWIOTLB select PCI_MSI select PCI_ATS
drivers/iommu/amd_iommu.c +21 -47
96 lines not on this page · raw message
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()
iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()
Commit-ID: b468620f2a1dfdcfddfd6fa54367b8bcc1b51248 Gitweb: https://git.kernel.org/tip/b468620f2a1dfdcfddfd6fa54367b8bcc1b51248 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:19 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:58 +0100
iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()
This cleans up the code a lot by removing duplicate logic.
--- drivers/iommu/Kconfig | 1 + drivers/iommu/amd_iommu.c | 68 +++++++++++++++-------------------------------- 2 files changed, 22 insertions(+), 47 deletions(-)
drivers/iommu/Kconfig +1 -0
@@ -107,6 +107,7 @@ config IOMMU_PGTABLES_L2 # AMD IOMMU support config AMD_IOMMU bool "AMD IOMMU support" + select DMA_DIRECT_OPS select SWIOTLB select PCI_MSI select PCI_ATS
drivers/iommu/amd_iommu.c +21 -47
96 lines not on this page · raw message
PATCH 8/14 iommu/intel-iommu: cleanup intel_{alloc,free}_coherent
In reply to Christoph HellwigUse the dma_direct_* helpers and cleanup the code flow.
--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 62 ++++++++++++--------------------------------- 2 files changed, 17 insertions(+), 46 deletions(-)
drivers/iommu/Kconfig +1 -0
@@ -143,6 +143,7 @@ config DMAR_TABLE config INTEL_IOMMU bool "Support for Intel IOMMU using DMA Remapping Devices" depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC) + select DMA_DIRECT_OPS select IOMMU_API select IOMMU_IOVA select DMAR_TABLE
drivers/iommu/intel-iommu.c +16 -46
83 lines not on this page · raw message
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()
iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()
Commit-ID: d657c5c73ca987214a6f9436e435b34fc60f332a Gitweb: https://git.kernel.org/tip/d657c5c73ca987214a6f9436e435b34fc60f332a Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:20 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:58 +0100
iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()
Use the dma_direct_*() helpers and clean up the code flow.
--- drivers/iommu/Kconfig | 1 + drivers/iommu/intel-iommu.c | 62 ++++++++++++--------------------------------- 2 files changed, 17 insertions(+), 46 deletions(-)
drivers/iommu/Kconfig +1 -0
@@ -143,6 +143,7 @@ config DMAR_TABLE config INTEL_IOMMU bool "Support for Intel IOMMU using DMA Remapping Devices" depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC) + select DMA_DIRECT_OPS select IOMMU_API select IOMMU_IOVA select DMAR_TABLE
drivers/iommu/intel-iommu.c +16 -46
83 lines not on this page · raw message
PATCH 9/14 x86: remove dma_alloc_coherent_gfp_flags
In reply to Christoph HellwigAll dma_ops implementations used on x86 now take care of setting their own required GFP_ masks for the allocation. And given that the common code now clears harmful flags itself that means we can stop the flags in all the iommu implementations as well.
--- arch/x86/include/asm/dma-mapping.h | 11 ----------- arch/x86/kernel/pci-calgary_64.c | 2 -- arch/x86/kernel/pci-dma.c | 2 -- arch/x86/mm/mem_encrypt.c | 7 ------- 4 files changed, 22 deletions(-)
arch/x86/include/asm/dma-mapping.h +0 -11
@@ -36,15 +36,4 @@ int arch_dma_supported(struct device *dev, u64 mask);bool arch_dma_alloc_attrs (struct device **dev,gfp_t *gfp);#define arch_dma_alloc_attrs arch_dma_alloc_attrs -static inline gfp_t dma_alloc_coherent_gfp_flags (struct device *dev,gfp_t gfp) -{ -if (dev->coherent_dma_mask <=DMA_BIT_MASK (24 )) - gfp |=GFP_DMA ; -#ifdef CONFIG_X86_64 -if (dev->coherent_dma_mask <=DMA_BIT_MASK (32 ) && !(gfp &GFP_DMA )) - gfp |=GFP_DMA32 ; -#endif -return gfp; -} -#endif
arch/x86/kernel/pci-calgary_64.c +0 -2
@@ -446,8 +446,6 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size, npages = size >>PAGE_SHIFT ; order =get_order (size); - flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); -/* alloc enough pages (and possibly more) */ ret = (void *)__get_free_pages (flag, order);if (!ret)
arch/x86/kernel/pci-dma.c +0 -2
@@ -82,8 +82,6 @@ bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp)if (!*dev) *dev = &x86_dma_fallback_dev; - *gfp =dma_alloc_coherent_gfp_flags (*dev, *gfp); -if (!is_device_dma_capable (*dev))return false;return true;
arch/x86/mm/mem_encrypt.c +0 -7
@@ -208,13 +208,6 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,void *vaddr =NULL ; order =get_order (size); - -/* -* Memory will be memset to zero after marking decrypted, so don't -* bother clearing it before. -*/ - gfp &= ~__GFP_ZERO; - page =alloc_pages_node (dev_to_node (dev), gfp, order);if (page) {dma_addr_t addr;
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] x86/dma: Remove dma_alloc_coherent_gfp_flags()
x86/dma: Remove dma_alloc_coherent_gfp_flags()
Commit-ID: 178c5682447ac0e315f0f3e27664fd4e0d2721cc Gitweb: https://git.kernel.org/tip/178c5682447ac0e315f0f3e27664fd4e0d2721cc Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:21 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:58 +0100
x86/dma: Remove dma_alloc_coherent_gfp_flags()
All dma_ops implementations used on x86 now take care of setting their own required GFP_ masks for the allocation. And given that the common code now clears harmful flags itself that means we can stop the flags in all the IOMMU implementations as well.
--- arch/x86/include/asm/dma-mapping.h | 11 ----------- arch/x86/kernel/pci-calgary_64.c | 2 -- arch/x86/kernel/pci-dma.c | 2 -- arch/x86/mm/mem_encrypt.c | 7 ------- 4 files changed, 22 deletions(-)
arch/x86/include/asm/dma-mapping.h +0 -11
@@ -36,15 +36,4 @@ int arch_dma_supported(struct device *dev, u64 mask);bool arch_dma_alloc_attrs (struct device **dev,gfp_t *gfp);#define arch_dma_alloc_attrs arch_dma_alloc_attrs -static inline gfp_t dma_alloc_coherent_gfp_flags (struct device *dev,gfp_t gfp) -{ -if (dev->coherent_dma_mask <=DMA_BIT_MASK (24 )) - gfp |=GFP_DMA ; -#ifdef CONFIG_X86_64 -if (dev->coherent_dma_mask <=DMA_BIT_MASK (32 ) && !(gfp &GFP_DMA )) - gfp |=GFP_DMA32 ; -#endif -return gfp; -} -#endif
arch/x86/kernel/pci-calgary_64.c +0 -2
@@ -446,8 +446,6 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size, npages = size >>PAGE_SHIFT ; order =get_order (size); - flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); -/* alloc enough pages (and possibly more) */ ret = (void *)__get_free_pages (flag, order);if (!ret)
arch/x86/kernel/pci-dma.c +0 -2
@@ -82,8 +82,6 @@ bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp)if (!*dev) *dev = &x86_dma_fallback_dev; - *gfp =dma_alloc_coherent_gfp_flags (*dev, *gfp); -if (!is_device_dma_capable (*dev))return false;return true;
arch/x86/mm/mem_encrypt.c +0 -7
@@ -203,13 +203,6 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,void *vaddr =NULL ; order =get_order (size); - -/* -* Memory will be memset to zero after marking decrypted, so don't -* bother clearing it before. -*/ - gfp &= ~__GFP_ZERO; - page =alloc_pages_node (dev_to_node (dev), gfp, order);if (page) {dma_addr_t addr;
PATCH 10/14 set_memory.h: provide set_memory_{en,de}crypted stubs
In reply to Christoph Hellwig--- include/linux/set_memory.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/set_memory.h +12 -0
@@ -17,4 +17,16 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }static inline int set_memory_nx (unsigned long addr,int numpages) {return 0 ; }#endif +#ifndef CONFIG_ARCH_HAS_MEM_ENCRYPT +static inline int set_memory_encrypted (unsigned long addr,int numpages) +{ +return 0 ; +} + +static inline int set_memory_decrypted (unsigned long addr,int numpages) +{ +return 0 ; +} +#endif /* CONFIG_ARCH_HAS_MEM_ENCRYPT */ +#endif /* _LINUX_SET_MEMORY_H_ */
Signature · 1 line
2.14.2
Re: [PATCH 10/14] set_memory.h: provide set_memory_{en,de}crypted stubs
Quoted 2 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Konrad Rzeszutek Wilk <[email protected]>
Quoted 26 lines
--- include/linux/set_memory.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)include/linux/set_memory.h +12
-0@@ -17,4 +17,16 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }static inline int set_memory_nx (unsigned long addr,int numpages) {return 0 ; }#endif +#ifndef CONFIG_ARCH_HAS_MEM_ENCRYPT +static inline int set_memory_encrypted (unsigned long addr,int numpages) +{ +return 0 ; +} + +static inline int set_memory_decrypted (unsigned long addr,int numpages) +{ +return 0 ; +} +#endif /* CONFIG_ARCH_HAS_MEM_ENCRYPT */ +#endif /* _LINUX_SET_MEMORY_H_ */
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] set_memory.h: Provide set_memory_{en,de}crypted() stubs
In reply to Christoph Hellwigset_memory.h: Provide set_memory_{en,de}crypted() stubs
Commit-ID: b7fa07460b0f0e9fbe6d9319a0864c145bd59bcb Gitweb: https://git.kernel.org/tip/b7fa07460b0f0e9fbe6d9319a0864c145bd59bcb Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:22 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:58 +0100
set_memory.h: Provide set_memory_{en,de}crypted() stubs
... to make these APIs more universally available.
--- include/linux/set_memory.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/set_memory.h +12 -0
@@ -17,4 +17,16 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }static inline int set_memory_nx (unsigned long addr,int numpages) {return 0 ; }#endif +#ifndef CONFIG_ARCH_HAS_MEM_ENCRYPT +static inline int set_memory_encrypted (unsigned long addr,int numpages) +{ +return 0 ; +} + +static inline int set_memory_decrypted (unsigned long addr,int numpages) +{ +return 0 ; +} +#endif /* CONFIG_ARCH_HAS_MEM_ENCRYPT */ +#endif /* _LINUX_SET_MEMORY_H_ */
PATCH 11/14 swiotlb: remove swiotlb_set_mem_attributes
In reply to Christoph HellwigNow that set_memory_decrypted is always available we can just call it directly.
--- arch/x86/include/asm/mem_encrypt.h | 2 -- arch/x86/mm/mem_encrypt.c | 9 --------- lib/swiotlb.c | 12 ++++++------ 3 files changed, 6 insertions(+), 17 deletions(-)
arch/x86/include/asm/mem_encrypt.h +0 -2
@@ -48,8 +48,6 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size);/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ); -void swiotlb_set_mem_attributes (void *vaddr,unsigned long size); -bool sme_active (void );bool sev_active (void );
arch/x86/mm/mem_encrypt.c +0 -9
@@ -446,15 +446,6 @@ void __init mem_encrypt_init(void) : "Secure Memory Encryption (SME)"); } -void swiotlb_set_mem_attributes (void *vaddr,unsigned long size) -{ -WARN (PAGE_ALIGN (size) != size, -"size is not page-aligned (%#lx)\n" , size); - -/* Make the SWIOTLB buffer area decrypted */ -set_memory_decrypted ((unsigned long )vaddr, size >>PAGE_SHIFT ); -} -struct sme_populate_pgd_data {void *pgtable_area;pgd_t *pgd;
lib/swiotlb.c +6 -6
@@ -31,6 +31,7 @@#include <linux/gfp.h> #include <linux/scatterlist.h> #include <linux/mem_encrypt.h> +#include <linux/set_memory.h> #include <asm/io.h> #include <asm/dma.h>
@@ -156,8 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -void __weak swiotlb_set_mem_attributes (void *vaddr,unsigned long size) { } -/* For swiotlb, clear memory encryption mask from dma addresses */ static dma_addr_t swiotlb_phys_to_dma (struct device *hwdev,phys_addr_t address)
@@ -209,12 +208,12 @@ void __init swiotlb_update_mem_attributes(void) vaddr =phys_to_virt (io_tlb_start); bytes =PAGE_ALIGN (io_tlb_nslabs <<IO_TLB_SHIFT ); -swiotlb_set_mem_attributes (vaddr, bytes); +set_memory_decrypted ((unsigned long )vaddr, bytes >>PAGE_SHIFT );memset (vaddr,0 , bytes); vaddr =phys_to_virt (io_tlb_overflow_buffer); bytes =PAGE_ALIGN (io_tlb_overflow); -swiotlb_set_mem_attributes (vaddr, bytes); +set_memory_decrypted ((unsigned long )vaddr, bytes >>PAGE_SHIFT );memset (vaddr,0 , bytes); }
@@ -355,7 +354,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) io_tlb_start =virt_to_phys (tlb); io_tlb_end = io_tlb_start + bytes; -swiotlb_set_mem_attributes (tlb, bytes); +set_memory_decrypted ((unsigned long )tlb, bytes >>PAGE_SHIFT );memset (tlb,0 , bytes);/*
@@ -366,7 +365,8 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)if (!v_overflow_buffer) goto cleanup2; -swiotlb_set_mem_attributes (v_overflow_buffer, io_tlb_overflow); +set_memory_decrypted ((unsigned long )v_overflow_buffer, + io_tlb_overflow >>PAGE_SHIFT );memset (v_overflow_buffer,0 , io_tlb_overflow); io_tlb_overflow_buffer =virt_to_phys (v_overflow_buffer);
Signature · 1 line
2.14.2
Re: [PATCH 11/14] swiotlb: remove swiotlb_set_mem_attributes
Quoted 5 lines · Christoph Hellwig
Now that
set_memory_decryptedis always available we can just call it directly.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Konrad Rzeszutek Wilk <[email protected]>
Quoted 95 lines
--- arch/x86/include/asm/mem_encrypt.h | 2 -- arch/x86/mm/mem_encrypt.c | 9 --------- lib/swiotlb.c | 12 ++++++------ 3 files changed, 6 insertions(+), 17 deletions(-)arch/x86/include/asm/mem_encrypt.h +0
-2@@ -48,8 +48,6 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size);/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ); -void swiotlb_set_mem_attributes (void *vaddr,unsigned long size); -bool sme_active (void );bool sev_active (void );arch/x86/mm/mem_encrypt.c +0
-9@@ -446,15 +446,6 @@ void __init mem_encrypt_init(void) : "Secure Memory Encryption (SME)"); } -void swiotlb_set_mem_attributes (void *vaddr,unsigned long size) -{ -WARN (PAGE_ALIGN (size) != size, -"size is not page-aligned (%#lx)\n" , size); - -/* Make the SWIOTLB buffer area decrypted */ -set_memory_decrypted ((unsigned long )vaddr, size >>PAGE_SHIFT ); -} -struct sme_populate_pgd_data {void *pgtable_area;pgd_t *pgd;lib/swiotlb.c +6
-6@@ -31,6 +31,7 @@#include <linux/gfp.h> #include <linux/scatterlist.h> #include <linux/mem_encrypt.h> +#include <linux/set_memory.h> #include <asm/io.h> #include <asm/dma.h> @@ -156,8 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -void __weak swiotlb_set_mem_attributes (void *vaddr,unsigned long size) { } -/* For swiotlb, clear memory encryption mask from dma addresses */ static dma_addr_t swiotlb_phys_to_dma (struct device *hwdev,phys_addr_t address)@@ -209,12 +208,12 @@ void __init swiotlb_update_mem_attributes(void) vaddr =phys_to_virt (io_tlb_start); bytes =PAGE_ALIGN (io_tlb_nslabs <<IO_TLB_SHIFT ); -swiotlb_set_mem_attributes (vaddr, bytes); +set_memory_decrypted ((unsigned long )vaddr, bytes >>PAGE_SHIFT );memset (vaddr,0 , bytes); vaddr =phys_to_virt (io_tlb_overflow_buffer); bytes =PAGE_ALIGN (io_tlb_overflow); -swiotlb_set_mem_attributes (vaddr, bytes); +set_memory_decrypted ((unsigned long )vaddr, bytes >>PAGE_SHIFT );memset (vaddr,0 , bytes); }@@ -355,7 +354,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) io_tlb_start =virt_to_phys (tlb); io_tlb_end = io_tlb_start + bytes; -swiotlb_set_mem_attributes (tlb, bytes); +set_memory_decrypted ((unsigned long )tlb, bytes >>PAGE_SHIFT );memset (tlb,0 , bytes);/* @@ -366,7 +365,8 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)if (!v_overflow_buffer) goto cleanup2; -swiotlb_set_mem_attributes (v_overflow_buffer, io_tlb_overflow); +set_memory_decrypted ((unsigned long )v_overflow_buffer, + io_tlb_overflow >>PAGE_SHIFT );memset (v_overflow_buffer,0 , io_tlb_overflow); io_tlb_overflow_buffer =virt_to_phys (v_overflow_buffer);
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] dma/swiotlb: Remove swiotlb_set_mem_attributes()
In reply to Christoph Hellwigdma/swiotlb: Remove swiotlb_set_mem_attributes()
Commit-ID: e7de6c7cc207be78369d45fb833d7d53aeda47f8 Gitweb: https://git.kernel.org/tip/e7de6c7cc207be78369d45fb833d7d53aeda47f8 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:23 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:58 +0100
dma/swiotlb: Remove swiotlb_set_mem_attributes()
Now that set_memory_decrypted() is always available we can just call it directly.
--- arch/x86/include/asm/mem_encrypt.h | 2 -- arch/x86/mm/mem_encrypt.c | 8 -------- lib/swiotlb.c | 12 ++++++------ 3 files changed, 6 insertions(+), 16 deletions(-)
arch/x86/include/asm/mem_encrypt.h +0 -2
@@ -49,8 +49,6 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size);/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ); -void swiotlb_set_mem_attributes (void *vaddr,unsigned long size); -bool sme_active (void );bool sev_active (void );
arch/x86/mm/mem_encrypt.c +0 -8
@@ -441,11 +441,3 @@ void __init mem_encrypt_init(void) : "Secure Memory Encryption (SME)"); } -void swiotlb_set_mem_attributes (void *vaddr,unsigned long size) -{ -WARN (PAGE_ALIGN (size) != size, -"size is not page-aligned (%#lx)\n" , size); - -/* Make the SWIOTLB buffer area decrypted */ -set_memory_decrypted ((unsigned long )vaddr, size >>PAGE_SHIFT ); -}
lib/swiotlb.c +6 -6
@@ -31,6 +31,7 @@#include <linux/gfp.h> #include <linux/scatterlist.h> #include <linux/mem_encrypt.h> +#include <linux/set_memory.h> #include <asm/io.h> #include <asm/dma.h>
@@ -156,8 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -void __weak swiotlb_set_mem_attributes (void *vaddr,unsigned long size) { } -/* For swiotlb, clear memory encryption mask from dma addresses */ static dma_addr_t swiotlb_phys_to_dma (struct device *hwdev,phys_addr_t address)
@@ -209,12 +208,12 @@ void __init swiotlb_update_mem_attributes(void) vaddr =phys_to_virt (io_tlb_start); bytes =PAGE_ALIGN (io_tlb_nslabs <<IO_TLB_SHIFT ); -swiotlb_set_mem_attributes (vaddr, bytes); +set_memory_decrypted ((unsigned long )vaddr, bytes >>PAGE_SHIFT );memset (vaddr,0 , bytes); vaddr =phys_to_virt (io_tlb_overflow_buffer); bytes =PAGE_ALIGN (io_tlb_overflow); -swiotlb_set_mem_attributes (vaddr, bytes); +set_memory_decrypted ((unsigned long )vaddr, bytes >>PAGE_SHIFT );memset (vaddr,0 , bytes); }
@@ -355,7 +354,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) io_tlb_start =virt_to_phys (tlb); io_tlb_end = io_tlb_start + bytes; -swiotlb_set_mem_attributes (tlb, bytes); +set_memory_decrypted ((unsigned long )tlb, bytes >>PAGE_SHIFT );memset (tlb,0 , bytes);/*
@@ -366,7 +365,8 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)if (!v_overflow_buffer) goto cleanup2; -swiotlb_set_mem_attributes (v_overflow_buffer, io_tlb_overflow); +set_memory_decrypted ((unsigned long )v_overflow_buffer, + io_tlb_overflow >>PAGE_SHIFT );memset (v_overflow_buffer,0 , io_tlb_overflow); io_tlb_overflow_buffer =virt_to_phys (v_overflow_buffer);
PATCH 12/14 dma-direct: handle the memory encryption bit in common code
In reply to Christoph HellwigGive the basic phys_to_dma and dma_to_phys helpers a __-prefix and add the memory encryption mask to the non-prefixed versions. Use the __-prefixed versions directly instead of clearing the mask again in various places.
--- arch/arm/include/asm/dma-direct.h | 4 ++-- arch/mips/cavium-octeon/dma-octeon.c | 10 ++++----- .../include/asm/mach-cavium-octeon/dma-coherence.h | 4 ++-- .../include/asm/mach-loongson64/dma-coherence.h | 10 ++++----- arch/mips/loongson64/common/dma-swiotlb.c | 4 ++-- arch/powerpc/include/asm/dma-direct.h | 4 ++-- arch/x86/Kconfig | 2 +- arch/x86/include/asm/dma-direct.h | 25 ++-------------------- arch/x86/mm/mem_encrypt.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 6 +++--- include/linux/dma-direct.h | 21 ++++++++++++++++-- lib/swiotlb.c | 25 ++++++++-------------- 12 files changed, 53 insertions(+), 64 deletions(-)
arch/arm/include/asm/dma-direct.h +2 -2
@@ -2,13 +2,13 @@#ifndef ASM_ARM_DMA_DIRECT_H #define ASM_ARM_DMA_DIRECT_H 1 -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {unsigned int offset = paddr & ~PAGE_MASK ;return pfn_to_dma (dev,__phys_to_pfn (paddr)) + offset; } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {unsigned int offset = dev_addr & ~PAGE_MASK ;return __pfn_to_phys (dma_to_pfn (dev, dev_addr)) + offset;
arch/mips/cavium-octeon/dma-octeon.c +5 -5
@@ -10,7 +10,7 @@* IP32 changes by Ilya. * Copyright (C) 2010 Cavium Networks, Inc. */ -#include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/scatterlist.h> #include <linux/bootmem.h> #include <linux/export.h>
@@ -182,7 +182,7 @@ struct octeon_dma_map_ops {phys_addr_t (*dma_to_phys)(struct device *dev,dma_addr_t daddr); }; -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,
@@ -190,9 +190,9 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return ops->phys_to_dma (dev, paddr); } -EXPORT_SYMBOL (phys_to_dma); +EXPORT_SYMBOL (__phys_to_dma); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,
@@ -200,7 +200,7 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)return ops->dma_to_phys (dev, daddr); } -EXPORT_SYMBOL (dma_to_phys); +EXPORT_SYMBOL (__dma_to_phys);static struct octeon_dma_map_ops octeon_linear_dma_map_ops = { .dma_map_ops = {
arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +2 -2
@@ -69,8 +69,8 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);struct dma_map_ops ;extern const struct dma_map_ops *octeon_pci_dma_map_ops;
arch/mips/include/asm/mach-loongson64/dma-coherence.h +5 -5
@@ -25,13 +25,13 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -extern dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -extern phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +extern dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +extern phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);static inline dma_addr_t plat_map_dma_mem (struct device *dev,void *addr,size_t size) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,virt_to_phys (addr)); +return __phys_to_dma (dev,virt_to_phys (addr));#else return virt_to_phys (addr) |0x80000000 ;#endif
@@ -41,7 +41,7 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,page_to_phys (page)); +return __phys_to_dma (dev,page_to_phys (page));#else return page_to_phys (page) |0x80000000 ;#endif
@@ -51,7 +51,7 @@ static inline unsigned long plat_dma_addr_to_phys(struct device *dev, dma_addr_t dma_addr) {#if defined(CONFIG_CPU_LOONGSON3 ) && defined(CONFIG_64BIT ) -return dma_to_phys (dev, dma_addr); +return __dma_to_phys (dev, dma_addr);#elif defined(CONFIG_CPU_LOONGSON2F ) && defined(CONFIG_64BIT )return (dma_addr >0x8fffffff ) ? dma_addr : (dma_addr &0x0fffffff );#else
arch/mips/loongson64/common/dma-swiotlb.c +2 -2
@@ -63,7 +63,7 @@ static int loongson_dma_supported(struct device *dev, u64 mask)return swiotlb_dma_supported (dev, mask); } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40
@@ -75,7 +75,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return paddr; } -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40
arch/powerpc/include/asm/dma-direct.h +2 -2
@@ -17,12 +17,12 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {return paddr +get_dma_offset (dev); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {return daddr -get_dma_offset (dev); }
arch/x86/Kconfig +1 -1
@@ -54,7 +54,6 @@ config X86 select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV if X86_64 - select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_PMEM_API if X86_64 select ARCH_HAS_REFCOUNT
@@ -692,6 +691,7 @@ config X86_SUPPORTS_MEMORY_FAILURE config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI + select ARCH_HAS_PHYS_TO_DMA select X86_DEV_DMA_OPS select X86_DMA_REMAP select SWIOTLB
arch/x86/include/asm/dma-direct.h +2 -23
@@ -2,29 +2,8 @@#ifndef ASM_X86_DMA_DIRECT_H #define ASM_X86_DMA_DIRECT_H 1 -#include <linux/mem_encrypt.h> - -#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */ bool dma_capable (struct device *dev,dma_addr_t addr,size_t size); -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); -#else -static inline bool dma_capable (struct device *dev,dma_addr_t addr,size_t size) -{ -if (!dev->dma_mask) -return 0 ; - -return addr + size -1 <= *dev->dma_mask; -} - -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) -{ -return __sme_set (paddr); -} +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr); -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) -{ -return __sme_clr (daddr); -} -#endif /* CONFIG_X86_DMA_REMAP */ #endif /* ASM_X86_DMA_DIRECT_H */
arch/x86/mm/mem_encrypt.c +1 -1
@@ -216,7 +216,7 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,* Since we will be clearing the encryption bit, check the * mask with it already cleared. */ - addr =__sme_clr (phys_to_dma (dev,page_to_phys (page))); + addr =__phys_to_dma (dev,page_to_phys (page));if ((addr + size) > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); }else {
arch/x86/pci/sta2x11-fixup.c +3 -3
@@ -207,11 +207,11 @@ bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }/** -* phys_to_dma - Return the DMA AMBA address used for this STA2x11 device +* __phys_to_dma - Return the DMA AMBA address used for this STA2x11 device * @dev: device for a PCI device * @paddr: Physical address */ -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {if (!dev->archdata.is_sta2x11)return paddr;
@@ -223,7 +223,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)* @dev: device for a PCI device * @daddr: STA2x11 AMBA DMA address */ -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {if (!dev->archdata.is_sta2x11)return daddr;
include/linux/dma-direct.h +19 -2
@@ -3,18 +3,19 @@#define _LINUX_DMA_DIRECT_H 1#include <linux/dma-mapping.h> +#include <linux/mem_encrypt.h> #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA #include <asm/dma-direct.h> #else -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {dma_addr_t dev_addr = (dma_addr_t )paddr;return dev_addr - ((dma_addr_t )dev->dma_pfn_offset <<PAGE_SHIFT ); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {phys_addr_t paddr = (phys_addr_t )dev_addr;
@@ -30,6 +31,22 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */ +/* +* If memory encryption is supported, phys_to_dma will set the memory encryption +* bit in the DMA address, and dma_to_phys will clear it. The raw __phys_to_dma +* and __dma_to_phys versions should only be used on non-encrypted memory for +* special occasions like DMA coherent buffers. +*/ +static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +{ +return __sme_set (__phys_to_dma (dev, paddr)); +} + +static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +{ +return __sme_clr (__dma_to_phys (dev, daddr)); +} +#ifdef CONFIG_ARCH_HAS_DMA_MARK_CLEAN void dma_mark_clean (void *addr,size_t size);#else
lib/swiotlb.c +9 -16
@@ -157,13 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -/* For swiotlb, clear memory encryption mask from dma addresses */ -static dma_addr_t swiotlb_phys_to_dma (struct device *hwdev, -phys_addr_t address) -{ -return __sme_clr (phys_to_dma (hwdev, address)); -} -/* Note that this doesn't work with highmem page */ static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev,volatile void *address)
@@ -622,7 +615,7 @@ map_single(struct device *hwdev, phys_addr_t phys, size_t size,return SWIOTLB_MAP_ERROR ; } - start_dma_addr =swiotlb_phys_to_dma (hwdev, io_tlb_start); + start_dma_addr =__phys_to_dma (hwdev, io_tlb_start);return swiotlb_tbl_map_single (hwdev, start_dma_addr, phys, size, dir, attrs); }
@@ -726,12 +719,12 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle, goto out_warn; phys_addr =swiotlb_tbl_map_single (dev, -swiotlb_phys_to_dma (dev, io_tlb_start), +__phys_to_dma (dev, io_tlb_start),0 , size,DMA_FROM_DEVICE ,0 );if (phys_addr ==SWIOTLB_MAP_ERROR ) goto out_warn; - *dma_handle =swiotlb_phys_to_dma (dev, phys_addr); + *dma_handle =__phys_to_dma (dev, phys_addr);if (dma_coherent_ok (dev, *dma_handle, size)) goto out_unmap;
@@ -867,10 +860,10 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, map =map_single (dev, phys, size, dir, attrs);if (map ==SWIOTLB_MAP_ERROR ) {swiotlb_full (dev, size, dir,1 ); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); } - dev_addr =swiotlb_phys_to_dma (dev, map); + dev_addr =__phys_to_dma (dev, map);/* Ensure that the address returned is DMA'ble */ if (dma_capable (dev, dev_addr, size))
@@ -879,7 +872,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, attrs |=DMA_ATTR_SKIP_CPU_SYNC ;swiotlb_tbl_unmap_single (dev, map, size, dir, attrs); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); }/*
@@ -1009,7 +1002,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,sg_dma_len (sgl) =0 ;return 0 ; } - sg->dma_address =swiotlb_phys_to_dma (hwdev, map); + sg->dma_address =__phys_to_dma (hwdev, map); }else sg->dma_address = dev_addr;sg_dma_len (sg) = sg->length;
@@ -1073,7 +1066,7 @@ swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,int swiotlb_dma_mapping_error (struct device *hwdev,dma_addr_t dma_addr) { -return (dma_addr ==swiotlb_phys_to_dma (hwdev, io_tlb_overflow_buffer)); +return (dma_addr ==__phys_to_dma (hwdev, io_tlb_overflow_buffer)); }/*
@@ -1085,7 +1078,7 @@ swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)int swiotlb_dma_supported (struct device *hwdev,u64 mask) { -return swiotlb_phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; +return __phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; }#ifdef CONFIG_DMA_DIRECT_OPS
Signature · 1 line
2.14.2
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 6 lines · Christoph Hellwig
Give the basic
phys_to_dmaanddma_to_physhelpers a __-prefix and add the memory encryption mask to the non-prefixed versions. Use the __-prefixed versions directly instead of clearing the mask again in various places.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 410 lines
--- arch/arm/include/asm/dma-direct.h | 4 ++-- arch/mips/cavium-octeon/dma-octeon.c | 10 ++++----- .../include/asm/mach-cavium-octeon/dma-coherence.h | 4 ++-- .../include/asm/mach-loongson64/dma-coherence.h | 10 ++++----- arch/mips/loongson64/common/dma-swiotlb.c | 4 ++-- arch/powerpc/include/asm/dma-direct.h | 4 ++-- arch/x86/Kconfig | 2 +- arch/x86/include/asm/dma-direct.h | 25 ++-------------------- arch/x86/mm/mem_encrypt.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 6 +++--- include/linux/dma-direct.h | 21 ++++++++++++++++-- lib/swiotlb.c | 25 ++++++++-------------- 12 files changed, 53 insertions(+), 64 deletions(-)arch/arm/include/asm/dma-direct.h +2
-2@@ -2,13 +2,13 @@#ifndef ASM_ARM_DMA_DIRECT_H #define ASM_ARM_DMA_DIRECT_H 1 -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {unsigned int offset = paddr & ~PAGE_MASK ;return pfn_to_dma (dev,__phys_to_pfn (paddr)) + offset; } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {unsigned int offset = dev_addr & ~PAGE_MASK ;return __pfn_to_phys (dma_to_pfn (dev, dev_addr)) + offset;arch/mips/cavium-octeon/dma-octeon.c +5
-5@@ -10,7 +10,7 @@* IP32 changes by Ilya. * Copyright (C) 2010 Cavium Networks, Inc. */ -#include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/scatterlist.h> #include <linux/bootmem.h> #include <linux/export.h> @@ -182,7 +182,7 @@ struct octeon_dma_map_ops {phys_addr_t (*dma_to_phys)(struct device *dev,dma_addr_t daddr); }; -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,@@ -190,9 +190,9 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return ops->phys_to_dma (dev, paddr); } -EXPORT_SYMBOL (phys_to_dma); +EXPORT_SYMBOL (__phys_to_dma); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,@@ -200,7 +200,7 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)return ops->dma_to_phys (dev, daddr); } -EXPORT_SYMBOL (dma_to_phys); +EXPORT_SYMBOL (__dma_to_phys);static struct octeon_dma_map_ops octeon_linear_dma_map_ops = { .dma_map_ops = {arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +2
-2@@ -69,8 +69,8 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);struct dma_map_ops ;extern const struct dma_map_ops *octeon_pci_dma_map_ops;arch/mips/include/asm/mach-loongson64/dma-coherence.h +5
-5@@ -25,13 +25,13 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -extern dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -extern phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +extern dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +extern phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);static inline dma_addr_t plat_map_dma_mem (struct device *dev,void *addr,size_t size) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,virt_to_phys (addr)); +return __phys_to_dma (dev,virt_to_phys (addr));#else return virt_to_phys (addr) |0x80000000 ;#endif @@ -41,7 +41,7 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,page_to_phys (page)); +return __phys_to_dma (dev,page_to_phys (page));#else return page_to_phys (page) |0x80000000 ;#endif @@ -51,7 +51,7 @@ static inline unsigned long plat_dma_addr_to_phys(struct device *dev, dma_addr_t dma_addr) {#if defined(CONFIG_CPU_LOONGSON3 ) && defined(CONFIG_64BIT ) -return dma_to_phys (dev, dma_addr); +return __dma_to_phys (dev, dma_addr);#elif defined(CONFIG_CPU_LOONGSON2F ) && defined(CONFIG_64BIT )return (dma_addr >0x8fffffff ) ? dma_addr : (dma_addr &0x0fffffff );#else arch/mips/loongson64/common/dma-swiotlb.c +2
-2@@ -63,7 +63,7 @@ static int loongson_dma_supported(struct device *dev, u64 mask)return swiotlb_dma_supported (dev, mask); } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40 @@ -75,7 +75,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return paddr; } -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40 arch/powerpc/include/asm/dma-direct.h +2
-2@@ -17,12 +17,12 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {return paddr +get_dma_offset (dev); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {return daddr -get_dma_offset (dev); }arch/x86/Kconfig +1
-1@@ -54,7 +54,6 @@ config X86 select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV if X86_64 - select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_PMEM_API if X86_64 select ARCH_HAS_REFCOUNT@@ -692,6 +691,7 @@ config X86_SUPPORTS_MEMORY_FAILURE config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI + select ARCH_HAS_PHYS_TO_DMA select X86_DEV_DMA_OPS select X86_DMA_REMAP select SWIOTLBarch/x86/include/asm/dma-direct.h +2
-23@@ -2,29 +2,8 @@#ifndef ASM_X86_DMA_DIRECT_H #define ASM_X86_DMA_DIRECT_H 1 -#include <linux/mem_encrypt.h> - -#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */ bool dma_capable (struct device *dev,dma_addr_t addr,size_t size); -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); -#else -static inline bool dma_capable (struct device *dev,dma_addr_t addr,size_t size) -{ -if (!dev->dma_mask) -return 0 ; - -return addr + size -1 <= *dev->dma_mask; -} - -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) -{ -return __sme_set (paddr); -} +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr); -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) -{ -return __sme_clr (daddr); -} -#endif /* CONFIG_X86_DMA_REMAP */ #endif /* ASM_X86_DMA_DIRECT_H */ arch/x86/mm/mem_encrypt.c +1
-1@@ -216,7 +216,7 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,* Since we will be clearing the encryption bit, check the * mask with it already cleared. */ - addr =__sme_clr (phys_to_dma (dev,page_to_phys (page))); + addr =__phys_to_dma (dev,page_to_phys (page));if ((addr + size) > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); }else {arch/x86/pci/sta2x11-fixup.c +3
-3@@ -207,11 +207,11 @@ bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }/** -* phys_to_dma - Return the DMA AMBA address used for this STA2x11 device +* __phys_to_dma - Return the DMA AMBA address used for this STA2x11 device * @dev: device for a PCI device * @paddr: Physical address */ -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {if (!dev->archdata.is_sta2x11)return paddr;@@ -223,7 +223,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)* @dev: device for a PCI device * @daddr: STA2x11 AMBA DMA address */ -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {if (!dev->archdata.is_sta2x11)return daddr;include/linux/dma-direct.h +19
-2@@ -3,18 +3,19 @@#define _LINUX_DMA_DIRECT_H 1#include <linux/dma-mapping.h> +#include <linux/mem_encrypt.h> #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA #include <asm/dma-direct.h> #else -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {dma_addr_t dev_addr = (dma_addr_t )paddr;return dev_addr - ((dma_addr_t )dev->dma_pfn_offset <<PAGE_SHIFT ); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {phys_addr_t paddr = (phys_addr_t )dev_addr;@@ -30,6 +31,22 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */ +/* +* If memory encryption is supported, phys_to_dma will set the memory encryption +* bit in the DMA address, and dma_to_phys will clear it. The raw __phys_to_dma +* and __dma_to_phys versions should only be used on non-encrypted memory for +* special occasions like DMA coherent buffers. +*/ +static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +{ +return __sme_set (__phys_to_dma (dev, paddr)); +} + +static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +{ +return __sme_clr (__dma_to_phys (dev, daddr)); +} +#ifdef CONFIG_ARCH_HAS_DMA_MARK_CLEAN void dma_mark_clean (void *addr,size_t size);#else lib/swiotlb.c +9
-16@@ -157,13 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -/* For swiotlb, clear memory encryption mask from dma addresses */ -static dma_addr_t swiotlb_phys_to_dma (struct device *hwdev, -phys_addr_t address) -{ -return __sme_clr (phys_to_dma (hwdev, address)); -} -/* Note that this doesn't work with highmem page */ static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev,volatile void *address)@@ -622,7 +615,7 @@ map_single(struct device *hwdev, phys_addr_t phys, size_t size,return SWIOTLB_MAP_ERROR ; } - start_dma_addr =swiotlb_phys_to_dma (hwdev, io_tlb_start); + start_dma_addr =__phys_to_dma (hwdev, io_tlb_start);return swiotlb_tbl_map_single (hwdev, start_dma_addr, phys, size, dir, attrs); }@@ -726,12 +719,12 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle, goto out_warn; phys_addr =swiotlb_tbl_map_single (dev, -swiotlb_phys_to_dma (dev, io_tlb_start), +__phys_to_dma (dev, io_tlb_start),0 , size,DMA_FROM_DEVICE ,0 );if (phys_addr ==SWIOTLB_MAP_ERROR ) goto out_warn; - *dma_handle =swiotlb_phys_to_dma (dev, phys_addr); + *dma_handle =__phys_to_dma (dev, phys_addr);if (dma_coherent_ok (dev, *dma_handle, size)) goto out_unmap;@@ -867,10 +860,10 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, map =map_single (dev, phys, size, dir, attrs);if (map ==SWIOTLB_MAP_ERROR ) {swiotlb_full (dev, size, dir,1 ); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); } - dev_addr =swiotlb_phys_to_dma (dev, map); + dev_addr =__phys_to_dma (dev, map);/* Ensure that the address returned is DMA'ble */ if (dma_capable (dev, dev_addr, size))@@ -879,7 +872,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, attrs |=DMA_ATTR_SKIP_CPU_SYNC ;swiotlb_tbl_unmap_single (dev, map, size, dir, attrs); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); }/* @@ -1009,7 +1002,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,sg_dma_len (sgl) =0 ;return 0 ; } - sg->dma_address =swiotlb_phys_to_dma (hwdev, map); + sg->dma_address =__phys_to_dma (hwdev, map); }else sg->dma_address = dev_addr;sg_dma_len (sg) = sg->length;@@ -1073,7 +1066,7 @@ swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,int swiotlb_dma_mapping_error (struct device *hwdev,dma_addr_t dma_addr) { -return (dma_addr ==swiotlb_phys_to_dma (hwdev, io_tlb_overflow_buffer)); +return (dma_addr ==__phys_to_dma (hwdev, io_tlb_overflow_buffer)); }/* @@ -1085,7 +1078,7 @@ swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)int swiotlb_dma_supported (struct device *hwdev,u64 mask) { -return swiotlb_phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; +return __phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; }#ifdef CONFIG_DMA_DIRECT_OPS
Robin Murphy
reviewerRe: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
Give the basic
phys_to_dmaanddma_to_physhelpers a __-prefix and add the memory encryption mask to the non-prefixed versions. Use the __-prefixed versions directly instead of clearing the mask again in various places.Signed-off-by Christoph Hellwig <[email protected]>--- arch/arm/include/asm/dma-direct.h | 4 ++--
As a heads-up, I've just realised there's now a silent (but build-breaking) conflict with the current arm64 queue brewing here, as we've unfortunately had to reintroduce ARCH_HAS_PHYS_TO_DMA as a means of being safe against an ugly architectural corner case - currently commit 1f85b42a691c ("arm64: Revert L1_CACHE_SHIFT back to 6 (64-byte cache line size)") in -next.
Robin.
Quoted 408 lines
arch/mips/cavium-octeon/dma-octeon.c | 10 ++++----- .../include/asm/mach-cavium-octeon/dma-coherence.h | 4 ++-- .../include/asm/mach-loongson64/dma-coherence.h | 10 ++++----- arch/mips/loongson64/common/dma-swiotlb.c | 4 ++-- arch/powerpc/include/asm/dma-direct.h | 4 ++-- arch/x86/Kconfig | 2 +- arch/x86/include/asm/dma-direct.h | 25 ++-------------------- arch/x86/mm/mem_encrypt.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 6 +++--- include/linux/dma-direct.h | 21 ++++++++++++++++-- lib/swiotlb.c | 25 ++++++++-------------- 12 files changed, 53 insertions(+), 64 deletions(-)arch/arm/include/asm/dma-direct.h +2
-2@@ -2,13 +2,13 @@#ifndef ASM_ARM_DMA_DIRECT_H #define ASM_ARM_DMA_DIRECT_H 1 -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {unsigned int offset = paddr & ~PAGE_MASK ;return pfn_to_dma (dev,__phys_to_pfn (paddr)) + offset; } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {unsigned int offset = dev_addr & ~PAGE_MASK ;return __pfn_to_phys (dma_to_pfn (dev, dev_addr)) + offset;arch/mips/cavium-octeon/dma-octeon.c +5
-5@@ -10,7 +10,7 @@* IP32 changes by Ilya. * Copyright (C) 2010 Cavium Networks, Inc. */ -#include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/scatterlist.h> #include <linux/bootmem.h> #include <linux/export.h> @@ -182,7 +182,7 @@ struct octeon_dma_map_ops {phys_addr_t (*dma_to_phys)(struct device *dev,dma_addr_t daddr); }; -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,@@ -190,9 +190,9 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return ops->phys_to_dma (dev, paddr); } -EXPORT_SYMBOL (phys_to_dma); +EXPORT_SYMBOL (__phys_to_dma); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,@@ -200,7 +200,7 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)return ops->dma_to_phys (dev, daddr); } -EXPORT_SYMBOL (dma_to_phys); +EXPORT_SYMBOL (__dma_to_phys);static struct octeon_dma_map_ops octeon_linear_dma_map_ops = { .dma_map_ops = {arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +2
-2@@ -69,8 +69,8 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);struct dma_map_ops ;extern const struct dma_map_ops *octeon_pci_dma_map_ops;arch/mips/include/asm/mach-loongson64/dma-coherence.h +5
-5@@ -25,13 +25,13 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -extern dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -extern phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +extern dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +extern phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);static inline dma_addr_t plat_map_dma_mem (struct device *dev,void *addr,size_t size) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,virt_to_phys (addr)); +return __phys_to_dma (dev,virt_to_phys (addr));#else return virt_to_phys (addr) |0x80000000 ;#endif @@ -41,7 +41,7 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,page_to_phys (page)); +return __phys_to_dma (dev,page_to_phys (page));#else return page_to_phys (page) |0x80000000 ;#endif @@ -51,7 +51,7 @@ static inline unsigned long plat_dma_addr_to_phys(struct device *dev, dma_addr_t dma_addr) {#if defined(CONFIG_CPU_LOONGSON3 ) && defined(CONFIG_64BIT ) -return dma_to_phys (dev, dma_addr); +return __dma_to_phys (dev, dma_addr);#elif defined(CONFIG_CPU_LOONGSON2F ) && defined(CONFIG_64BIT )return (dma_addr >0x8fffffff ) ? dma_addr : (dma_addr &0x0fffffff );#else arch/mips/loongson64/common/dma-swiotlb.c +2
-2@@ -63,7 +63,7 @@ static int loongson_dma_supported(struct device *dev, u64 mask)return swiotlb_dma_supported (dev, mask); } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40 @@ -75,7 +75,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return paddr; } -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40 arch/powerpc/include/asm/dma-direct.h +2
-2@@ -17,12 +17,12 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {return paddr +get_dma_offset (dev); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {return daddr -get_dma_offset (dev); }arch/x86/Kconfig +1
-1@@ -54,7 +54,6 @@ config X86 select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV if X86_64 - select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_PMEM_API if X86_64 select ARCH_HAS_REFCOUNT@@ -692,6 +691,7 @@ config X86_SUPPORTS_MEMORY_FAILURE config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI + select ARCH_HAS_PHYS_TO_DMA select X86_DEV_DMA_OPS select X86_DMA_REMAP select SWIOTLBarch/x86/include/asm/dma-direct.h +2
-23@@ -2,29 +2,8 @@#ifndef ASM_X86_DMA_DIRECT_H #define ASM_X86_DMA_DIRECT_H 1 -#include <linux/mem_encrypt.h> - -#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */ bool dma_capable (struct device *dev,dma_addr_t addr,size_t size); -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); -#else -static inline bool dma_capable (struct device *dev,dma_addr_t addr,size_t size) -{ -if (!dev->dma_mask) -return 0 ; - -return addr + size -1 <= *dev->dma_mask; -} - -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) -{ -return __sme_set (paddr); -} +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr); -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) -{ -return __sme_clr (daddr); -} -#endif /* CONFIG_X86_DMA_REMAP */ #endif /* ASM_X86_DMA_DIRECT_H */ arch/x86/mm/mem_encrypt.c +1
-1@@ -216,7 +216,7 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,* Since we will be clearing the encryption bit, check the * mask with it already cleared. */ - addr =__sme_clr (phys_to_dma (dev,page_to_phys (page))); + addr =__phys_to_dma (dev,page_to_phys (page));if ((addr + size) > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); }else {arch/x86/pci/sta2x11-fixup.c +3
-3@@ -207,11 +207,11 @@ bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }/** -* phys_to_dma - Return the DMA AMBA address used for this STA2x11 device +* __phys_to_dma - Return the DMA AMBA address used for this STA2x11 device * @dev: device for a PCI device * @paddr: Physical address */ -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {if (!dev->archdata.is_sta2x11)return paddr;@@ -223,7 +223,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)* @dev: device for a PCI device * @daddr: STA2x11 AMBA DMA address */ -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {if (!dev->archdata.is_sta2x11)return daddr;include/linux/dma-direct.h +19
-2@@ -3,18 +3,19 @@#define _LINUX_DMA_DIRECT_H 1#include <linux/dma-mapping.h> +#include <linux/mem_encrypt.h> #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA #include <asm/dma-direct.h> #else -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {dma_addr_t dev_addr = (dma_addr_t )paddr;return dev_addr - ((dma_addr_t )dev->dma_pfn_offset <<PAGE_SHIFT ); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {phys_addr_t paddr = (phys_addr_t )dev_addr;@@ -30,6 +31,22 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */ +/* +* If memory encryption is supported, phys_to_dma will set the memory encryption +* bit in the DMA address, and dma_to_phys will clear it. The raw __phys_to_dma +* and __dma_to_phys versions should only be used on non-encrypted memory for +* special occasions like DMA coherent buffers. +*/ +static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +{ +return __sme_set (__phys_to_dma (dev, paddr)); +} + +static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +{ +return __sme_clr (__dma_to_phys (dev, daddr)); +} +#ifdef CONFIG_ARCH_HAS_DMA_MARK_CLEAN void dma_mark_clean (void *addr,size_t size);#else lib/swiotlb.c +9
-16@@ -157,13 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -/* For swiotlb, clear memory encryption mask from dma addresses */ -static dma_addr_t swiotlb_phys_to_dma (struct device *hwdev, -phys_addr_t address) -{ -return __sme_clr (phys_to_dma (hwdev, address)); -} -/* Note that this doesn't work with highmem page */ static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev,volatile void *address)@@ -622,7 +615,7 @@ map_single(struct device *hwdev, phys_addr_t phys, size_t size,return SWIOTLB_MAP_ERROR ; } - start_dma_addr =swiotlb_phys_to_dma (hwdev, io_tlb_start); + start_dma_addr =__phys_to_dma (hwdev, io_tlb_start);return swiotlb_tbl_map_single (hwdev, start_dma_addr, phys, size, dir, attrs); }@@ -726,12 +719,12 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle, goto out_warn; phys_addr =swiotlb_tbl_map_single (dev, -swiotlb_phys_to_dma (dev, io_tlb_start), +__phys_to_dma (dev, io_tlb_start),0 , size,DMA_FROM_DEVICE ,0 );if (phys_addr ==SWIOTLB_MAP_ERROR ) goto out_warn; - *dma_handle =swiotlb_phys_to_dma (dev, phys_addr); + *dma_handle =__phys_to_dma (dev, phys_addr);if (dma_coherent_ok (dev, *dma_handle, size)) goto out_unmap;@@ -867,10 +860,10 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, map =map_single (dev, phys, size, dir, attrs);if (map ==SWIOTLB_MAP_ERROR ) {swiotlb_full (dev, size, dir,1 ); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); } - dev_addr =swiotlb_phys_to_dma (dev, map); + dev_addr =__phys_to_dma (dev, map);/* Ensure that the address returned is DMA'ble */ if (dma_capable (dev, dev_addr, size))@@ -879,7 +872,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, attrs |=DMA_ATTR_SKIP_CPU_SYNC ;swiotlb_tbl_unmap_single (dev, map, size, dir, attrs); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); }/* @@ -1009,7 +1002,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,sg_dma_len (sgl) =0 ;return 0 ; } - sg->dma_address =swiotlb_phys_to_dma (hwdev, map); + sg->dma_address =__phys_to_dma (hwdev, map); }else sg->dma_address = dev_addr;sg_dma_len (sg) = sg->length;@@ -1073,7 +1066,7 @@ swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,int swiotlb_dma_mapping_error (struct device *hwdev,dma_addr_t dma_addr) { -return (dma_addr ==swiotlb_phys_to_dma (hwdev, io_tlb_overflow_buffer)); +return (dma_addr ==__phys_to_dma (hwdev, io_tlb_overflow_buffer)); }/* @@ -1085,7 +1078,7 @@ swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)int swiotlb_dma_supported (struct device *hwdev,u64 mask) { -return swiotlb_phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; +return __phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; }#ifdef CONFIG_DMA_DIRECT_OPS
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 5 lines · Robin Murphy
As a heads-up, I've just realised there's now a silent (but build-breaking) conflict with the current arm64 queue brewing here, as we've unfortunately had to reintroduce
ARCH_HAS_PHYS_TO_DMAas a means of being safe against an ugly architectural corner case - currently commit1f85b42a691c("arm64:
RevertL1_CACHE_SHIFTback to 6 (64-byte cache line size)") in -next.
Please revert that arm64 commit. This condition should be handled in common code as it is not arm specific. And next time please CC the iommu list and dma-mapping maintainers before doing such a change.
Robin Murphy
reviewerRe: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Robin Murphy
As a heads-up, I've just realised there's now a silent (but build-breaking) conflict with the current arm64 queue brewing here, as we've unfortunately had to reintroduce
ARCH_HAS_PHYS_TO_DMAas a means of being safe against an ugly architectural corner case - currently commit1f85b42a691c("arm64:
RevertL1_CACHE_SHIFTback to 6 (64-byte cache line size)") in -next.Please revert that arm64 commit. This condition should be handled in common code as it is not arm specific. And next time please CC the iommu list and dma-mapping maintainers before doing such a change.
There didn't seem enough justification to clutter up core SWIOTLB code with the ability to force bouncing on a per-device basis, but if you think there are real potential users out there then fair enough. For arm64, it's extremely unlikely that anyone will ever build a sufficiently wacky system to actually hit this code path; we really only implemented it for peace of mind per the letter of the architecture.
Robin.
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 12 lines · Robin Murphy
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Robin Murphy
As a heads-up, I've just realised there's now a silent (but build-breaking) conflict with the current arm64 queue brewing here, as we've unfortunately had to reintroduce
ARCH_HAS_PHYS_TO_DMAas a means of being safe against an ugly architectural corner case - currently commit1f85b42a691c("arm64:
RevertL1_CACHE_SHIFTback to 6 (64-byte cache line size)") in -next.Please revert that arm64 commit. This condition should be handled in common code as it is not arm specific. And next time please CC the iommu list and dma-mapping maintainers before doing such a change.
Quoted 6 lines
There didn't seem enough justification to clutter up core SWIOTLB code with the ability to force bouncing on a per-device basis, but if you think there are real potential users out there then fair enough. For arm64, it's extremely unlikely that anyone will ever build a sufficiently wacky system to actually hit this code path; we really only implemented it for peace of mind per the letter of the architecture.
I'm less sure. We will certainly see systems with large writeback granules, the real question is whether or not they will be expected to work with non-coherent DMA. Having silent data corruption in those situations is just about the worst possible behaviour, so I'd like to do *something* instead of that. Falling back to swiotlb bouncing with a taint seems sensible to me.
Why can't we just resolve the conflict by adding the underscores?
Will
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 1 line · Will Deacon
Why can't we just resolve the conflict by adding the underscores?
We can solve the conflict easily that way. But that's not the point.
The point is that I've been fighting hard to consolidate dma code given that the behavior really is common and not arch specific. And this one is another case like that: the fact that the non-coherent dma boundary is bigger than the exposed size is something that can easily happen elsewhere, so there is no need to duplicate a lot of code for that.
Nevermind that the commit should at least be three different patches:
(1) revert the broken original commit
(2) increase the dma min alignment
(3) put the swiotlb workaround in place
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 11 lines · Christoph Hellwig
Quoted 1 line · Will Deacon
Why can't we just resolve the conflict by adding the underscores?
We can solve the conflict easily that way. But that's not the point.
The point is that I've been fighting hard to consolidate dma code given that the behavior really is common and not arch specific. And this one is another case like that: the fact that the non-coherent dma boundary is bigger than the exposed size is something that can easily happen elsewhere, so there is no need to duplicate a lot of code for that.
Fair enough, although I wouldn't say it's a *lot* of code being duplicated. Are there other architectures working around this issue too? I couldn't see anything in the other dma-direct.h headers.
Quoted 5 lines
Nevermind that the commit should at least be three different patches:
(1) revert the broken original commit
(2) increase the dma min alignment
(3) put the swiotlb workaround in place
I'd agree with you if this wasn't already queued and sitting in -next. Reverting what we currently have seems a bit OTT now. Catalin?
Will
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Quoted 1 line · Will Deacon
Why can't we just resolve the conflict by adding the underscores?
We can solve the conflict easily that way. But that's not the point.
The point is that I've been fighting hard to consolidate dma code given that the behavior really is common and not arch specific. And this one is another case like that: the fact that the non-coherent dma boundary is bigger than the exposed size is something that can easily happen elsewhere, so there is no need to duplicate a lot of code for that.
I don't particularly like maintaining an arm64-specific dma-direct.h either but arm64 seems to be the only architecture that needs to potentially force a bounce when cache_line_size() > ARCH_DMA_MINALIGN and the device is non-coherent. Note that lib/swiotlb.c doesn't even deal with non-coherent DMA (e.g. map_sg doesn't have arch callbacks for cache maintenance), so not disrupting lib/swiotlb.c seems to be the least intrusive option.
Quoted 4 lines
Nevermind that the commit should at least be three different patches:
(1) revert the broken original commit
(2) increase the dma min alignment
Reverting the original commit could, on its own, break an SoC which expects ARCH_DMA_MINALIGN == 128. So these two should be a single commit (my patch only reverts the L1_CACHE_BYTES change rather than ARCH_DMA_MINALIGN, the latter being correct as 128).
Anyway, it's queued already and we try not to rebase the branches we published. Fix-ups on top are fine though.
Quoted 1 line
(3) put the swiotlb workaround in place
As I said above, adding a check in swiotlb.c for !is_device_dma_coherent(dev) && (ARCH_DMA_MINALIGN < cache_line_size()) feels too architecture specific. Adding yet another hook like arch_dma_capable() doesn't feel right either since we already have the possibility to override dma_capable() by selecting ARCH_HAS_PHYS_TO_DMA.
The "cleanest" I came up with for swiotlb.c was a new DMA_ATTR_FORCE_BOUNCE attribute. However, it required more changes to the arm64 dma-mapping.c than simply implementing an arch-specific dma_capable().
Signature · 1 line
Catalin
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 4 lines · Catalin Marinas
I don't particularly like maintaining an arm64-specific
dma-direct.heither but arm64 seems to be the only architecture that needs to potentially force a bounce whencache_line_size()>ARCH_DMA_MINALIGNand the device is non-coherent.
mips is another likely candidate, see all the recent drama about dma_get_alignmet(). And I'm also having major discussion about even exposing the cache line size architecturally for RISC-V, so changes are high it'll have to deal with this mess sooner or later as they probably can't agree on a specific cache line size.
Quoted 4 lines
Note that
lib/swiotlb.cdoesn't even
deal with non-coherent DMA (e.g.map_sgdoesn't have arch callbacks for cache maintenance), so not disruptinglib/swiotlb.cseems to be the least intrusive option.
No yet. I have patches to consolidate the various swiotlb ops that deal with cache flushing or barriers. I was hoping to get them in for this merge window, but it probably is too late now given that I have a few other fires to fight. But they are going to be out early for the next merge window.
Quoted 9 lines
Quoted 4 lines
Nevermind that the commit should at least be three different patches:
(1) revert the broken original commit
(2) increase the dma min alignmentReverting the original commit could, on its own, break an SoC which expects
ARCH_DMA_MINALIGN== 128. So these two should be a single commit (my patch only reverts theL1_CACHE_BYTESchange rather thanARCH_DMA_MINALIGN, the latter being correct as 128).
It would revert to the state before this commit.
Quoted 3 lines
As I said above, adding a check in
swiotlb.cfor !is_device_dma_coherent(dev) && (ARCH_DMA_MINALIGN<cache_line_size()) feels too architecture specific.
And what exactly is architecture specific about that? It is a totally generic concept, which at this point also seems entirely theoretical based on the previous mail in this thread.
Re: [PATCH 12/14] dma-direct: handle the memory encryption bit in common code
Quoted 11 lines · Christoph Hellwig
Quoted 4 lines · Catalin Marinas
I don't particularly like maintaining an arm64-specific
dma-direct.heither but arm64 seems to be the only architecture that needs to potentially force a bounce whencache_line_size()>ARCH_DMA_MINALIGNand the device is non-coherent.mips is another likely candidate, see all the recent drama about
dma_get_alignmet(). And I'm also having major discussion about even exposing the cache line size architecturally for RISC-V, so changes are high it'll have to deal with this mess sooner or later as they probably can't agree on a specific cache line size.
On Arm, the cache line size varies between 32 and 128 on publicly available hardware (and I wouldn't exclude higher numbers at some point). In addition, the cache line size has a different meaning in the DMA context, we call it "cache writeback granule" on Arm which is greater than or equal the minimum cache line size.
So the aim is to have L1_CACHE_BYTES small enough for acceptable performance numbers and ARCH_DMA_MINALIGN the maximum from a correctness perspective (the latter is defined by some larger cache lines in L2/L3).
To make things worse, there is no clear definition in the generic kernel on what cache_line_size() means and the default definition returns L1_CACHE_BYTES. On arm64, we define it to the hardware's cache writeback granule (CWG), if available, with a fallback on ARCH_DMA_MINALIGN. The network layer, OTOH, seems to assume that SMP_CACHE_BYTES is sufficient for DMA alignment (L1_CACHE_BYTES in arm64's case).
Quoted 7 lines
Quoted 3 lines
As I said above, adding a check in
swiotlb.cfor !is_device_dma_coherent(dev) && (ARCH_DMA_MINALIGN<cache_line_size()) feels too architecture specific.And what exactly is architecture specific about that? It is a totally generic concept, which at this point also seems entirely theoretical based on the previous mail in this thread.
The concept may be generic but the kernel macros/functions used here aren't. is_device_dma_coherent() is only defined on arm and arm64. The relation between ARCH_DMA_MINALIGN, L1_CACHE_BYTES and cache_line_size() seems to be pretty ad-hoc. ARCH_DMA_MINALIGN is also only defined for some architectures and, while there is dma_get_cache_alignment() which returns this constant, it doesn't seem to be used much.
I'm all for fixing this in a generic way but I think we first need swiotlb.c to become aware of non-cache-coherent DMA devices.
Signature · 1 line
Catalin
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] dma/direct: Handle the memory encryption bit in common code
In reply to Christoph Hellwigdma/direct: Handle the memory encryption bit in common code
Commit-ID: b6e05477c10c12e36141558fc14f04b00ea634d4 Gitweb: https://git.kernel.org/tip/b6e05477c10c12e36141558fc14f04b00ea634d4 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:59 +0100
dma/direct: Handle the memory encryption bit in common code
Give the basic phys_to_dma() and dma_to_phys() helpers a __-prefix and add the memory encryption mask to the non-prefixed versions. Use the __-prefixed versions directly instead of clearing the mask again in various places.
--- arch/arm/include/asm/dma-direct.h | 4 ++-- arch/mips/cavium-octeon/dma-octeon.c | 10 ++++----- .../include/asm/mach-cavium-octeon/dma-coherence.h | 4 ++-- .../include/asm/mach-loongson64/dma-coherence.h | 10 ++++----- arch/mips/loongson64/common/dma-swiotlb.c | 4 ++-- arch/powerpc/include/asm/dma-direct.h | 4 ++-- arch/x86/Kconfig | 2 +- arch/x86/include/asm/dma-direct.h | 25 ++-------------------- arch/x86/mm/mem_encrypt.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 6 +++--- include/linux/dma-direct.h | 21 ++++++++++++++++-- lib/swiotlb.c | 25 ++++++++-------------- 12 files changed, 53 insertions(+), 64 deletions(-)
arch/arm/include/asm/dma-direct.h +2 -2
@@ -2,13 +2,13 @@#ifndef ASM_ARM_DMA_DIRECT_H #define ASM_ARM_DMA_DIRECT_H 1 -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {unsigned int offset = paddr & ~PAGE_MASK ;return pfn_to_dma (dev,__phys_to_pfn (paddr)) + offset; } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {unsigned int offset = dev_addr & ~PAGE_MASK ;return __pfn_to_phys (dma_to_pfn (dev, dev_addr)) + offset;
arch/mips/cavium-octeon/dma-octeon.c +5 -5
@@ -10,7 +10,7 @@* IP32 changes by Ilya. * Copyright (C) 2010 Cavium Networks, Inc. */ -#include <linux/dma-mapping.h> +#include <linux/dma-direct.h> #include <linux/scatterlist.h> #include <linux/bootmem.h> #include <linux/export.h>
@@ -182,7 +182,7 @@ struct octeon_dma_map_ops {phys_addr_t (*dma_to_phys)(struct device *dev,dma_addr_t daddr); }; -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,
@@ -190,9 +190,9 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return ops->phys_to_dma (dev, paddr); } -EXPORT_SYMBOL (phys_to_dma); +EXPORT_SYMBOL (__phys_to_dma); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) { struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev), struct octeon_dma_map_ops,
@@ -200,7 +200,7 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)return ops->dma_to_phys (dev, daddr); } -EXPORT_SYMBOL (dma_to_phys); +EXPORT_SYMBOL (__dma_to_phys);static struct octeon_dma_map_ops octeon_linear_dma_map_ops = { .dma_map_ops = {
arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +2 -2
@@ -69,8 +69,8 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);struct dma_map_ops ;extern const struct dma_map_ops *octeon_pci_dma_map_ops;
arch/mips/include/asm/mach-loongson64/dma-coherence.h +5 -5
@@ -25,13 +25,13 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -extern dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -extern phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); +extern dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +extern phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr);static inline dma_addr_t plat_map_dma_mem (struct device *dev,void *addr,size_t size) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,virt_to_phys (addr)); +return __phys_to_dma (dev,virt_to_phys (addr));#else return virt_to_phys (addr) |0x80000000 ;#endif
@@ -41,7 +41,7 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) {#ifdef CONFIG_CPU_LOONGSON3 -return phys_to_dma (dev,page_to_phys (page)); +return __phys_to_dma (dev,page_to_phys (page));#else return page_to_phys (page) |0x80000000 ;#endif
@@ -51,7 +51,7 @@ static inline unsigned long plat_dma_addr_to_phys(struct device *dev, dma_addr_t dma_addr) {#if defined(CONFIG_CPU_LOONGSON3 ) && defined(CONFIG_64BIT ) -return dma_to_phys (dev, dma_addr); +return __dma_to_phys (dev, dma_addr);#elif defined(CONFIG_CPU_LOONGSON2F ) && defined(CONFIG_64BIT )return (dma_addr >0x8fffffff ) ? dma_addr : (dma_addr &0x0fffffff );#else
arch/mips/loongson64/common/dma-swiotlb.c +2 -2
@@ -63,7 +63,7 @@ static int loongson_dma_supported(struct device *dev, u64 mask)return swiotlb_dma_supported (dev, mask); } -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40
@@ -75,7 +75,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)return paddr; } -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {long nid;#ifdef CONFIG_PHYS48_TO_HT40
arch/powerpc/include/asm/dma-direct.h +2 -2
@@ -17,12 +17,12 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)return addr + size -1 <= *dev->dma_mask; } -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {return paddr +get_dma_offset (dev); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {return daddr -get_dma_offset (dev); }
arch/x86/Kconfig +1 -1
@@ -54,7 +54,6 @@ config X86 select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV if X86_64 - select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_PMEM_API if X86_64 select ARCH_HAS_REFCOUNT
@@ -692,6 +691,7 @@ config X86_SUPPORTS_MEMORY_FAILURE config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI + select ARCH_HAS_PHYS_TO_DMA select X86_DEV_DMA_OPS select X86_DMA_REMAP select SWIOTLB
arch/x86/include/asm/dma-direct.h +2 -23
@@ -2,29 +2,8 @@#ifndef ASM_X86_DMA_DIRECT_H #define ASM_X86_DMA_DIRECT_H 1 -#include <linux/mem_encrypt.h> - -#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */ bool dma_capable (struct device *dev,dma_addr_t addr,size_t size); -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr); -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr); -#else -static inline bool dma_capable (struct device *dev,dma_addr_t addr,size_t size) -{ -if (!dev->dma_mask) -return 0 ; - -return addr + size -1 <= *dev->dma_mask; -} - -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) -{ -return __sme_set (paddr); -} +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr); +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr); -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) -{ -return __sme_clr (daddr); -} -#endif /* CONFIG_X86_DMA_REMAP */ #endif /* ASM_X86_DMA_DIRECT_H */
arch/x86/mm/mem_encrypt.c +1 -1
@@ -211,7 +211,7 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,* Since we will be clearing the encryption bit, check the * mask with it already cleared. */ - addr =__sme_clr (phys_to_dma (dev,page_to_phys (page))); + addr =__phys_to_dma (dev,page_to_phys (page));if ((addr + size) > dev->coherent_dma_mask) {__free_pages (page,get_order (size)); }else {
arch/x86/pci/sta2x11-fixup.c +3 -3
@@ -207,11 +207,11 @@ bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }/** -* phys_to_dma - Return the DMA AMBA address used for this STA2x11 device +* __phys_to_dma - Return the DMA AMBA address used for this STA2x11 device * @dev: device for a PCI device * @paddr: Physical address */ -dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {if (!dev->archdata.is_sta2x11)return paddr;
@@ -223,7 +223,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)* @dev: device for a PCI device * @daddr: STA2x11 AMBA DMA address */ -phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t daddr) {if (!dev->archdata.is_sta2x11)return daddr;
include/linux/dma-direct.h +19 -2
@@ -3,18 +3,19 @@#define _LINUX_DMA_DIRECT_H 1#include <linux/dma-mapping.h> +#include <linux/mem_encrypt.h> #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA #include <asm/dma-direct.h> #else -static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +static inline dma_addr_t __phys_to_dma (struct device *dev,phys_addr_t paddr) {dma_addr_t dev_addr = (dma_addr_t )paddr;return dev_addr - ((dma_addr_t )dev->dma_pfn_offset <<PAGE_SHIFT ); } -static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys (struct device *dev,dma_addr_t dev_addr) {phys_addr_t paddr = (phys_addr_t )dev_addr;
@@ -30,6 +31,22 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) }#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */ +/* +* If memory encryption is supported, phys_to_dma will set the memory encryption +* bit in the DMA address, and dma_to_phys will clear it. The raw __phys_to_dma +* and __dma_to_phys versions should only be used on non-encrypted memory for +* special occasions like DMA coherent buffers. +*/ +static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +{ +return __sme_set (__phys_to_dma (dev, paddr)); +} + +static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +{ +return __sme_clr (__dma_to_phys (dev, daddr)); +} +#ifdef CONFIG_ARCH_HAS_DMA_MARK_CLEAN void dma_mark_clean (void *addr,size_t size);#else
lib/swiotlb.c +9 -16
@@ -157,13 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -/* For swiotlb, clear memory encryption mask from dma addresses */ -static dma_addr_t swiotlb_phys_to_dma (struct device *hwdev, -phys_addr_t address) -{ -return __sme_clr (phys_to_dma (hwdev, address)); -} -/* Note that this doesn't work with highmem page */ static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev,volatile void *address)
@@ -622,7 +615,7 @@ map_single(struct device *hwdev, phys_addr_t phys, size_t size,return SWIOTLB_MAP_ERROR ; } - start_dma_addr =swiotlb_phys_to_dma (hwdev, io_tlb_start); + start_dma_addr =__phys_to_dma (hwdev, io_tlb_start);return swiotlb_tbl_map_single (hwdev, start_dma_addr, phys, size, dir, attrs); }
@@ -726,12 +719,12 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle, goto out_warn; phys_addr =swiotlb_tbl_map_single (dev, -swiotlb_phys_to_dma (dev, io_tlb_start), +__phys_to_dma (dev, io_tlb_start),0 , size,DMA_FROM_DEVICE ,0 );if (phys_addr ==SWIOTLB_MAP_ERROR ) goto out_warn; - *dma_handle =swiotlb_phys_to_dma (dev, phys_addr); + *dma_handle =__phys_to_dma (dev, phys_addr);if (dma_coherent_ok (dev, *dma_handle, size)) goto out_unmap;
@@ -867,10 +860,10 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, map =map_single (dev, phys, size, dir, attrs);if (map ==SWIOTLB_MAP_ERROR ) {swiotlb_full (dev, size, dir,1 ); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); } - dev_addr =swiotlb_phys_to_dma (dev, map); + dev_addr =__phys_to_dma (dev, map);/* Ensure that the address returned is DMA'ble */ if (dma_capable (dev, dev_addr, size))
@@ -879,7 +872,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, attrs |=DMA_ATTR_SKIP_CPU_SYNC ;swiotlb_tbl_unmap_single (dev, map, size, dir, attrs); -return swiotlb_phys_to_dma (dev, io_tlb_overflow_buffer); +return __phys_to_dma (dev, io_tlb_overflow_buffer); }/*
@@ -1009,7 +1002,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,sg_dma_len (sgl) =0 ;return 0 ; } - sg->dma_address =swiotlb_phys_to_dma (hwdev, map); + sg->dma_address =__phys_to_dma (hwdev, map); }else sg->dma_address = dev_addr;sg_dma_len (sg) = sg->length;
@@ -1073,7 +1066,7 @@ swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,int swiotlb_dma_mapping_error (struct device *hwdev,dma_addr_t dma_addr) { -return (dma_addr ==swiotlb_phys_to_dma (hwdev, io_tlb_overflow_buffer)); +return (dma_addr ==__phys_to_dma (hwdev, io_tlb_overflow_buffer)); }/*
@@ -1085,7 +1078,7 @@ swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr)int swiotlb_dma_supported (struct device *hwdev,u64 mask) { -return swiotlb_phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; +return __phys_to_dma (hwdev, io_tlb_end -1 ) <= mask; }#ifdef CONFIG_DMA_DIRECT_OPS
PATCH 13/14 dma-direct: handle force decryption for dma coherent buffers in common code
In reply to Christoph HellwigWith that in place the generic dma-direct routines can be used to allocate non-encrypted bounce buffers, and the x86 SEV case can use the generic swiotlb ops including nice features such as using CMA allocations.
Note that I'm not too happy about using sev_active() in dma-direct, but I couldn't come up with a good enough name for a wrapper to make it worth adding.
--- arch/x86/mm/mem_encrypt.c | 73 ++--------------------------------------------- lib/dma-direct.c | 32 +++++++++++++++++---- 2 files changed, 29 insertions(+), 76 deletions(-)
arch/x86/mm/mem_encrypt.c +3 -70
@@ -200,58 +200,6 @@ void __init sme_early_init(void) swiotlb_force =SWIOTLB_FORCE ; } -static void *sev_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle, -gfp_t gfp,unsigned long attrs) -{ -unsigned int order; -struct page *page; -void *vaddr =NULL ; - - order =get_order (size); - page =alloc_pages_node (dev_to_node (dev), gfp, order); -if (page) { -dma_addr_t addr; - -/* -* Since we will be clearing the encryption bit, check the -* mask with it already cleared. -*/ - addr =__phys_to_dma (dev,page_to_phys (page)); -if ((addr + size) > dev->coherent_dma_mask) { -__free_pages (page,get_order (size)); - }else { - vaddr =page_address (page); - *dma_handle = addr; - } - } - -if (!vaddr) - vaddr =swiotlb_alloc_coherent (dev, size, dma_handle, gfp); - -if (!vaddr) -return NULL ; - -/* Clear the SME encryption bit for DMA use if not swiotlb area */ -if (!is_swiotlb_buffer (dma_to_phys (dev, *dma_handle))) { -set_memory_decrypted ((unsigned long )vaddr,1 << order); -memset (vaddr,0 ,PAGE_SIZE << order); - *dma_handle =__sme_clr (*dma_handle); - } - -return vaddr; -} - -static void sev_free (struct device *dev,size_t size,void *vaddr, -dma_addr_t dma_handle,unsigned long attrs) -{ -/* Set the SME encryption bit for re-use if not swiotlb area */ -if (!is_swiotlb_buffer (dma_to_phys (dev, dma_handle))) -set_memory_encrypted ((unsigned long )vaddr, -1 <<get_order (size)); - -swiotlb_free_coherent (dev, size, vaddr, dma_handle); -} -static void __init __set_clr_pte_enc (pte_t *kpte,int level,bool enc) {pgprot_t old_prot, new_prot;
@@ -404,20 +352,6 @@ bool sev_active(void) }EXPORT_SYMBOL (sev_active); -static const struct dma_map_ops sev_dma_ops = { - .alloc = sev_alloc, - .free = sev_free, - .map_page = swiotlb_map_page, - .unmap_page = swiotlb_unmap_page, - .map_sg = swiotlb_map_sg_attrs, - .unmap_sg = swiotlb_unmap_sg_attrs, - .sync_single_for_cpu = swiotlb_sync_single_for_cpu, - .sync_single_for_device = swiotlb_sync_single_for_device, - .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, - .sync_sg_for_device = swiotlb_sync_sg_for_device, - .mapping_error = swiotlb_dma_mapping_error, -}; -/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ) {
@@ -428,12 +362,11 @@ void __init mem_encrypt_init(void)swiotlb_update_mem_attributes ();/* -* With SEV, DMA operations cannot use encryption. New DMA ops -* are required in order to mark the DMA areas as decrypted or -* to use bounce buffers. +* With SEV, DMA operations cannot use encryption, we need to use +* SWIOTLB to bounce buffer DMA operation. */ if (sev_active ()) - dma_ops = &sev_dma_ops; + dma_ops = &swiotlb_dma_ops;/* * With SEV, we need to unroll the rep string I/O instructions.
lib/dma-direct.c +26 -6
@@ -9,6 +9,7 @@#include <linux/scatterlist.h> #include <linux/dma-contiguous.h> #include <linux/pfn.h> +#include <linux/set_memory.h> #define DIRECT_MAPPING_ERROR 0
@@ -20,6 +21,14 @@#define ARCH_ZONE_DMA_BITS 24#endif +/* +* For AMD SEV all DMA must be to unencrypted addresses. +*/ +static inline bool force_dma_unencrypted (void ) +{ +return sev_active (); +} +static bool check_addr (struct device *dev,dma_addr_t dma_addr,size_t size,const char *caller)
@@ -37,7 +46,9 @@ check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,static bool dma_coherent_ok (struct device *dev,phys_addr_t phys,size_t size) { -return phys_to_dma (dev, phys) + size -1 <= dev->coherent_dma_mask; +dma_addr_t addr =force_dma_unencrypted () ? +__phys_to_dma (dev, phys) :phys_to_dma (dev, phys); +return addr + size -1 <= dev->coherent_dma_mask; } void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
@@ -46,6 +57,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ;int page_order =get_order (size);struct page *page =NULL ; +void *ret;/* GFP_DMA32 and GFP_DMA are no ops without the corresponding zones: */ if (dev->coherent_dma_mask <=DMA_BIT_MASK (ARCH_ZONE_DMA_BITS ))
@@ -78,10 +90,15 @@ void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,if (!page)return NULL ; - - *dma_handle =phys_to_dma (dev,page_to_phys (page)); -memset (page_address (page),0 , size); -return page_address (page); + ret =page_address (page); +if (force_dma_unencrypted ()) { +set_memory_decrypted ((unsigned long )ret,1 << page_order); + *dma_handle =__phys_to_dma (dev,page_to_phys (page)); + }else { + *dma_handle =phys_to_dma (dev,page_to_phys (page)); + } +memset (ret,0 , size); +return ret; }/*
@@ -92,9 +109,12 @@ void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs) {unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ; +unsigned int page_order =get_order (size); +if (force_dma_unencrypted ()) +set_memory_encrypted ((unsigned long )cpu_addr,1 << page_order);if (!dma_release_from_contiguous (dev,virt_to_page (cpu_addr), count)) -free_pages ((unsigned long )cpu_addr,get_order (size)); +free_pages ((unsigned long )cpu_addr, page_order); } static dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
Signature · 1 line
2.14.2
Re: [PATCH 13/14] dma-direct: handle force decryption for dma coherent buffers in common code
Quoted 10 lines · Christoph Hellwig
With that in place the generic dma-direct routines can be used to allocate non-encrypted bounce buffers, and the x86 SEV case can use the generic swiotlb ops including nice features such as using CMA allocations.
Note that I'm not too happy about using
sev_active()in dma-direct, but I couldn't come up with a good enough name for a wrapper to make it worth adding.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 186 lines
--- arch/x86/mm/mem_encrypt.c | 73 ++--------------------------------------------- lib/dma-direct.c | 32 +++++++++++++++++---- 2 files changed, 29 insertions(+), 76 deletions(-)arch/x86/mm/mem_encrypt.c +3
-70@@ -200,58 +200,6 @@ void __init sme_early_init(void) swiotlb_force =SWIOTLB_FORCE ; } -static void *sev_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle, -gfp_t gfp,unsigned long attrs) -{ -unsigned int order; -struct page *page; -void *vaddr =NULL ; - - order =get_order (size); - page =alloc_pages_node (dev_to_node (dev), gfp, order); -if (page) { -dma_addr_t addr; - -/* -* Since we will be clearing the encryption bit, check the -* mask with it already cleared. -*/ - addr =__phys_to_dma (dev,page_to_phys (page)); -if ((addr + size) > dev->coherent_dma_mask) { -__free_pages (page,get_order (size)); - }else { - vaddr =page_address (page); - *dma_handle = addr; - } - } - -if (!vaddr) - vaddr =swiotlb_alloc_coherent (dev, size, dma_handle, gfp); - -if (!vaddr) -return NULL ; - -/* Clear the SME encryption bit for DMA use if not swiotlb area */ -if (!is_swiotlb_buffer (dma_to_phys (dev, *dma_handle))) { -set_memory_decrypted ((unsigned long )vaddr,1 << order); -memset (vaddr,0 ,PAGE_SIZE << order); - *dma_handle =__sme_clr (*dma_handle); - } - -return vaddr; -} - -static void sev_free (struct device *dev,size_t size,void *vaddr, -dma_addr_t dma_handle,unsigned long attrs) -{ -/* Set the SME encryption bit for re-use if not swiotlb area */ -if (!is_swiotlb_buffer (dma_to_phys (dev, dma_handle))) -set_memory_encrypted ((unsigned long )vaddr, -1 <<get_order (size)); - -swiotlb_free_coherent (dev, size, vaddr, dma_handle); -} -static void __init __set_clr_pte_enc (pte_t *kpte,int level,bool enc) {pgprot_t old_prot, new_prot;@@ -404,20 +352,6 @@ bool sev_active(void) }EXPORT_SYMBOL (sev_active); -static const struct dma_map_ops sev_dma_ops = { - .alloc = sev_alloc, - .free = sev_free, - .map_page = swiotlb_map_page, - .unmap_page = swiotlb_unmap_page, - .map_sg = swiotlb_map_sg_attrs, - .unmap_sg = swiotlb_unmap_sg_attrs, - .sync_single_for_cpu = swiotlb_sync_single_for_cpu, - .sync_single_for_device = swiotlb_sync_single_for_device, - .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, - .sync_sg_for_device = swiotlb_sync_sg_for_device, - .mapping_error = swiotlb_dma_mapping_error, -}; -/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ) {@@ -428,12 +362,11 @@ void __init mem_encrypt_init(void)swiotlb_update_mem_attributes ();/* -* With SEV, DMA operations cannot use encryption. New DMA ops -* are required in order to mark the DMA areas as decrypted or -* to use bounce buffers. +* With SEV, DMA operations cannot use encryption, we need to use +* SWIOTLB to bounce buffer DMA operation. */ if (sev_active ()) - dma_ops = &sev_dma_ops; + dma_ops = &swiotlb_dma_ops;/* * With SEV, we need to unroll the rep string I/O instructions. lib/dma-direct.c +26
-6@@ -9,6 +9,7 @@#include <linux/scatterlist.h> #include <linux/dma-contiguous.h> #include <linux/pfn.h> +#include <linux/set_memory.h> #define DIRECT_MAPPING_ERROR 0@@ -20,6 +21,14 @@#define ARCH_ZONE_DMA_BITS 24#endif +/* +* For AMD SEV all DMA must be to unencrypted addresses. +*/ +static inline bool force_dma_unencrypted (void ) +{ +return sev_active (); +} +static bool check_addr (struct device *dev,dma_addr_t dma_addr,size_t size,const char *caller)@@ -37,7 +46,9 @@ check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,static bool dma_coherent_ok (struct device *dev,phys_addr_t phys,size_t size) { -return phys_to_dma (dev, phys) + size -1 <= dev->coherent_dma_mask; +dma_addr_t addr =force_dma_unencrypted () ? +__phys_to_dma (dev, phys) :phys_to_dma (dev, phys); +return addr + size -1 <= dev->coherent_dma_mask; } void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,@@ -46,6 +57,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ;int page_order =get_order (size);struct page *page =NULL ; +void *ret;/* GFP_DMA32 and GFP_DMA are no ops without the corresponding zones: */ if (dev->coherent_dma_mask <=DMA_BIT_MASK (ARCH_ZONE_DMA_BITS ))@@ -78,10 +90,15 @@ void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,if (!page)return NULL ; - - *dma_handle =phys_to_dma (dev,page_to_phys (page)); -memset (page_address (page),0 , size); -return page_address (page); + ret =page_address (page); +if (force_dma_unencrypted ()) { +set_memory_decrypted ((unsigned long )ret,1 << page_order); + *dma_handle =__phys_to_dma (dev,page_to_phys (page)); + }else { + *dma_handle =phys_to_dma (dev,page_to_phys (page)); + } +memset (ret,0 , size); +return ret; }/* @@ -92,9 +109,12 @@ void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs) {unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ; +unsigned int page_order =get_order (size); +if (force_dma_unencrypted ()) +set_memory_encrypted ((unsigned long )cpu_addr,1 << page_order);if (!dma_release_from_contiguous (dev,virt_to_page (cpu_addr), count)) -free_pages ((unsigned long )cpu_addr,get_order (size)); +free_pages ((unsigned long )cpu_addr, page_order); } static dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] dma/direct: Handle force decryption for DMA coherent buffers in common code
In reply to Christoph Hellwigdma/direct: Handle force decryption for DMA coherent buffers in common code
Commit-ID: c10f07aa27dadf5ab5b3d58c48c91a467f80db49 Gitweb: https://git.kernel.org/tip/c10f07aa27dadf5ab5b3d58c48c91a467f80db49 Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:25 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:59 +0100
dma/direct: Handle force decryption for DMA coherent buffers in common code
With that in place the generic DMA-direct routines can be used to allocate non-encrypted bounce buffers, and the x86 SEV case can use the generic swiotlb ops including nice features such as using CMA allocations.
Note that I'm not too happy about using sev_active() in DMA-direct, but I couldn't come up with a good enough name for a wrapper to make it worth adding.
--- arch/x86/mm/mem_encrypt.c | 73 ++--------------------------------------------- lib/dma-direct.c | 32 +++++++++++++++++---- 2 files changed, 29 insertions(+), 76 deletions(-)
arch/x86/mm/mem_encrypt.c +3 -70
@@ -195,58 +195,6 @@ void __init sme_early_init(void) swiotlb_force =SWIOTLB_FORCE ; } -static void *sev_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle, -gfp_t gfp,unsigned long attrs) -{ -unsigned int order; -struct page *page; -void *vaddr =NULL ; - - order =get_order (size); - page =alloc_pages_node (dev_to_node (dev), gfp, order); -if (page) { -dma_addr_t addr; - -/* -* Since we will be clearing the encryption bit, check the -* mask with it already cleared. -*/ - addr =__phys_to_dma (dev,page_to_phys (page)); -if ((addr + size) > dev->coherent_dma_mask) { -__free_pages (page,get_order (size)); - }else { - vaddr =page_address (page); - *dma_handle = addr; - } - } - -if (!vaddr) - vaddr =swiotlb_alloc_coherent (dev, size, dma_handle, gfp); - -if (!vaddr) -return NULL ; - -/* Clear the SME encryption bit for DMA use if not swiotlb area */ -if (!is_swiotlb_buffer (dma_to_phys (dev, *dma_handle))) { -set_memory_decrypted ((unsigned long )vaddr,1 << order); -memset (vaddr,0 ,PAGE_SIZE << order); - *dma_handle =__sme_clr (*dma_handle); - } - -return vaddr; -} - -static void sev_free (struct device *dev,size_t size,void *vaddr, -dma_addr_t dma_handle,unsigned long attrs) -{ -/* Set the SME encryption bit for re-use if not swiotlb area */ -if (!is_swiotlb_buffer (dma_to_phys (dev, dma_handle))) -set_memory_encrypted ((unsigned long )vaddr, -1 <<get_order (size)); - -swiotlb_free_coherent (dev, size, vaddr, dma_handle); -} -static void __init __set_clr_pte_enc (pte_t *kpte,int level,bool enc) {pgprot_t old_prot, new_prot;
@@ -399,20 +347,6 @@ bool sev_active(void) }EXPORT_SYMBOL (sev_active); -static const struct dma_map_ops sev_dma_ops = { - .alloc = sev_alloc, - .free = sev_free, - .map_page = swiotlb_map_page, - .unmap_page = swiotlb_unmap_page, - .map_sg = swiotlb_map_sg_attrs, - .unmap_sg = swiotlb_unmap_sg_attrs, - .sync_single_for_cpu = swiotlb_sync_single_for_cpu, - .sync_single_for_device = swiotlb_sync_single_for_device, - .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, - .sync_sg_for_device = swiotlb_sync_sg_for_device, - .mapping_error = swiotlb_dma_mapping_error, -}; -/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ) {
@@ -423,12 +357,11 @@ void __init mem_encrypt_init(void)swiotlb_update_mem_attributes ();/* -* With SEV, DMA operations cannot use encryption. New DMA ops -* are required in order to mark the DMA areas as decrypted or -* to use bounce buffers. +* With SEV, DMA operations cannot use encryption, we need to use +* SWIOTLB to bounce buffer DMA operation. */ if (sev_active ()) - dma_ops = &sev_dma_ops; + dma_ops = &swiotlb_dma_ops;/* * With SEV, we need to unroll the rep string I/O instructions.
lib/dma-direct.c +26 -6
@@ -9,6 +9,7 @@#include <linux/scatterlist.h> #include <linux/dma-contiguous.h> #include <linux/pfn.h> +#include <linux/set_memory.h> #define DIRECT_MAPPING_ERROR 0
@@ -20,6 +21,14 @@#define ARCH_ZONE_DMA_BITS 24#endif +/* +* For AMD SEV all DMA must be to unencrypted addresses. +*/ +static inline bool force_dma_unencrypted (void ) +{ +return sev_active (); +} +static bool check_addr (struct device *dev,dma_addr_t dma_addr,size_t size,const char *caller)
@@ -37,7 +46,9 @@ check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,static bool dma_coherent_ok (struct device *dev,phys_addr_t phys,size_t size) { -return phys_to_dma (dev, phys) + size -1 <= dev->coherent_dma_mask; +dma_addr_t addr =force_dma_unencrypted () ? +__phys_to_dma (dev, phys) :phys_to_dma (dev, phys); +return addr + size -1 <= dev->coherent_dma_mask; } void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
@@ -46,6 +57,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ;int page_order =get_order (size);struct page *page =NULL ; +void *ret;/* GFP_DMA32 and GFP_DMA are no ops without the corresponding zones: */ if (dev->coherent_dma_mask <=DMA_BIT_MASK (ARCH_ZONE_DMA_BITS ))
@@ -78,10 +90,15 @@ again:if (!page)return NULL ; - - *dma_handle =phys_to_dma (dev,page_to_phys (page)); -memset (page_address (page),0 , size); -return page_address (page); + ret =page_address (page); +if (force_dma_unencrypted ()) { +set_memory_decrypted ((unsigned long )ret,1 << page_order); + *dma_handle =__phys_to_dma (dev,page_to_phys (page)); + }else { + *dma_handle =phys_to_dma (dev,page_to_phys (page)); + } +memset (ret,0 , size); +return ret; }/*
@@ -92,9 +109,12 @@ void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs) {unsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ; +unsigned int page_order =get_order (size); +if (force_dma_unencrypted ()) +set_memory_encrypted ((unsigned long )cpu_addr,1 << page_order);if (!dma_release_from_contiguous (dev,virt_to_page (cpu_addr), count)) -free_pages ((unsigned long )cpu_addr,get_order (size)); +free_pages ((unsigned long )cpu_addr, page_order); } static dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
PATCH 14/14 swiotlb: remove swiotlb_{alloc,free}_coherent
In reply to Christoph HellwigUnused now that everyone uses swiotlb_{alloc,free}.
--- include/linux/swiotlb.h | 8 -------- lib/swiotlb.c | 38 -------------------------------------- 2 files changed, 46 deletions(-)
include/linux/swiotlb.h +0 -8
@@ -72,14 +72,6 @@ void *swiotlb_alloc(struct device *hwdev, size_t size, dma_addr_t *dma_handle,void swiotlb_free (struct device *dev,size_t size,void *vaddr,dma_addr_t dma_addr,unsigned long attrs); -extern void -*swiotlb_alloc_coherent (struct device *hwdev,size_t size, -dma_addr_t *dma_handle,gfp_t flags); - -extern void -swiotlb_free_coherent (struct device *hwdev,size_t size, -void *vaddr,dma_addr_t dma_handle); - extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir,
lib/swiotlb.c +0 -38
@@ -157,13 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -/* Note that this doesn't work with highmem page */ -static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev, -volatile void *address) -{ -return phys_to_dma (hwdev,virt_to_phys (address)); -} -static bool no_iotlb_memory;void swiotlb_print_info (void )
@@ -752,28 +745,6 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle,return NULL ; } -void * -swiotlb_alloc_coherent (struct device *hwdev,size_t size, -dma_addr_t *dma_handle,gfp_t flags) -{ -int order =get_order (size); -unsigned long attrs = (flags & __GFP_NOWARN) ?DMA_ATTR_NO_WARN :0 ; -void *ret; - - ret = (void *)__get_free_pages (flags, order); -if (ret) { - *dma_handle =swiotlb_virt_to_bus (hwdev, ret); -if (dma_coherent_ok (hwdev, *dma_handle, size)) { -memset (ret,0 , size); -return ret; - } -free_pages ((unsigned long )ret, order); - } - -return swiotlb_alloc_buffer (hwdev, size, dma_handle, attrs); -} -EXPORT_SYMBOL (swiotlb_alloc_coherent); -static bool swiotlb_free_buffer (struct device *dev,size_t size,dma_addr_t dma_addr) {
@@ -793,15 +764,6 @@ static bool swiotlb_free_buffer(struct device *dev, size_t size,return true; } -void -swiotlb_free_coherent (struct device *hwdev,size_t size,void *vaddr, -dma_addr_t dev_addr) -{ -if (!swiotlb_free_buffer (hwdev, size, dev_addr)) -free_pages ((unsigned long )vaddr,get_order (size)); -} -EXPORT_SYMBOL (swiotlb_free_coherent); -static void swiotlb_full (struct device *dev,size_t size,enum dma_data_direction dir,int do_panic)
Signature · 1 line
2.14.2
tip-bot for Christoph Hellwig
merge bot[tip:x86/dma] dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
Commit-ID: 16e73adbca76fd18733278cb688b0ddb4cad162c Gitweb: https://git.kernel.org/tip/16e73adbca76fd18733278cb688b0ddb4cad162c Author: Christoph Hellwig <[email protected]> AuthorDate: Mon, 19 Mar 2018 11:38:26 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Mar 2018 10:01:59 +0100
dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
Unused now that everyone uses swiotlb_{alloc,free}().
--- include/linux/swiotlb.h | 8 -------- lib/swiotlb.c | 38 -------------------------------------- 2 files changed, 46 deletions(-)
include/linux/swiotlb.h +0 -8
@@ -72,14 +72,6 @@ void *swiotlb_alloc(struct device *hwdev, size_t size, dma_addr_t *dma_handle,void swiotlb_free (struct device *dev,size_t size,void *vaddr,dma_addr_t dma_addr,unsigned long attrs); -extern void -*swiotlb_alloc_coherent (struct device *hwdev,size_t size, -dma_addr_t *dma_handle,gfp_t flags); - -extern void -swiotlb_free_coherent (struct device *hwdev,size_t size, -void *vaddr,dma_addr_t dma_handle); - extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir,
lib/swiotlb.c +0 -38
@@ -157,13 +157,6 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } -/* Note that this doesn't work with highmem page */ -static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev, -volatile void *address) -{ -return phys_to_dma (hwdev,virt_to_phys (address)); -} -static bool no_iotlb_memory;void swiotlb_print_info (void )
@@ -752,28 +745,6 @@ out_warn:return NULL ; } -void * -swiotlb_alloc_coherent (struct device *hwdev,size_t size, -dma_addr_t *dma_handle,gfp_t flags) -{ -int order =get_order (size); -unsigned long attrs = (flags & __GFP_NOWARN) ?DMA_ATTR_NO_WARN :0 ; -void *ret; - - ret = (void *)__get_free_pages (flags, order); -if (ret) { - *dma_handle =swiotlb_virt_to_bus (hwdev, ret); -if (dma_coherent_ok (hwdev, *dma_handle, size)) { -memset (ret,0 , size); -return ret; - } -free_pages ((unsigned long )ret, order); - } - -return swiotlb_alloc_buffer (hwdev, size, dma_handle, attrs); -} -EXPORT_SYMBOL (swiotlb_alloc_coherent); -static bool swiotlb_free_buffer (struct device *dev,size_t size,dma_addr_t dma_addr) {
@@ -793,15 +764,6 @@ static bool swiotlb_free_buffer(struct device *dev, size_t size,return true; } -void -swiotlb_free_coherent (struct device *hwdev,size_t size,void *vaddr, -dma_addr_t dev_addr) -{ -if (!swiotlb_free_buffer (hwdev, size, dev_addr)) -free_pages ((unsigned long )vaddr,get_order (size)); -} -EXPORT_SYMBOL (swiotlb_free_coherent); -static void swiotlb_full (struct device *dev,size_t size,enum dma_data_direction dir,int do_panic)
Tom Lendacky
Tested-byQuoted 8 lines · Christoph Hellwig
Hi all,
this series switches the x86 code the the dma-direct implementation for direct (non-iommu) dma and the generic swiotlb ops. This includes getting rid of the special ops for the AMD memory encryption case and the STA2x11 SOC. The generic implementations are based on the x86 code, so they provide the same functionality.
Booted the system with SME on and off and the IOMMU on, off and in passthrough mode without issues. In each case, booted an SEV guest without issues. I'll be able to do more extensive testing later, but for now...
Quoted 8 lines
Changes since V2:
- minor changelog tweaks
- madeis_sta2x11a plain boolChanges since V1:
- fix the length in theset_memory_decryptedcall
- fix the SEV case
Thomas Gleixner
Reviewed-byQuoted 7 lines · Christoph Hellwig
Hi all,
this series switches the x86 code the the dma-direct implementation for direct (non-iommu) dma and the generic swiotlb ops. This includes getting rid of the special ops for the AMD memory encryption case and the STA2x11 SOC. The generic implementations are based on the x86 code, so they provide the same functionality.
Quoted 7 lines · Christoph Hellwig
Hi all,
this series switches the x86 code the the dma-direct implementation for direct (non-iommu) dma and the generic swiotlb ops. This includes getting rid of the special ops for the AMD memory encryption case and the STA2x11 SOC. The generic implementations are based on the x86 code, so they provide the same functionality.
I need to test this on my baremertal and Xen setup - and I lost your git repo URL - any chance you mention point out to me so I can kick of a build?
Thanks.
Quoted 8 lines
Changes since V2:
- minor changelog tweaks
- madeis_sta2x11a plain boolChanges since V1:
- fix the length in theset_memory_decryptedcall
- fix the SEV case
Quoted 9 lines · Konrad Rzeszutek Wilk
Quoted 7 lines · Christoph Hellwig
Hi all,
this series switches the x86 code the the dma-direct implementation for direct (non-iommu) dma and the generic swiotlb ops. This includes getting rid of the special ops for the AMD memory encryption case and the STA2x11 SOC. The generic implementations are based on the x86 code, so they provide the same functionality.
Quoted 3 lines
I need to test this on my baremertal and Xen setup - and I lost your git repo URL - any chance you mention point out to me so I can kick of a build?
git://git.infradead.org/users/hch/misc.git dma-direct-x86
Ingo Molnar
Reviewed-byQuoted 10 lines · Christoph Hellwig
Quoted 9 lines · Konrad Rzeszutek Wilk
Quoted 7 lines · Christoph Hellwig
Hi all,
this series switches the x86 code the the dma-direct implementation for direct (non-iommu) dma and the generic swiotlb ops. This includes getting rid of the special ops for the AMD memory encryption case and the STA2x11 SOC. The generic implementations are based on the x86 code, so they provide the same functionality.
Quoted 5 lines
Quoted 3 lines
I need to test this on my baremertal and Xen setup - and I lost your git repo URL - any chance you mention point out to me so I can kick of a build?
git://git.infradead.org/users/hch/misc.gitdma-direct-x86
Btw., what's the upstreaming route for these patches?
While it's a multi-arch series it's all pretty x86-heavy as well so we can host it in -tip (in tip:core/dma or such), but feel free to handle it yourself as well:
Thanks,
Ingo
Quoted 8 lines · Ingo Molnar
Quoted 1 line
git://git.infradead.org/users/hch/misc.gitdma-direct-x86Btw., what's the upstreaming route for these patches?
While it's a multi-arch series it's all pretty x86-heavy as well so we can host it in -tip (in tip:core/dma or such), but feel free to handle it yourself as well:
Reviewed-by Ingo Molnar <[email protected]>
Either way is fine with me. The dma-mapping tree is pretty light this cycles, so I don't expect any conflicts. If you want it feel free to grab it, otherwise I'll queue it up.
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Ingo Molnar
Quoted 1 line
git://git.infradead.org/users/hch/misc.gitdma-direct-x86Btw., what's the upstreaming route for these patches?
Quoted 8 lines
Quoted 4 lines
While it's a multi-arch series it's all pretty x86-heavy as well so we can host it in -tip (in tip:core/dma or such), but feel free to handle it yourself as well:
Reviewed-by Ingo Molnar <[email protected]>Either way is fine with me. The dma-mapping tree is pretty light this cycles, so I don't expect any conflicts. If you want it feel free to grab it, otherwise I'll queue it up.
Ok, I picked your series up into tip:core/dma:
- added the newly arrived Tested-by's and Reviewed-by's
- some minor edits to titles/changelogs, no functional changes
will push it all out after testing.
Thanks,
Ingo
A message that is not in the archive (sent off-list or not yet received): 20180320090351.2qnwcsauhodrqxdj-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 18 lines · Ingo Molnar
Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Ingo Molnar
Quoted 1 line
git://git.infradead.org/users/hch/misc.gitdma-direct-x86Btw., what's the upstreaming route for these patches?
While it's a multi-arch series it's all pretty x86-heavy as well so we
can host it
Quoted 1 line
Quoted 1 line
in -tip (in tip:core/dma or such), but feel free to handle it yourself
as well:
Quoted 5 lines
Quoted 2 lines
Reviewed-by Ingo Molnar <[email protected]>Either way is fine with me. The dma-mapping tree is pretty light this cycles, so I don't expect any conflicts. If you want it feel free to
grab
Quoted 9 lines
Quoted 1 line
it, otherwise I'll queue it up.
Ok, I picked your series up into tip:core/dma:
- added the newly arrived Tested-by's and Reviewed-by's
- some minor edits to titles/changelogs, no functional changeswill push it all out after testing.
Are you testing with swiotlb=force?
Thanks
Quoted 9 lines
Thanks,
Ingo
_______________________________________________
iommu mailing list iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 1 line · Konrad Rzeszutek Wilk
Are you testing with swiotlb=force?
I've done swiotlb=force testing with earlier versions, and otherwise relied on a VM with more the 4gb of memory and emulated devices without 64-bit capability.
Quoted 6 lines · Christoph Hellwig
Quoted 1 line · Konrad Rzeszutek Wilk
Are you testing with swiotlb=force?
I've done swiotlb=force testing with earlier versions, and otherwise relied on a VM with more the 4gb of memory and emulated devices without 64-bit capability.
Awesome! I also did my testing so all good. Ingo, if you want to
you can add 'Acked-by: Konrad Rzeszutek Wilk <[email protected]>' on the patches that don't have my tag.
Christoph, thank you for cleaning up this swamp!