[kernel] r15839 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Tue Jun  8 01:56:55 2010
New Revision: 15839

Log:
virtio_blk: don't bounce highmem requests (Closes: #584217)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/virtio_blk-dont-bounce-highmem-requests.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/23

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sun Jun  6 20:44:04 2010	(r15838)
+++ dists/lenny/linux-2.6/debian/changelog	Tue Jun  8 01:56:55 2010	(r15839)
@@ -15,6 +15,7 @@
     - Enable error-correction on singly-degraded RAID6
   * r8169: fix broken register writes (Closes: #407217, #573007)
   * [i386] Disable use of NOPL instruction in alternatives (Closes: #463606)
+  * virtio_blk: don't bounce highmem requests (Closes: #584217)
 
   [ maximilian attems ]
   * openvz: printk_cpu have to be "cleared" in __vprintk (v2)

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/virtio_blk-dont-bounce-highmem-requests.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/virtio_blk-dont-bounce-highmem-requests.patch	Tue Jun  8 01:56:55 2010	(r15839)
@@ -0,0 +1,37 @@
+From: Christoph Hellwig <hch at lst.de>
+Date: Fri, 17 Jul 2009 21:47:45 -0600
+Subject: [PATCH] virtio_blk: don't bounce highmem requests
+
+commit 81f4306654d459f730dfbe5fac983e1cba8fcf7c upstream.
+
+By default a block driver bounces highmem requests, but virtio-blk is
+perfectly fine with any request that fit into it's 64 bit addressing scheme,
+mapped in the kernel virtual space or not.
+
+Besides improving performance on highmem systems this also makes the
+reproducible oops in __bounce_end_io go away (but hiding the real cause).
+
+Signed-off-by: Christoph Hellwig <hch at lst.de>
+Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
+[bwh: Adjust context for 2.6.26]
+---
+ drivers/block/virtio_blk.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
+index dd7ea20..141c0e7 100644
+--- a/drivers/block/virtio_blk.c
++++ b/drivers/block/virtio_blk.c
+@@ -276,6 +276,9 @@ static int virtblk_probe(struct virtio_device *vdev)
+ 	}
+ 	set_capacity(vblk->disk, cap);
+ 
++	/* No need to bounce any requests */
++	blk_queue_bounce_limit(vblk->disk->queue, BLK_BOUNCE_ANY);
++
+ 	/* Host can optionally specify maximum segment size and number of
+ 	 * segments. */
+ 	err = virtio_config_val(vdev, VIRTIO_BLK_F_SIZE_MAX,
+-- 
+1.7.1
+

Modified: dists/lenny/linux-2.6/debian/patches/series/23
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/23	Sun Jun  6 20:44:04 2010	(r15838)
+++ dists/lenny/linux-2.6/debian/patches/series/23	Tue Jun  8 01:56:55 2010	(r15839)
@@ -12,3 +12,4 @@
 + bugfix/mips/mips-ide-flush-dcache.patch
 + bugfix/mips/fpu-emulator.patch
 + bugfix/x86/x86-completely-disable-NOPL-on-32-bits.patch
++ bugfix/all/virtio_blk-dont-bounce-highmem-requests.patch