linux.git/block, branch v3.14-rc7

blk-mq: add REQ_SYNC early

2014-03-07T15:15:28+00:00

Add REQ_SYNC early, so rq_dispatched[] in blk_mq_rq_ctx_init
is set correctly.

Signed-off-by: Shaohua Li
Signed-off-by: Jens Axboe

rt,blk,mq: Make blk_mq_cpu_notify_lock a raw spinlock

2014-03-03T16:34:10+00:00

[  365.164040] BUG: sleeping function called from invalid context at kernel/rtmutex.c:674
[  365.164041] in_atomic(): 1, irqs_disabled(): 1, pid: 26, name: migration/1
[  365.164043] no locks held by migration/1/26.
[  365.164044] irq event stamp: 6648
[  365.164056] hardirqs last  enabled at (6647): [] restore_args+0x0/0x30
[  365.164062] hardirqs last disabled at (6648): [] multi_cpu_stop+0x9d/0x120
[  365.164070] softirqs last  enabled at (0): [] copy_process.part.28+0x6fc/0x1920
[  365.164072] softirqs last disabled at (0): [<          (null)>]           (null)
[  365.164076] CPU: 1 PID: 26 Comm: migration/1 Tainted: GF           N  3.12.12-rt19-0.gcb6c4a2-rt #3
[  365.164078] Hardware name: QCI QSSC-S4R/QSSC-S4R, BIOS QSSC-S4R.QCI.01.00.S013.032920111005 03/29/2011
[  365.164091]  0000000000000001 ffff880a42ea7c30 ffffffff815367e6 ffffffff81a086c0
[  365.164099]  ffff880a42ea7c40 ffffffff8108919c ffff880a42ea7c60 ffffffff8153c24f
[  365.164107]  ffff880a42ea91f0 00000000ffffffe1 ffff880a42ea7c88 ffffffff81297ec0
[  365.164108] Call Trace:
[  365.164119]  [] try_stack_unwind+0x191/0x1a0
[  365.164127]  [] dump_trace+0x92/0x360
[  365.164133]  [] show_trace_log_lvl+0x48/0x60
[  365.164138]  [] show_stack_log_lvl+0xd8/0x1d0
[  365.164143]  [] show_stack+0x20/0x50
[  365.164153]  [] dump_stack+0x54/0x9a
[  365.164163]  [] __might_sleep+0xfc/0x140
[  365.164173]  [] rt_spin_lock+0x1f/0x70
[  365.164182]  [] blk_mq_main_cpu_notify+0x20/0x70
[  365.164191]  [] notifier_call_chain+0x4c/0x70
[  365.164201]  [] __raw_notifier_call_chain+0x9/0x10
[  365.164207]  [] cpu_notify+0x1e/0x40
[  365.164217]  [] take_cpu_down+0x22/0x40
[  365.164223]  [] multi_cpu_stop+0xd6/0x120
[  365.164229]  [] cpu_stopper_thread+0xd7/0x1e0
[  365.164235]  [] smpboot_thread_fn+0x203/0x380
[  365.164241]  [] kthread+0xc8/0xd0
[  365.164250]  [] ret_from_fork+0x7c/0xb0
[  365.164429] smpboot: CPU 1 is now offline

Signed-off-by: Mike Galbraith 
Signed-off-by: Jens Axboe

blk-mq: support partial I/O completions

2014-02-21T16:58:49+00:00

Add a new blk_mq_end_io_partial function to partially complete requests
as needed by the SCSI layer.  We do this by reusing blk_update_request
to advance the bio instead of having a simplified version of it in
the blk-mq code.

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

blk-mq: merge blk_mq_insert_request and blk_mq_run_request

2014-02-21T16:58:48+00:00

It's almost identical to blk_mq_insert_request, so fold the two into one
slightly more generic function by making the flush special case a bit
smarted.

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

blk-mq: remove blk_mq_alloc_rq

2014-02-21T16:58:47+00:00

There's only one caller, which is a straight wrapper and fits the naming
scheme of the related functions a lot better.

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

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2014-02-14T18:45:18+00:00

Pull block IO fixes from Jens Axboe:
 "Second round of updates and fixes for 3.14-rc2.  Most of this stuff
  has been queued up for a while.  The notable exception is the blk-mq
  changes, which are naturally a bit more in flux still.

  The pull request contains:

   - Two bug fixes for the new immutable vecs, causing crashes with raid
     or swap.  From Kent.

   - Various blk-mq tweaks and fixes from Christoph.  A fix for
     integrity bio's from Nic.

   - A few bcache fixes from Kent and Darrick Wong.

   - xen-blk{front,back} fixes from David Vrabel, Matt Rushton, Nicolas
     Swenson, and Roger Pau Monne.

   - Fix for a vec miscount with integrity vectors from Martin.

   - Minor annotations or fixes from Masanari Iida and Rashika Kheria.

   - Tweak to null_blk to do more normal FIFO processing of requests
     from Shlomo Pongratz.

   - Elevator switching bypass fix from Tejun.

   - Softlockup in blkdev_issue_discard() fix when !CONFIG_PREEMPT from
     me"

* 'for-linus' of git://git.kernel.dk/linux-block: (31 commits)
  block: add cond_resched() to potentially long running ioctl discard loop
  xen-blkback: init persistent_purge_work work_struct
  blk-mq: pair blk_mq_start_request / blk_mq_requeue_request
  blk-mq: dont assume rq->errors is set when returning an error from ->queue_rq
  block: Fix cloning of discard/write same bios
  block: Fix type mismatch in ssize_t_blk_mq_tag_sysfs_show
  blk-mq: rework flush sequencing logic
  null_blk: use blk_complete_request and blk_mq_complete_request
  virtio_blk: use blk_mq_complete_request
  blk-mq: rework I/O completions
  fs: Add prototype declaration to appropriate header file include/linux/bio.h
  fs: Mark function as static in fs/bio-integrity.c
  block/null_blk: Fix completion processing from LIFO to FIFO
  block: Explicitly handle discard/write same segments
  block: Fix nr_vecs for inline integrity vectors
  blk-mq: Add bio_integrity setup to blk_mq_make_request
  blk-mq: initialize sg_reserved_size
  blk-mq: handle dma_drain_size
  blk-mq: divert __blk_put_request for MQ ops
  blk-mq: support at_head inserations for blk_execute_rq
  ...

block: add cond_resched() to potentially long running ioctl discard loop

2014-02-12T16:36:37+00:00

When mkfs issues a full device discard and the device only
supports discards of a smallish size, we can loop in
blkdev_issue_discard() for a long time. If preempt isn't enabled,
this can turn into a softlock situation and the kernel will
start complaining.

Add an explicit cond_resched() at the end of the loop to avoid
that.

Cc: stable@kernel.org
Signed-off-by: Jens Axboe

blk-mq: pair blk_mq_start_request / blk_mq_requeue_request

2014-02-11T16:34:08+00:00

Make sure we have a proper pairing between starting and requeueing
requests.  Move the dma drain and REQ_END setup into blk_mq_start_request,
and make sure blk_mq_requeue_request properly undoes them, giving us
a pair of function to prepare and unprepare a request without leaving
side effects.

Together this ensures we always clean up properly after
BLK_MQ_RQ_QUEUE_BUSY returns from ->queue_rq.

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

blk-mq: dont assume rq->errors is set when returning an error from ->queue_rq

2014-02-11T16:34:07+00:00

rq->errors never has been part of the communication protocol between drivers
and the block stack and most drivers will not have initialized it.

Return -EIO to upper layers when the driver returns BLK_MQ_RQ_QUEUE_ERROR
unconditionally.  If a driver want to return a different error it can easily
do so by returning success after calling blk_mq_end_io itself.

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

block: Fix type mismatch in ssize_t_blk_mq_tag_sysfs_show

2014-02-10T17:39:53+00:00

cppcheck detected following format string mismatch.
[blk-mq-tag.c:201]: (warning) %u in format string (no. 1) requires
'unsigned int' but the argument type is 'int'.

Change "cpu" from int to unsigned int, because the cpu
never become minus value.

Signed-off-by: Masanari Iida 
Signed-off-by: Jens Axboe