lkml.org 
[lkml]   [2018]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 06/45] blk-mq: I/O and timer unplugs are inverted in blktrace
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ilya Dryomov <idryomov@gmail.com>

    commit 587562d0c7cd6861f4f90a2eb811cccb1a376f5f upstream.

    trace_block_unplug() takes true for explicit unplugs and false for
    implicit unplugs. schedule() unplugs are implicit and should be
    reported as timer unplugs. While correct in the legacy code, this has
    been inverted in blk-mq since 4.11.

    Cc: stable@vger.kernel.org
    Fixes: bd166ef183c2 ("blk-mq-sched: add framework for MQ capable IO schedulers")
    Reviewed-by: Omar Sandoval <osandov@fb.com>
    Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    block/blk-mq.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/block/blk-mq.c
    +++ b/block/blk-mq.c
    @@ -1512,7 +1512,7 @@ void blk_mq_flush_plug_list(struct blk_p
    BUG_ON(!rq->q);
    if (rq->mq_ctx != this_ctx) {
    if (this_ctx) {
    - trace_block_unplug(this_q, depth, from_schedule);
    + trace_block_unplug(this_q, depth, !from_schedule);
    blk_mq_sched_insert_requests(this_q, this_ctx,
    &ctx_list,
    from_schedule);
    @@ -1532,7 +1532,7 @@ void blk_mq_flush_plug_list(struct blk_p
    * on 'ctx_list'. Do those.
    */
    if (this_ctx) {
    - trace_block_unplug(this_q, depth, from_schedule);
    + trace_block_unplug(this_q, depth, !from_schedule);
    blk_mq_sched_insert_requests(this_q, this_ctx, &ctx_list,
    from_schedule);
    }

    \
     
     \ /
      Last update: 2018-10-11 17:53    [W:4.243 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site