linux.git/drivers/block, branch v4.8-rc2

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2016-08-11T21:10:23+00:00

Pull virtio/vhost fixes and cleanups from Michael Tsirkin:
 "Misc fixes and cleanups all over the place"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio/s390: deprecate old transport
  virtio/s390: keep early_put_chars
  virtio_blk: Fix a slient kernel panic
  virtio-vsock: fix include guard typo
  vhost/vsock: fix vhost virtio_vsock_pkt use-after-free
  9p/trans_virtio: use kvfree() for iov_iter_get_pages_alloc()
  virtio: fix error handling for debug builds
  virtio: fix memory leak in virtqueue_add()

rbd: nuke the 32-bit pool id check

2016-08-09T15:26:47+00:00

ceph_file_layout::pool_id is now s64.  rbd_add_get_pool_id() and
ceph_pg_poolid_by_name() both return an int, so it's bogus anyway.

Signed-off-by: Ilya Dryomov 
Reviewed-by: Alex Elder

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

rbd: destroy header_oloc in rbd_dev_release()

2016-08-08T19:41:44+00:00

Purely cosmetic at this point, as rbd doesn't use RADOS namespaces and
hence rbd_dev->header_oloc->pool_ns is always NULL.

Signed-off-by: Ilya Dryomov

block: rename bio bi_rw to bi_opf

2016-08-07T20:41:02+00:00

Since commit 63a4cc24867d, bio->bi_rw contains flags in the lower
portion and the op code in the higher portions. This means that
old code that relies on manually setting bi_rw is most likely
going to be broken. Instead of letting that brokeness linger,
rename the member, to force old and out-of-tree code to break
at compile time instead of at runtime.

No intended functional changes in this commit.

Signed-off-by: Jens Axboe

block/mm: make bdev_ops->rw_page() take a bool for read/write

2016-08-07T20:41:02+00:00

Commit abf545484d31 changed it from an 'rw' flags type to the
newer ops based interface, but now we're effectively leaking
some bdev internals to the rest of the kernel. Since we only
care about whether it's a read or a write at that level, just
pass in a bool 'is_write' parameter instead.

Then we can also move op_is_write() and friends back under
CONFIG_BLOCK protection.

Reviewed-by: Mike Christie 
Signed-off-by: Jens Axboe

mm/block: convert rw_page users to bio op use

2016-08-04T20:25:33+00:00

The rw_page users were not converted to use bio/req ops. As a result
bdev_write_page is not passing down REQ_OP_WRITE and the IOs will
be sent down as reads.

Signed-off-by: Mike Christie 
Fixes: 4e1b2d52a80d ("block, fs, drivers: remove REQ_OP compat defs and related code")

Modified by me to:

1) Drop op_flags passing into ->rw_page(), as we don't use it.
2) Make op_is_write() and friends safe to use for !CONFIG_BLOCK

Signed-off-by: Jens Axboe

loop: make do_req_filebacked more robust

2016-08-04T20:19:16+00:00

Use a switch statement to iterate over the possible operations and
error out if it's an incorrect one.

Signed-off-by: Jens Axboe

loop: don't try to use AIO for discards

2016-08-04T20:19:16+00:00

Fix a fat-fingered conversion to the req_op accessors, and also
use a switch statement to make it more obvious what is being checked.

Signed-off-by: Christoph Hellwig 
Reported-by: Dave Chinner 
Fixes: c2df40 ("drivers: use req op accessor");
Reviewed-by: Ming Lei 
Signed-off-by: Jens Axboe

nbd: fix race in ioctl

2016-08-04T20:19:16+00:00

Quentin ran into this bug:

WARNING: CPU: 64 PID: 10085 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x65/0x80
sysfs: cannot create duplicate filename '/devices/virtual/block/nbd3/pid'
Modules linked in: nbd
CPU: 64 PID: 10085 Comm: qemu-nbd Tainted: G      D         4.6.0+ #7
 0000000000000000 ffff8820330bba68 ffffffff814b8791 ffff8820330bbac8
 0000000000000000 ffff8820330bbab8 ffffffff810d04ab ffff8820330bbaa8
 0000001f00000296 0000000000017681 ffff8810380bf000 ffffffffa0001790
Call Trace:
 [] dump_stack+0x4d/0x6c
 [] __warn+0xdb/0x100
 [] warn_slowpath_fmt+0x44/0x50
 [] sysfs_warn_dup+0x65/0x80
 [] sysfs_add_file_mode_ns+0x172/0x180
 [] sysfs_create_file_ns+0x25/0x30
 [] device_create_file+0x36/0x90
 [] __nbd_ioctl+0x32d/0x9b0 [nbd]
 [] ? find_next_bit+0x18/0x20
 [] ? select_idle_sibling+0xe9/0x120
 [] ? __enqueue_entity+0x67/0x70
 [] ? enqueue_task_fair+0x630/0xe20
 [] ? resched_curr+0x36/0x70
 [] ? check_preempt_curr+0x78/0x90
 [] ? ttwu_do_wakeup+0x12/0x80
 [] ? ttwu_do_activate.constprop.86+0x61/0x70
 [] ? try_to_wake_up+0x185/0x2d0
 [] ? default_wake_function+0xd/0x10
 [] ? autoremove_wake_function+0x11/0x40
 [] nbd_ioctl+0x67/0x94 [nbd]
 [] blkdev_ioctl+0x14d/0x940
 [] ? put_pipe_info+0x22/0x60
 [] block_ioctl+0x3c/0x40
 [] do_vfs_ioctl+0x8d/0x5e0
 [] ? ____fput+0x9/0x10
 [] ? task_work_run+0x72/0x90
 [] SyS_ioctl+0x47/0x80
 [] entry_SYSCALL_64_fastpath+0x17/0x93
---[ end trace 7899b295e4f850c8 ]---

It seems fairly obvious that device_create_file() is not being protected
from being run concurrently on the same nbd.

Quentin found the following relevant commits:

1a2ad21 nbd: add locking to nbd_ioctl
90b8f28 [PATCH] end of methods switch: remove the old ones
d4430d6 [PATCH] beginning of methods conversion
08f8585 [PATCH] move block_device_operations to blkdev.h

It would seem that the race was introduced in the process of moving nbd
from BKL to unlocked ioctls.

By setting nbd->task_recv while the mutex is held, we can prevent other
processes from running concurrently (since nbd->task_recv is also checked
while the mutex is held).

Reported-and-tested-by: Quentin Casasnovas 
Cc: Markus Pargmann 
Cc: Paul Clements 
Cc: Pavel Machek 
Cc: Jens Axboe 
Cc: Al Viro 
Signed-off-by: Vegard Nossum 
Signed-off-by: Jens Axboe