[xen] Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single"

(Closes: #776237)

svn path=/dists/sid/linux/; revision=22285
This commit is contained in:
Ian Campbell 2015-01-26 13:25:40 +00:00
parent d6018c18d2
commit f800ed5d8d
3 changed files with 40 additions and 0 deletions

4
debian/changelog vendored
View File

@ -11,6 +11,10 @@ linux (3.16.7-ckt4-2) UNRELEASED; urgency=medium
[ Helge Deller ]
* [hppa] Enable CONFIG_PPDEV to avoid CUPS complaining with systemd
[ Ian Campbell ]
* [xen] Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single"
(Closes: #776237)
-- Ian Campbell <ijc@debian.org> Fri, 16 Jan 2015 15:14:32 +0000
linux (3.16.7-ckt4-1) unstable; urgency=medium

View File

@ -0,0 +1,35 @@
From c3d92e076c01e257d0cac339e1942f1217ba279b Mon Sep 17 00:00:00 2001
From: David Vrabel <david.vrabel@citrix.com>
Date: Wed, 10 Dec 2014 14:48:43 +0000
Subject: [PATCH] Revert "swiotlb-xen: pass dev_addr to
swiotlb_tbl_unmap_single"
This reverts commit 2c3fc8d26dd09b9d7069687eead849ee81c78e46.
This commit broke on x86 PV because entries in the generic SWIOTLB are
indexed using (pseudo-)physical address not DMA address and these are
not the same in a x86 PV guest.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
(cherry picked from commit dbdd74763f1faf799fbb9ed30423182e92919378)
---
drivers/xen/swiotlb-xen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 5ea1e3c..810ad41 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -451,7 +451,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
/* NOTE: We use dev_addr here, not paddr! */
if (is_xen_swiotlb_buffer(dev_addr)) {
- swiotlb_tbl_unmap_single(hwdev, dev_addr, size, dir);
+ swiotlb_tbl_unmap_single(hwdev, paddr, size, dir);
return;
}
--
1.7.10.4

View File

@ -152,6 +152,7 @@ bugfix/all/netback-don-t-store-invalid-vif-pointer.patch
bugfix/all/xen-netback-support-frontends-without-feature-rx-not.patch
bugfix/all/aufs-move-d_rcu-from-overlapping-d_child-to-overlapping-d.patch
bugfix/all/net-mv643xx-disable-tso-by-default.patch
bugfix/all/Revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unma.patch
# memfd_create() & kdbus backport
features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch