summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwight Engen <dwight.engen@oracle.com>2014-09-19 09:42:53 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-30 14:37:35 -0700
commit5eed69ffd248c9f68f56c710caf07db134aef28b (patch)
tree6c5308b2f58cc6ceade6a149cf988966d61f956b
parentde5b73f08468b4fc5e2f6d1505f650262622f78b (diff)
sunvdc: limit each sg segment to a page
ldc_map_sg() could fail its check that the number of pages referred to by the sg scatterlist was <= the number of cookies. This fixes the issue by doing a similar thing to the xen-blkfront driver, ensuring that the scatterlist will only ever contain a segment count <= port->ring_cookies, and each segment will be page aligned, and <= page size. This ensures that the scatterlist is always mappable. Orabug: 19347817 OraBZ: 15945 Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/block/sunvdc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 1616ad091a5e..1a9360da1f54 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -747,6 +747,10 @@ static int probe_disk(struct vdc_port *port)
port->disk = g;
+ /* Each segment in a request is up to an aligned page in size. */
+ blk_queue_segment_boundary(q, PAGE_SIZE - 1);
+ blk_queue_max_segment_size(q, PAGE_SIZE);
+
blk_queue_max_segments(q, port->ring_cookies);
blk_queue_max_hw_sectors(q, port->max_xfer_size);
g->major = vdc_major;