: dma, x86, xen: reduce SWIOTLB usage in Xen guests
Subsystems (6)
v3 cover : dma, x86, xen: reduce SWIOTLB usage in Xen guests
On systems where DMA addresses and physical addresses are not 1:1 (such as Xen PV guests), the generic dma_get_required_mask() will not return the correct mask (since it uses max_pfn).
Some device drivers (such as mptsas, mpt2sas) use dma_get_required_mask() to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly.
This series allows Xen PV guests to override the default dma_get_required_mask() with one that calculates the DMA mask from the maximum MFN (and not the PFN).
Changes in v3:
- fix off-by-one in xen_dma_get_required_mask()
- split ia64 changes into separate patch.
Changes in v2:
- split x86 and xen changes into separate patches
David
PATCH v3 1/4 dma: add dma_get_required_mask_from_max_pfn()
A generic dma_get_required_mask() is useful even for architectures (such as ia64) that define ARCH_HAS_GET_REQUIRED_MASK.
--- drivers/base/platform.c | 10 ++++++++-- include/linux/dma-mapping.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/base/platform.c +8 -2
@@ -1009,8 +1009,7 @@ int __init platform_bus_init(void)return error; } -#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK -u64 dma_get_required_mask (struct device *dev) +u64 dma_get_required_mask_from_max_pfn (struct device *dev) {u32 low_totalram = ((max_pfn -1 ) <<PAGE_SHIFT );u32 high_totalram = ((max_pfn -1 ) >> (32 -PAGE_SHIFT ));
@@ -1028,6 +1027,13 @@ u64 dma_get_required_mask(struct device *dev) }return mask; } +EXPORT_SYMBOL_GPL (dma_get_required_mask_from_max_pfn); + +#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK +u64 dma_get_required_mask (struct device *dev) +{ +return dma_get_required_mask_from_max_pfn (dev); +}EXPORT_SYMBOL_GPL (dma_get_required_mask);#endif
include/linux/dma-mapping.h +1 -0
@@ -127,6 +127,7 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask)return dma_set_mask_and_coherent (dev, mask); } +extern u64 dma_get_required_mask_from_max_pfn (struct device *dev);extern u64 dma_get_required_mask (struct device *dev);#ifndef set_arch_dma_coherent_ops
Signature · 1 line
1.7.10.4
PATCH v3 1/4 dma: add dma_get_required_mask_from_max_pfn()
In reply to David VrabelA generic dma_get_required_mask() is useful even for architectures (such as ia64) that define ARCH_HAS_GET_REQUIRED_MASK.
--- drivers/base/platform.c | 10 ++++++++-- include/linux/dma-mapping.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/base/platform.c +8 -2
@@ -1009,8 +1009,7 @@ int __init platform_bus_init(void)return error; } -#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK -u64 dma_get_required_mask (struct device *dev) +u64 dma_get_required_mask_from_max_pfn (struct device *dev) {u32 low_totalram = ((max_pfn -1 ) <<PAGE_SHIFT );u32 high_totalram = ((max_pfn -1 ) >> (32 -PAGE_SHIFT ));
@@ -1028,6 +1027,13 @@ u64 dma_get_required_mask(struct device *dev) }return mask; } +EXPORT_SYMBOL_GPL (dma_get_required_mask_from_max_pfn); + +#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK +u64 dma_get_required_mask (struct device *dev) +{ +return dma_get_required_mask_from_max_pfn (dev); +}EXPORT_SYMBOL_GPL (dma_get_required_mask);#endif
include/linux/dma-mapping.h +1 -0
@@ -127,6 +127,7 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask)return dma_set_mask_and_coherent (dev, mask); } +extern u64 dma_get_required_mask_from_max_pfn (struct device *dev);extern u64 dma_get_required_mask (struct device *dev);#ifndef set_arch_dma_coherent_ops
Signature · 1 line
1.7.10.4
PATCH v3 2/4 ia64: use common dma_get_required_mask_from_pfn()
In reply to David Vrabel--- arch/ia64/include/asm/machvec.h | 2 +- arch/ia64/include/asm/machvec_init.h | 1 - arch/ia64/pci/pci.c | 20 -------------------- 3 files changed, 1 insertion(+), 22 deletions(-)
arch/ia64/include/asm/machvec.h +1 -1
@@ -287,7 +287,7 @@ extern struct dma_map_ops *dma_get_ops(struct device *);# define platform_dma_get_ops dma_get_ops#endif #ifndef platform_dma_get_required_mask -# define platform_dma_get_required_mask ia64_dma_get_required_mask +# define platform_dma_get_required_mask dma_get_required_mask_from_max_pfn#endif #ifndef platform_irq_to_vector# define platform_irq_to_vector __ia64_irq_to_vector
arch/ia64/include/asm/machvec_init.h +0 -1
@@ -3,7 +3,6 @@extern ia64_mv_send_ipi_t ia64_send_ipi;extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge; -extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask;extern ia64_mv_irq_to_vector __ia64_irq_to_vector;extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq;extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem;
arch/ia64/pci/pci.c +0 -20
@@ -791,26 +791,6 @@ static void __init set_pci_dfl_cacheline_size(void) pci_dfl_cache_line_size = (1 << cci.pcci_line_size) /4 ; } -u64 ia64_dma_get_required_mask (struct device *dev) -{ -u32 low_totalram = ((max_pfn -1 ) <<PAGE_SHIFT ); -u32 high_totalram = ((max_pfn -1 ) >> (32 -PAGE_SHIFT )); -u64 mask; - -if (!high_totalram) { -/* convert to mask just covering totalram */ - low_totalram = (1 << (fls (low_totalram) -1 )); - low_totalram += low_totalram -1 ; - mask = low_totalram; - }else { - high_totalram = (1 << (fls (high_totalram) -1 )); - high_totalram += high_totalram -1 ; - mask = (((u64 )high_totalram) <<32 ) +0xffffffff ; - } -return mask; -} -EXPORT_SYMBOL_GPL (ia64_dma_get_required_mask); -u64 dma_get_required_mask (struct device *dev) {return platform_dma_get_required_mask (dev);
Signature · 1 line
1.7.10.4
Re: [PATCH 2/4] ia64: use common dma_get_required_mask_from_pfn()
Quoted 4 lines · David Vrabel
Signed-off-by David Vrabel <[email protected]>Cc Tony Luck <[email protected]>Cc Fenghua Yu <[email protected]>
Quoted 70 lines
arch/ia64/include/asm/machvec.h | 2 +- arch/ia64/include/asm/machvec_init.h | 1 - arch/ia64/pci/pci.c | 20 -------------------- 3 files changed, 1 insertion(+), 22 deletions(-)arch/ia64/include/asm/machvec.h +1
-1@@ -287,7 +287,7 @@ extern struct dma_map_ops *dma_get_ops(struct device *);# define platform_dma_get_ops dma_get_ops#endif #ifndef platform_dma_get_required_mask -# define platform_dma_get_required_mask ia64_dma_get_required_mask +# define platform_dma_get_required_mask dma_get_required_mask_from_max_pfn#endif #ifndef platform_irq_to_vector# define platform_irq_to_vector __ia64_irq_to_vectorarch/ia64/include/asm/machvec_init.h +0
-1@@ -3,7 +3,6 @@extern ia64_mv_send_ipi_t ia64_send_ipi;extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge; -extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask;extern ia64_mv_irq_to_vector __ia64_irq_to_vector;extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq;extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem;arch/ia64/pci/pci.c +0
-20@@ -791,26 +791,6 @@ static void __init set_pci_dfl_cacheline_size(void) pci_dfl_cache_line_size = (1 << cci.pcci_line_size) /4 ; } -u64 ia64_dma_get_required_mask (struct device *dev) -{ -u32 low_totalram = ((max_pfn -1 ) <<PAGE_SHIFT ); -u32 high_totalram = ((max_pfn -1 ) >> (32 -PAGE_SHIFT )); -u64 mask; - -if (!high_totalram) { -/* convert to mask just covering totalram */ - low_totalram = (1 << (fls (low_totalram) -1 )); - low_totalram += low_totalram -1 ; - mask = low_totalram; - }else { - high_totalram = (1 << (fls (high_totalram) -1 )); - high_totalram += high_totalram -1 ; - mask = (((u64 )high_totalram) <<32 ) +0xffffffff ; - } -return mask; -} -EXPORT_SYMBOL_GPL (ia64_dma_get_required_mask); -u64 dma_get_required_mask (struct device *dev) {return platform_dma_get_required_mask (dev);Signature · 7 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://secure-web.cisco.com/1uzdEOuzPh9ddYCppJ7edARD7taQXur82_EMioIJqXcGS1lEgfETQB2j546iHGLqo8mraFv4u9YxUpICa6DurqoTbYGXFrH14KuGQfFFzn4DHYx5HIksjcOqO2hiw74xfemY9frjnyDwhuBoBc3quJ5I8zLhf8kRz1AJGBKOKY_o/http%3A%2F%2Fwww.tux.org%2Flkml%2F
Re: [PATCH 2/4] ia64: use common dma_get_required_mask_from_pfn()
In reply to David VrabelQuoted 4 lines · David Vrabel
Signed-off-by David Vrabel <[email protected]>Cc Tony Luck <[email protected]>Cc Fenghua Yu <[email protected]>
Quoted 70 lines
arch/ia64/include/asm/machvec.h | 2 +- arch/ia64/include/asm/machvec_init.h | 1 - arch/ia64/pci/pci.c | 20 -------------------- 3 files changed, 1 insertion(+), 22 deletions(-)arch/ia64/include/asm/machvec.h +1
-1@@ -287,7 +287,7 @@ extern struct dma_map_ops *dma_get_ops(struct device *);# define platform_dma_get_ops dma_get_ops#endif #ifndef platform_dma_get_required_mask -# define platform_dma_get_required_mask ia64_dma_get_required_mask +# define platform_dma_get_required_mask dma_get_required_mask_from_max_pfn#endif #ifndef platform_irq_to_vector# define platform_irq_to_vector __ia64_irq_to_vectorarch/ia64/include/asm/machvec_init.h +0
-1@@ -3,7 +3,6 @@extern ia64_mv_send_ipi_t ia64_send_ipi;extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge; -extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask;extern ia64_mv_irq_to_vector __ia64_irq_to_vector;extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq;extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem;arch/ia64/pci/pci.c +0
-20@@ -791,26 +791,6 @@ static void __init set_pci_dfl_cacheline_size(void) pci_dfl_cache_line_size = (1 << cci.pcci_line_size) /4 ; } -u64 ia64_dma_get_required_mask (struct device *dev) -{ -u32 low_totalram = ((max_pfn -1 ) <<PAGE_SHIFT ); -u32 high_totalram = ((max_pfn -1 ) >> (32 -PAGE_SHIFT )); -u64 mask; - -if (!high_totalram) { -/* convert to mask just covering totalram */ - low_totalram = (1 << (fls (low_totalram) -1 )); - low_totalram += low_totalram -1 ; - mask = low_totalram; - }else { - high_totalram = (1 << (fls (high_totalram) -1 )); - high_totalram += high_totalram -1 ; - mask = (((u64 )high_totalram) <<32 ) +0xffffffff ; - } -return mask; -} -EXPORT_SYMBOL_GPL (ia64_dma_get_required_mask); -u64 dma_get_required_mask (struct device *dev) {return platform_dma_get_required_mask (dev);Signature · 7 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://secure-web.cisco.com/1uzdEOuzPh9ddYCppJ7edARD7taQXur82_EMioIJqXcGS1lEgfETQB2j546iHGLqo8mraFv4u9YxUpICa6DurqoTbYGXFrH14KuGQfFFzn4DHYx5HIksjcOqO2hiw74xfemY9frjnyDwhuBoBc3quJ5I8zLhf8kRz1AJGBKOKY_o/http%3A%2F%2Fwww.tux.org%2Flkml%2F
PATCH v3 2/4 ia64: use common dma_get_required_mask_from_pfn()
In reply to David Vrabel--- arch/ia64/include/asm/machvec.h | 2 +- arch/ia64/include/asm/machvec_init.h | 1 - arch/ia64/pci/pci.c | 20 -------------------- 3 files changed, 1 insertion(+), 22 deletions(-)
arch/ia64/include/asm/machvec.h +1 -1
@@ -287,7 +287,7 @@ extern struct dma_map_ops *dma_get_ops(struct device *);# define platform_dma_get_ops dma_get_ops#endif #ifndef platform_dma_get_required_mask -# define platform_dma_get_required_mask ia64_dma_get_required_mask +# define platform_dma_get_required_mask dma_get_required_mask_from_max_pfn#endif #ifndef platform_irq_to_vector# define platform_irq_to_vector __ia64_irq_to_vector
arch/ia64/include/asm/machvec_init.h +0 -1
@@ -3,7 +3,6 @@extern ia64_mv_send_ipi_t ia64_send_ipi;extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge; -extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask;extern ia64_mv_irq_to_vector __ia64_irq_to_vector;extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq;extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem;
arch/ia64/pci/pci.c +0 -20
@@ -791,26 +791,6 @@ static void __init set_pci_dfl_cacheline_size(void) pci_dfl_cache_line_size = (1 << cci.pcci_line_size) /4 ; } -u64 ia64_dma_get_required_mask (struct device *dev) -{ -u32 low_totalram = ((max_pfn -1 ) <<PAGE_SHIFT ); -u32 high_totalram = ((max_pfn -1 ) >> (32 -PAGE_SHIFT )); -u64 mask; - -if (!high_totalram) { -/* convert to mask just covering totalram */ - low_totalram = (1 << (fls (low_totalram) -1 )); - low_totalram += low_totalram -1 ; - mask = low_totalram; - }else { - high_totalram = (1 << (fls (high_totalram) -1 )); - high_totalram += high_totalram -1 ; - mask = (((u64 )high_totalram) <<32 ) +0xffffffff ; - } -return mask; -} -EXPORT_SYMBOL_GPL (ia64_dma_get_required_mask); -u64 dma_get_required_mask (struct device *dev) {return platform_dma_get_required_mask (dev);
Signature · 1 line
1.7.10.4
PATCH v3 3/4 x86: allow dma_get_required_mask() to be overridden
In reply to David VrabelUse dma_ops->get_required_mask() if provided, defaulting to dma_get_requried_mask_from_max_pfn().
This is needed on systems (such as Xen PV guests) where the DMA address and the physical address are not equal.
ARCH_HAS_DMA_GET_REQUIRED_MASK is defined in asm/device.h instead of asm/dma-mapping.h because linux/dma-mapping.h uses the define before including asm/dma-mapping.h
--- arch/x86/include/asm/device.h | 2 ++ arch/x86/kernel/pci-dma.c | 8 ++++++++ 2 files changed, 10 insertions(+)
arch/x86/include/asm/device.h +2 -0
@@ -13,4 +13,6 @@ struct dev_archdata {struct pdev_archdata { }; +#define ARCH_HAS_DMA_GET_REQUIRED_MASK +#endif /* _ASM_X86_DEVICE_H */
arch/x86/kernel/pci-dma.c +8 -0
@@ -140,6 +140,14 @@ void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr,free_pages ((unsigned long )vaddr,get_order (size)); } +u64 dma_get_required_mask (struct device *dev) +{ +if (dma_ops->get_required_mask) +return dma_ops->get_required_mask (dev); +return dma_get_required_mask_from_max_pfn (dev); +} +EXPORT_SYMBOL_GPL (dma_get_required_mask); +/* * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel * parameter documentation.
Signature · 1 line
1.7.10.4
PATCH v3 3/4 x86: allow dma_get_required_mask() to be overridden
In reply to David VrabelUse dma_ops->get_required_mask() if provided, defaulting to dma_get_requried_mask_from_max_pfn().
This is needed on systems (such as Xen PV guests) where the DMA address and the physical address are not equal.
ARCH_HAS_DMA_GET_REQUIRED_MASK is defined in asm/device.h instead of asm/dma-mapping.h because linux/dma-mapping.h uses the define before including asm/dma-mapping.h
--- arch/x86/include/asm/device.h | 2 ++ arch/x86/kernel/pci-dma.c | 8 ++++++++ 2 files changed, 10 insertions(+)
arch/x86/include/asm/device.h +2 -0
@@ -13,4 +13,6 @@ struct dev_archdata {struct pdev_archdata { }; +#define ARCH_HAS_DMA_GET_REQUIRED_MASK +#endif /* _ASM_X86_DEVICE_H */
arch/x86/kernel/pci-dma.c +8 -0
@@ -140,6 +140,14 @@ void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr,free_pages ((unsigned long )vaddr,get_order (size)); } +u64 dma_get_required_mask (struct device *dev) +{ +if (dma_ops->get_required_mask) +return dma_ops->get_required_mask (dev); +return dma_get_required_mask_from_max_pfn (dev); +} +EXPORT_SYMBOL_GPL (dma_get_required_mask); +/* * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel * parameter documentation.
Signature · 1 line
1.7.10.4
PATCH v3 4/4 x86/xen: use the maximum MFN to calculate the required DMA mask
In reply to David VrabelOn a Xen PV guest the DMA addresses and physical addresses are not 1:1 (such as Xen PV guests) and the generic dma_get_required_mask() does not return the correct mask (since it uses max_pfn).
Some device drivers (such as mptsas, mpt2sas) use dma_get_required_mask() to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly.
Provide a get_required_mask op that uses the maximum MFN to calculate the DMA mask.
--- arch/x86/xen/pci-swiotlb-xen.c | 1 + drivers/xen/swiotlb-xen.c | 13 +++++++++++++ include/xen/swiotlb-xen.h | 4 ++++ 3 files changed, 18 insertions(+)
arch/x86/xen/pci-swiotlb-xen.c +1 -0
@@ -31,6 +31,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { .map_page = xen_swiotlb_map_page, .unmap_page = xen_swiotlb_unmap_page, .dma_supported = xen_swiotlb_dma_supported, + .get_required_mask = xen_swiotlb_get_required_mask, };/*
drivers/xen/swiotlb-xen.c +13 -0
@@ -42,9 +42,11 @@#include <xen/page.h> #include <xen/xen-ops.h> #include <xen/hvc-console.h> +#include <xen/interface/memory.h> #include <asm/dma-mapping.h> #include <asm/xen/page-coherent.h> +#include <asm/xen/hypercall.h> #include <trace/events/swiotlb.h> /*
@@ -683,3 +685,14 @@ xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask)return 0 ; }EXPORT_SYMBOL_GPL (xen_swiotlb_set_dma_mask); + +u64 +xen_swiotlb_get_required_mask (struct device *dev) +{ +unsigned long max_mfn; + + max_mfn =HYPERVISOR_memory_op (XENMEM_maximum_ram_page,NULL ); + +return DMA_BIT_MASK (fls_long (max_mfn -1 ) +PAGE_SHIFT ); +} +EXPORT_SYMBOL_GPL (xen_swiotlb_get_required_mask);
include/xen/swiotlb-xen.h +4 -0
@@ -58,4 +58,8 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);extern int xen_swiotlb_set_dma_mask (struct device *dev,u64 dma_mask); + +extern u64 +xen_swiotlb_get_required_mask (struct device *dev); +#endif /* __LINUX_SWIOTLB_XEN_H */
Signature · 1 line
1.7.10.4
Re: [Xen-devel] [PATCH 4/4] x86/xen: use the maximum MFN to calculate the required DMA mask
Quoted 49 lines · David Vrabel
On a Xen PV guest the DMA addresses and physical addresses are not 1:1 (such as Xen PV guests) and the generic
dma_get_required_mask()does not return the correct mask (since it usesmax_pfn).Some device drivers (such as mptsas, mpt2sas) use
dma_get_required_mask()to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly.Provide a
get_required_maskop that uses the maximum MFN to calculate the DMA mask.Signed-off-by David Vrabel <[email protected]>--- arch/x86/xen/pci-swiotlb-xen.c | 1 + drivers/xen/swiotlb-xen.c | 13 +++++++++++++ include/xen/swiotlb-xen.h | 4 ++++ 3 files changed, 18 insertions(+)arch/x86/xen/pci-swiotlb-xen.c +1
-0@@ -31,6 +31,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { .map_page = xen_swiotlb_map_page, .unmap_page = xen_swiotlb_unmap_page, .dma_supported = xen_swiotlb_dma_supported, + .get_required_mask = xen_swiotlb_get_required_mask, };/* drivers/xen/swiotlb-xen.c +2
-0@@ -42,9 +42,11 @@#include <xen/page.h> #include <xen/xen-ops.h> #include <xen/hvc-console.h> +#include <xen/interface/memory.h> #include <asm/dma-mapping.h> #include <asm/xen/page-coherent.h> +#include <asm/xen/hypercall.h> #include <trace/events/swiotlb.h> /*
drivers/xen/swiotlb-xen.c xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask) · line 694
Quoted 10 lines
drivers/xen/swiotlb-xen.c +7
-0@@ -683,3 +685,14 @@ xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask)return 0 ; }EXPORT_SYMBOL_GPL (xen_swiotlb_set_dma_mask); + +u64 +xen_swiotlb_get_required_mask (struct device *dev) +{ +unsigned long max_mfn; + + max_mfn =HYPERVISOR_memory_op (XENMEM_maximum_ram_page,NULL );
As Jan pointed out, I think you need to change the prototype of HYPERVISOR_memory_op to return long. Please do consistently across all relevant archs.
Quoted 25 lines
drivers/xen/swiotlb-xen.c +3
-0+return DMA_BIT_MASK (fls_long (max_mfn -1 ) +PAGE_SHIFT ); +} +EXPORT_SYMBOL_GPL (xen_swiotlb_get_required_mask);include/xen/swiotlb-xen.h +4
-0@@ -58,4 +58,8 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);extern int xen_swiotlb_set_dma_mask (struct device *dev,u64 dma_mask); + +extern u64 +xen_swiotlb_get_required_mask (struct device *dev); +#endif /* __LINUX_SWIOTLB_XEN_H */ Signature · 7 lines
1.7.10.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 4/4] x86/xen: use the maximum MFN to calculate the required DMA mask
Quoted 12 lines · Stefano Stabellini
drivers/xen/swiotlb-xen.c xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask) · line 694
Quoted 7 lines · David Vrabel
drivers/xen/swiotlb-xen.c +6
-0+u64 +xen_swiotlb_get_required_mask (struct device *dev) +{ +unsigned long max_mfn; + + max_mfn =HYPERVISOR_memory_op (XENMEM_maximum_ram_page,NULL );As Jan pointed out, I think you need to change the prototype of
HYPERVISOR_memory_opto return long. Please do consistently across all relevant archs.
This doesn't help since 32-bit guests will still truncate. A new hypercall op that returns the result in a uint64_t parameter is required.
There is another reason why max_mfn isn't suitable -- IOMMU usage so I think we should assume a 64-bit DMA mask is required (this is actually the change I put into XenServer's kernel).
David
Re: [PATCH 4/4] x86/xen: use the maximum MFN to calculate the required DMA mask
In reply to Stefano StabelliniQuoted 12 lines · Stefano Stabellini
drivers/xen/swiotlb-xen.c xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask) · line 694
Quoted 7 lines · David Vrabel
drivers/xen/swiotlb-xen.c +6
-0+u64 +xen_swiotlb_get_required_mask (struct device *dev) +{ +unsigned long max_mfn; + + max_mfn =HYPERVISOR_memory_op (XENMEM_maximum_ram_page,NULL );As Jan pointed out, I think you need to change the prototype of
HYPERVISOR_memory_opto return long. Please do consistently across all relevant archs.
This doesn't help since 32-bit guests will still truncate. A new hypercall op that returns the result in a uint64_t parameter is required.
There is another reason why max_mfn isn't suitable -- IOMMU usage so I think we should assume a 64-bit DMA mask is required (this is actually the change I put into XenServer's kernel).
David
Re: [PATCH 4/4] x86/xen: use the maximum MFN to calculate the required DMA mask
In reply to David VrabelQuoted 49 lines · David Vrabel
On a Xen PV guest the DMA addresses and physical addresses are not 1:1 (such as Xen PV guests) and the generic
dma_get_required_mask()does not return the correct mask (since it usesmax_pfn).Some device drivers (such as mptsas, mpt2sas) use
dma_get_required_mask()to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly.Provide a
get_required_maskop that uses the maximum MFN to calculate the DMA mask.Signed-off-by David Vrabel <[email protected]>--- arch/x86/xen/pci-swiotlb-xen.c | 1 + drivers/xen/swiotlb-xen.c | 13 +++++++++++++ include/xen/swiotlb-xen.h | 4 ++++ 3 files changed, 18 insertions(+)arch/x86/xen/pci-swiotlb-xen.c +1
-0@@ -31,6 +31,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { .map_page = xen_swiotlb_map_page, .unmap_page = xen_swiotlb_unmap_page, .dma_supported = xen_swiotlb_dma_supported, + .get_required_mask = xen_swiotlb_get_required_mask, };/* drivers/xen/swiotlb-xen.c +2
-0@@ -42,9 +42,11 @@#include <xen/page.h> #include <xen/xen-ops.h> #include <xen/hvc-console.h> +#include <xen/interface/memory.h> #include <asm/dma-mapping.h> #include <asm/xen/page-coherent.h> +#include <asm/xen/hypercall.h> #include <trace/events/swiotlb.h> /*
drivers/xen/swiotlb-xen.c xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask) · line 694
Quoted 10 lines
drivers/xen/swiotlb-xen.c +7
-0@@ -683,3 +685,14 @@ xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask)return 0 ; }EXPORT_SYMBOL_GPL (xen_swiotlb_set_dma_mask); + +u64 +xen_swiotlb_get_required_mask (struct device *dev) +{ +unsigned long max_mfn; + + max_mfn =HYPERVISOR_memory_op (XENMEM_maximum_ram_page,NULL );
As Jan pointed out, I think you need to change the prototype of HYPERVISOR_memory_op to return long. Please do consistently across all relevant archs.
Quoted 25 lines
drivers/xen/swiotlb-xen.c +3
-0+return DMA_BIT_MASK (fls_long (max_mfn -1 ) +PAGE_SHIFT ); +} +EXPORT_SYMBOL_GPL (xen_swiotlb_get_required_mask);include/xen/swiotlb-xen.h +4
-0@@ -58,4 +58,8 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);extern int xen_swiotlb_set_dma_mask (struct device *dev,u64 dma_mask); + +extern u64 +xen_swiotlb_get_required_mask (struct device *dev); +#endif /* __LINUX_SWIOTLB_XEN_H */ Signature · 7 lines
1.7.10.4 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 4/4] x86/xen: use the maximum MFN to calculate the required DMA mask
In reply to David VrabelQuoted 11 lines
Quoted 1 line
Quoted 1 line · On 19.11.14 at 17:02, <[email protected]> wrote:
On a Xen PV guest the DMA addresses and physical addresses are not 1:1 (such as Xen PV guests) and the generic
dma_get_required_mask()does not return the correct mask (since it usesmax_pfn).Some device drivers (such as mptsas, mpt2sas) use
dma_get_required_mask()to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly.
Quoted 4 lines
Provide a
get_required_maskop that uses the maximum MFN to calculate the DMA mask.Signed-off-by David Vrabel <[email protected]>
PATCH v3 4/4 x86/xen: use the maximum MFN to calculate the required DMA mask
In reply to David VrabelOn a Xen PV guest the DMA addresses and physical addresses are not 1:1 (such as Xen PV guests) and the generic dma_get_required_mask() does not return the correct mask (since it uses max_pfn).
Some device drivers (such as mptsas, mpt2sas) use dma_get_required_mask() to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly.
Provide a get_required_mask op that uses the maximum MFN to calculate the DMA mask.
--- arch/x86/xen/pci-swiotlb-xen.c | 1 + drivers/xen/swiotlb-xen.c | 13 +++++++++++++ include/xen/swiotlb-xen.h | 4 ++++ 3 files changed, 18 insertions(+)
arch/x86/xen/pci-swiotlb-xen.c +1 -0
@@ -31,6 +31,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { .map_page = xen_swiotlb_map_page, .unmap_page = xen_swiotlb_unmap_page, .dma_supported = xen_swiotlb_dma_supported, + .get_required_mask = xen_swiotlb_get_required_mask, };/*
drivers/xen/swiotlb-xen.c +13 -0
@@ -42,9 +42,11 @@#include <xen/page.h> #include <xen/xen-ops.h> #include <xen/hvc-console.h> +#include <xen/interface/memory.h> #include <asm/dma-mapping.h> #include <asm/xen/page-coherent.h> +#include <asm/xen/hypercall.h> #include <trace/events/swiotlb.h> /*
@@ -683,3 +685,14 @@ xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask)return 0 ; }EXPORT_SYMBOL_GPL (xen_swiotlb_set_dma_mask); + +u64 +xen_swiotlb_get_required_mask (struct device *dev) +{ +unsigned long max_mfn; + + max_mfn =HYPERVISOR_memory_op (XENMEM_maximum_ram_page,NULL ); + +return DMA_BIT_MASK (fls_long (max_mfn -1 ) +PAGE_SHIFT ); +} +EXPORT_SYMBOL_GPL (xen_swiotlb_get_required_mask);
include/xen/swiotlb-xen.h +4 -0
@@ -58,4 +58,8 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);extern int xen_swiotlb_set_dma_mask (struct device *dev,u64 dma_mask); + +extern u64 +xen_swiotlb_get_required_mask (struct device *dev); +#endif /* __LINUX_SWIOTLB_XEN_H */
Signature · 1 line
1.7.10.4