null_blk: prevent timer handler running on a different CPU where started
authorAkinobu Mita <akinobu.mita@gmail.com>
Mon, 1 Jun 2015 23:35:09 +0000 (08:35 +0900)
committerJens Axboe <axboe@fb.com>
Tue, 2 Jun 2015 02:09:03 +0000 (20:09 -0600)
When irqmode=2 (IRQ completion handler is timer), timer handler should
be called on the same CPU where the timer has been started.

Since completion_queues are per-cpu and the completion handler only
touches completion_queue for local CPU, we need to prevent the handler
from running on a different CPU where the timer has been started.
Otherwise, the IO cannot be completed until another completion handler
is executed on that CPU.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Jens Axboe <axboe@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/block/null_blk.c

index 65cd61a4145ed2049944621c50b374cf742041ca..6f0a58e7613db5e499e70c7b5f7ffec804d429bf 100644 (file)
@@ -257,7 +257,7 @@ static void null_cmd_end_timer(struct nullb_cmd *cmd)
        if (llist_add(&cmd->ll_list, &cq->list)) {
                ktime_t kt = ktime_set(0, completion_nsec);
 
-               hrtimer_start(&cq->timer, kt, HRTIMER_MODE_REL);
+               hrtimer_start(&cq->timer, kt, HRTIMER_MODE_REL_PINNED);
        }
 
        put_cpu();