linux-toradex.git/drivers/block/virtio_blk.c, branch v4.9.74

virtio_blk: fix panic in initialization error path

2017-08-11T15:49:36+00:00

[ Upstream commit 6bf6b0aa3da84a3d9126919a94c49c0fb7ee2fb3 ]

If blk_mq_init_queue() returns an error, it gets assigned to
vblk->disk->queue. Then, when we call put_disk(), we end up calling
blk_put_queue() with the ERR_PTR, causing a bad dereference. Fix it by
only assigning to vblk->disk->queue on success.

Signed-off-by: Omar Sandoval 
Reviewed-by: Jeff Moyer 
Signed-off-by: Jens Axboe 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman

virtio_blk: avoid DMA to stack for the sense buffer

2017-01-19T19:18:03+00:00

commit a14d749fcebe97ddf6af6db3d1f6ece85c9ddcb9 upstream.

Most users of BLOCK_PC requests allocate the sense buffer on the stack,
so to avoid DMA to the stack copy them to a field in the heap allocated
virtblk_req structure.  Without that any attempt at SCSI passthrough I/O,
including the SG_IO ioctl from userspace will crash the kernel.  Note that
this includes running tools like hdparm even when the host does not have
SCSI passthrough enabled.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Jens Axboe 
Signed-off-by: Greg Kroah-Hartman

virtio_blk: Delete an unnecessary initialisation in init_vq()

2016-10-30T22:21:47+00:00

The local variable "err" will be set to an appropriate value
by a following statement.
Thus omit the explicit initialisation at the beginning.

Signed-off-by: Markus Elfring 
Signed-off-by: Michael S. Tsirkin

virtio_blk: Use kmalloc_array() in init_vq()

2016-10-30T22:21:46+00:00

Multiplications for the size determination of memory allocations
indicated that array data structures should be processed.
Thus use the corresponding function "kmalloc_array".

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring 
Signed-off-by: Michael S. Tsirkin

blk-mq: remove ->map_queue

2016-09-15T14:42:03+00:00

All drivers use the default, so provide an inline version of it.  If we
ever need other queue mapping we can add an optional method back,
although supporting will also require major changes to the queue setup
code.

This provides better code generation, and better debugability as well.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Keith Busch 
Signed-off-by: Jens Axboe

virtio_blk: Fix a slient kernel panic

2016-08-09T10:42:39+00:00

We do a lot of memory allocation in function init_vq, and don't handle
the allocation failure properly. Then this function will return 0,
although initialization fails due to lacking memory. At that moment,
kernel will panic in guest machine, if virtio is used to drive disk.

To fix this bug, we should take care of allocation failure, and return
correct value to let caller know what happen.

Tested-by: Chao Fan 
Signed-off-by: Minfei Huang 
Signed-off-by: Minfei Huang 
Reviewed-by: Cornelia Huck 
Reviewed-by: Stefan Hajnoczi 
Signed-off-by: Michael S. Tsirkin

block: ensure bios return from blk_get_request are properly initialized

2016-07-20T23:38:30+00:00

blk_get_request is used for BLOCK_PC and similar passthrough requests.
Currently we always need to call blk_rq_set_block_pc or an open coded
version of it to allow appending bios using the request mapping helpers
later on, which is a somewhat awkward API.  Instead move the
initialization part of blk_rq_set_block_pc into blk_get_request, so that
we always have a safe to use request.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Jens Axboe

virtio_blk: use blk_rq_map_kern

2016-07-20T23:38:29+00:00

Similar to how SCSI and NVMe prepare passthrough requests.  This avoids
poking into request internals too much.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Jens Axboe

block: convert to device_add_disk()

2016-06-27T19:26:08+00:00

For block drivers that specify a parent device, convert them to use
device_add_disk().

This conversion was done with the following semantic patch:

    @@
    struct gendisk *disk;
    expression E;
    @@

    - disk->driverfs_dev = E;
    ...
    - add_disk(disk);
    + device_add_disk(E, disk);

    @@
    struct gendisk *disk;
    expression E1, E2;
    @@

    - disk->driverfs_dev = E1;
    ...
    E2 = disk;
    ...
    - add_disk(E2);
    + device_add_disk(E1, E2);

...plus some manual fixups for a few missed conversions.

Cc: Jens Axboe 
Cc: Keith Busch 
Cc: Michael S. Tsirkin 
Cc: David Woodhouse 
Cc: David S. Miller 
Cc: James Bottomley 
Cc: Ross Zwisler 
Cc: Konrad Rzeszutek Wilk 
Cc: Martin K. Petersen 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Johannes Thumshirn 
Signed-off-by: Dan Williams

block, drivers: add REQ_OP_FLUSH operation

2016-06-07T19:41:38+00:00

This adds a REQ_OP_FLUSH operation that is sent to request_fn
based drivers by the block layer's flush code, instead of
sending requests with the request->cmd_flags REQ_FLUSH bit set.

Signed-off-by: Mike Christie 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Hannes Reinecke 
Signed-off-by: Jens Axboe