[kernel] r22285 - in dists/sid/linux/debian: . patches patches/bugfix/all

[Ian James Campbell]

Author: ijc
Date: Mon Jan 26 13:25:40 2015
New Revision: 22285

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

(Closes: #776237)

Added:
   dists/sid/linux/debian/patches/bugfix/all/Revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unma.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon Jan 19 20:25:41 2015	(r22284)
+++ dists/sid/linux/debian/changelog	Mon Jan 26 13:25:40 2015	(r22285)
@@ -11,6 +11,10 @@
   [ 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 at debian.org>  Fri, 16 Jan 2015 15:14:32 +0000
 
 linux (3.16.7-ckt4-1) unstable; urgency=medium

Added: dists/sid/linux/debian/patches/bugfix/all/Revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unma.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/all/Revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unma.patch	Mon Jan 26 13:25:40 2015	(r22285)
@@ -0,0 +1,35 @@
+From c3d92e076c01e257d0cac339e1942f1217ba279b Mon Sep 17 00:00:00 2001
+From: David Vrabel <david.vrabel at 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 at citrix.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini at 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
+

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Mon Jan 19 20:25:41 2015	(r22284)
+++ dists/sid/linux/debian/patches/series	Mon Jan 26 13:25:40 2015	(r22285)
@@ -152,6 +152,7 @@
 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