lkml.org 
[lkml]   [2017]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 039/133] block: Relax a check in blk_start_queue()
    3.16.51-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bart Van Assche <bart.vanassche@wdc.com>

    commit 4ddd56b003f251091a67c15ae3fe4a5c5c5e390a upstream.

    Calling blk_start_queue() from interrupt context with the queue
    lock held and without disabling IRQs, as the skd driver does, is
    safe. This patch avoids that loading the skd driver triggers the
    following warning:

    WARNING: CPU: 11 PID: 1348 at block/blk-core.c:283 blk_start_queue+0x84/0xa0
    RIP: 0010:blk_start_queue+0x84/0xa0
    Call Trace:
    skd_unquiesce_dev+0x12a/0x1d0 [skd]
    skd_complete_internal+0x1e7/0x5a0 [skd]
    skd_complete_other+0xc2/0xd0 [skd]
    skd_isr_completion_posted.isra.30+0x2a5/0x470 [skd]
    skd_isr+0x14f/0x180 [skd]
    irq_forced_thread_fn+0x2a/0x70
    irq_thread+0x144/0x1a0
    kthread+0x125/0x140
    ret_from_fork+0x2a/0x40

    Fixes: commit a038e2536472 ("[PATCH] blk_start_queue() must be called with irq disabled - add warning")
    Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Cc: Andrew Morton <akpm@osdl.org>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Hannes Reinecke <hare@suse.de>
    Cc: Johannes Thumshirn <jthumshirn@suse.de>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    block/blk-core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/block/blk-core.c
    +++ b/block/blk-core.c
    @@ -198,7 +198,7 @@ EXPORT_SYMBOL(blk_delay_queue);
    **/
    void blk_start_queue(struct request_queue *q)
    {
    - WARN_ON(!irqs_disabled());
    + WARN_ON(!in_interrupt() && !irqs_disabled());

    queue_flag_clear(QUEUE_FLAG_STOPPED, q);
    __blk_run_queue(q);
    \
     
     \ /
      Last update: 2017-11-22 03:44    [W:4.287 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site