linux-stable.git/drivers/block/sunvdc.c, branch linux-3.10.y

sunvdc: don't call VD_OP_GET_VTOC

2014-11-21T17:22:52+00:00

[ Upstream commit 85b0c6e62c48bb9179fd5b3e954f362fb346cbd5 ]

The VD_OP_GET_VTOC operation will succeed only if the vdisk backend has a
VTOC label, otherwise it will fail. In particular, it will return error
48 (ENOTSUP) if the disk has an EFI label. VTOC disk labels are already
handled by directly reading the disk in block/partitions/sun.c (enabled by
CONFIG_SUN_PARTITION which defaults to y on SPARC). Since port->label is
unused in the driver, remove the call and the field.

Signed-off-by: Dwight Engen 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

vio: fix reuse of vio_dring slot

2014-11-21T17:22:52+00:00

[ Upstream commit d0aedcd4f14a22e23b313f42b7e6e6ebfc0fbc31 ]

vio_dring_avail() will allow use of every dring entry, but when the last
entry is allocated then dr->prod == dr->cons which is indistinguishable from
the ring empty condition. This causes the next allocation to reuse an entry.
When this happens in sunvdc, the server side vds driver begins nack'ing the
messages and ends up resetting the ldc channel. This problem does not effect
sunvnet since it checks for < 2.

The fix here is to just never allocate the very last dring slot so that full
and empty are not the same condition. The request start path was changed to
check for the ring being full a bit earlier, and to stop the blk_queue if
there is no space left. The blk_queue will be restarted once the ring is
only half full again. The number of ring entries was increased to 512 which
matches the sunvnet and Solaris vdc drivers, and greatly reduces the
frequency of hitting the ring full condition and the associated blk_queue
stop/starting. The checks in sunvent were adjusted to account for
vio_dring_avail() returning 1 less.

Orabug: 19441666
OraBZ: 14983

Signed-off-by: Dwight Engen 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

sunvdc: limit each sg segment to a page

2014-11-21T17:22:52+00:00

[ Upstream commit 5eed69ffd248c9f68f56c710caf07db134aef28b ]

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 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

sunvdc: compute vdisk geometry from capacity

2014-11-21T17:22:52+00:00

[ Upstream commit de5b73f08468b4fc5e2f6d1505f650262622f78b ]

The LDom diskserver doesn't return reliable geometry data. In addition,
the types for all fields in the vio_disk_geom are u16, which were being
truncated in the cast into the u8's of the Linux struct hd_geometry.

Modify vdc_getgeo() to compute the geometry from the disk's capacity in a
manner consistent with xen-blkfront::blkif_getgeo().

Signed-off-by: Dwight Engen 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

sunvdc: add cdrom and v1.1 protocol support

2014-11-21T17:22:52+00:00

[ Upstream commit 9bce21828d54a95143f1b74619705c2dd8e88b92 ]

Interpret the media type from v1.1 protocol to support CDROM/DVD.

For v1.0 protocol, a disk's size continues to be calculated from the
geometry returned by the vdisk server. The geometry returned by the server
can be less than the actual number of sectors available in the backing
image/device due to the rounding in the division used to compute the
geometry in the vdisk server.

In v1.1 protocol a disk's actual size in sectors is returned during the
handshake. Use this size when v1.1 protocol is negotiated. Since this size
will always be larger than the former geometry computed size, disks created
under v1.0 will be forwards compatible to v1.1, but not vice versa.

Signed-off-by: Dwight Engen 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

sunvdc: Fix off-by-one in generic_request().

2013-02-14T19:49:01+00:00

The 'operations' bitmap corresponds one-for-one with the operation
codes, no adjustment is necessary.

Reported-by: Mark Kettenis 
Signed-off-by: David S. Miller

Drivers: block: remove __dev* attributes.

2013-01-03T23:57:15+00:00

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton 
Cc: Mike Miller 
Cc: Chirag Kantharia 
Cc: Geoff Levand 
Cc: Jim Paris 
Cc: Rusty Russell 
Cc: "Michael S. Tsirkin" 
Cc: Grant Likely 
Cc: Matthew Wilcox 
Cc: Keith Busch 
Cc: "David S. Miller" 
Cc: Benjamin Herrenschmidt 
Cc: NeilBrown 
Cc: Jens Axboe 
Cc: Tao Guo 
Signed-off-by: Greg Kroah-Hartman

powerpc+sparc/vio: Modernize driver registration

2012-03-28T00:33:24+00:00

This makes vio_register_driver() get the module owner & name at compile
time like PCI drivers do, and adds a name pointer directly in struct
vio_driver to avoid having to explicitly initialize the embedded
struct device.

Signed-off-by: Benjamin Herrenschmidt 
Acked-by: David S. Miller

block: Consolidate phys_segment and hw_segment limits

2010-02-26T12:58:08+00:00

Except for SCSI no device drivers distinguish between physical and
hardware segment limits.  Consolidate the two into a single segment
limit.

Signed-off-by: Martin K. Petersen 
Signed-off-by: Jens Axboe

block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors

2010-02-26T12:58:08+00:00

The block layer calling convention is blk_queue_.
blk_queue_max_sectors predates this practice, leading to some confusion.
Rename the function to appropriately reflect that its intended use is to
set max_hw_sectors.

Also introduce a temporary wrapper for backwards compability.  This can
be removed after the merge window is closed.

Signed-off-by: Martin K. Petersen 
Signed-off-by: Jens Axboe