[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2] xen/swiotlb: Bounce mappings that cross the segment boundary



The block layer applies a device's DMA segment boundary to
pseudo-physical addresses, but in a Xen PV domain the bus address is the
machine address.  A segment that is contiguous in both spaces can still
cross the boundary in machine space and reach the device.  AHCI declares
a 4 GiB boundary, and controllers that do not carry across it (e.g.
Marvell 88SE9230) then DMA the tail of the transfer 4 GiB too low.

Bounce such streaming mappings.  Coherent allocations need no check:
they are naturally aligned in bus space (range_requires_alignment()), so
they cannot cross a boundary they fit in.

Signed-off-by: Lin Liu <lin.liu01@xxxxxxxxxx>
---
v2:
- Only check streaming mappings; coherent allocations are naturally
  aligned in bus space and cannot cross the boundary (Ross, Jürgen).
- Leave range_straddles_page_boundary() unchanged.
- Comment why alloc_coherent needs no boundary check (Jürgen).

 drivers/xen/swiotlb-xen.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index e2538824e..5041be7d3 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -96,6 +96,15 @@ static inline int range_straddles_page_boundary(phys_addr_t 
p, size_t size)
        return 0;
 }
 
+/* Bus-contiguous, but may still cross the device's segment boundary */
+static inline bool range_crosses_seg_boundary(struct device *dev,
+                                             dma_addr_t dma, size_t size)
+{
+       unsigned long mask = dma_get_seg_boundary(dev);
+
+       return size && ((dma ^ (dma + size - 1)) & ~mask);
+}
+
 static struct io_tlb_pool *xen_swiotlb_find_pool(struct device *dev,
                                                 dma_addr_t dma_addr)
 {
@@ -157,6 +166,7 @@ xen_swiotlb_alloc_coherent(struct device *dev, size_t size,
        phys = virt_to_phys(ret);
 
        *dma_handle = xen_phys_to_dma(dev, phys);
+       /* No seg boundary check: __get_free_pages() is naturally aligned */
        if (*dma_handle + size - 1 > dma_mask ||
            range_straddles_page_boundary(phys, size) ||
            range_requires_alignment(phys, size)) {
@@ -234,6 +244,7 @@ static dma_addr_t xen_swiotlb_map_phys(struct device *dev, 
phys_addr_t phys,
        if (dma_capable(dev, dev_addr, size, true, attrs) &&
            !dma_kmalloc_needs_bounce(dev, size, dir) &&
            !range_straddles_page_boundary(phys, size) &&
+           !range_crosses_seg_boundary(dev, dev_addr, size) &&
                !xen_arch_need_swiotlb(dev, phys, dev_addr) &&
                !is_swiotlb_force_bounce(dev))
                goto done;

base-commit: 7e1392a42ea288d70a266f6553fe06f57f8647ea
-- 
2.52.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.