rpms/kernel/F-11 linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch, 1.2, 1.3 kernel.spec, 1.1690, 1.1691

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27866

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch 
Log Message:
linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch

linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch:
 virtio_blk.c |    3 +++
 1 file changed, 3 insertions(+)

Index: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
===================================================================
RCS file: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
diff -N linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch	10 Aug 2009 19:25:52 -0000	1.3
@@ -0,0 +1,33 @@
+From: Christoph Hellwig <hch at lst.de>
+Date: Sat, 18 Jul 2009 03:47:45 +0000 (-0600)
+Subject: virtio_blk: don't bounce highmem requests
+X-Git-Tag: v2.6.31-rc4~33^2~3
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4eff3cae9c9809720c636e64bc72f212258e0bd5
+
+virtio_blk: don't bounce highmem requests
+
+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>
+---
+
+diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
+index 43db3ea..4c47859 100644
+--- a/drivers/block/virtio_blk.c
++++ b/drivers/block/virtio_blk.c
+@@ -360,6 +360,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
+ 	blk_queue_max_phys_segments(vblk->disk->queue, vblk->sg_elems-2);
+ 	blk_queue_max_hw_segments(vblk->disk->queue, vblk->sg_elems-2);
+ 
++	/* No need to bounce any requests */
++	blk_queue_bounce_limit(vblk->disk->queue, BLK_BOUNCE_ANY);
++
+ 	/* No real sector limit. */
+ 	blk_queue_max_sectors(vblk->disk->queue, -1U);
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1690
retrieving revision 1.1691
diff -u -p -r1.1690 -r1.1691
--- kernel.spec	10 Aug 2009 19:23:30 -0000	1.1690
+++ kernel.spec	10 Aug 2009 19:25:52 -0000	1.1691
@@ -690,6 +690,7 @@ Patch12000: linux-2.6-xfrm-export-gc_thr
 
 Patch13000: linux-2.6-kvm-skip-pit-check.patch
 Patch13001: linux-2.6.29-xen-disable-gbpages.patch
+Patch13002: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
 %endif
 
@@ -1265,6 +1266,9 @@ ApplyPatch linux-2.6-kvm-skip-pit-check.
 # xen
 ApplyPatch linux-2.6.29-xen-disable-gbpages.patch
 
+# v12n
+ApplyPatch linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1856,6 +1860,7 @@ fi
  - linux-2.6-fs-cifs-fix-port-numbers.patch
  - linux-2.6-kvm-skip-pit-check.patch
  - linux-2.6.29-xen-disable-gbpages.patch
+ - linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.