3.10-stable patches

added patches:
	drbd-merge_bvec_fn-properly-remap-bvm-bi_bdev.patch
	revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unmap_single.patch

diff --git a/queue-3.10/drbd-merge_bvec_fn-properly-remap-bvm-bi_bdev.patch b/queue-3.10/drbd-merge_bvec_fn-properly-remap-bvm-bi_bdev.patch
new file mode 100644 (file)
index 0000000..87267e0
--- /dev/null
+++ b/queue-3.10/drbd-merge_bvec_fn-properly-remap-bvm-bi_bdev.patch
@@ -0,0 +1,32 @@
+From 3b9d35d744bb5139f9fed57f38c019bb8c7d351c Mon Sep 17 00:00:00 2001
+From: Lars Ellenberg <lars.ellenberg@linbit.com>
+Date: Mon, 10 Nov 2014 17:21:13 +0100
+Subject: drbd: merge_bvec_fn: properly remap bvm->bi_bdev
+
+From: Lars Ellenberg <lars.ellenberg@linbit.com>
+
+commit 3b9d35d744bb5139f9fed57f38c019bb8c7d351c upstream.
+
+This was not noticed for many years. Affects operation if
+md raid is used a backing device for DRBD.
+
+CC: stable@kernel.org # v3.2+
+Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
+Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/block/drbd/drbd_req.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/block/drbd/drbd_req.c
++++ b/drivers/block/drbd/drbd_req.c
+@@ -1309,6 +1309,7 @@ int drbd_merge_bvec(struct request_queue
+               struct request_queue * const b =
+                       mdev->ldev->backing_bdev->bd_disk->queue;
+               if (b->merge_bvec_fn) {
++                      bvm->bi_bdev = mdev->ldev->backing_bdev;
+                       backing_limit = b->merge_bvec_fn(b, bvm, bvec);
+                       limit = min(limit, backing_limit);
+               }

diff --git a/queue-3.10/revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unmap_single.patch b/queue-3.10/revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unmap_single.patch
new file mode 100644 (file)
index 0000000..3fe06d0
--- /dev/null
+++ b/queue-3.10/revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unmap_single.patch
@@ -0,0 +1,34 @@
+From dbdd74763f1faf799fbb9ed30423182e92919378 Mon Sep 17 00:00:00 2001
+From: David Vrabel <david.vrabel@citrix.com>
+Date: Wed, 10 Dec 2014 14:48:43 +0000
+Subject: Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single"
+
+From: David Vrabel <david.vrabel@citrix.com>
+
+commit dbdd74763f1faf799fbb9ed30423182e92919378 upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/xen/swiotlb-xen.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/xen/swiotlb-xen.c
++++ b/drivers/xen/swiotlb-xen.c
+@@ -390,7 +390,7 @@ static void xen_unmap_single(struct devi
+ 
+       /* 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;
+       }
+ 

diff --git a/queue-3.10/series b/queue-3.10/series
index 2a132b9898f0454c99fe6f4d0e93ac75588c91a0..e6e4f4f7ca25c16a368d6798389be758b05a620b 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -22,3 +22,5 @@ x86-asm-traps-disable-tracing-and-kprobes-in-fixup_bad_iret-and-sync_regs.patch
 sata_dwc_460ex-fix-resource-leak-on-error-path.patch
 keys-close-race-between-key-lookup-and-freeing.patch
 ipvs-uninitialized-data-with-ip_vs_ipv6.patch
+revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unmap_single.patch
+drbd-merge_bvec_fn-properly-remap-bvm-bi_bdev.patch