Prepare for locking dd->lock in dd_has_write_work(). That function may be called from interrupt context. Cc: Damien Le Moal Cc: Christoph Hellwig Signed-off-by: Bart Van Assche --- block/mq-deadline.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/block/mq-deadline.c b/block/mq-deadline.c index 85806c73562a..0a46d0f06f72 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -457,7 +457,7 @@ static struct request *dd_dispatch_request(struct blk_mq_hw_ctx *hctx) struct request *rq; enum dd_prio prio; - spin_lock(&dd->lock); + spin_lock_irq(&dd->lock); if (!list_empty(&dd->dispatch)) { rq = list_first_entry(&dd->dispatch, struct request, queuelist); @@ -481,7 +481,7 @@ static struct request *dd_dispatch_request(struct blk_mq_hw_ctx *hctx) } unlock: - spin_unlock(&dd->lock); + spin_unlock_irq(&dd->lock); return rq; } @@ -527,9 +527,9 @@ static void dd_exit_sched(struct elevator_queue *e) WARN_ON_ONCE(!list_empty(&per_prio->fifo_list[DD_READ])); WARN_ON_ONCE(!list_empty(&per_prio->fifo_list[DD_WRITE])); - spin_lock(&dd->lock); + spin_lock_irq(&dd->lock); queued = dd_queued(dd, prio); - spin_unlock(&dd->lock); + spin_unlock_irq(&dd->lock); WARN_ONCE(queued != 0, "statistics for priority %d: i %u m %u d %u c %u\n", @@ -623,9 +623,9 @@ static bool dd_bio_merge(struct request_queue *q, struct bio *bio, struct request *free = NULL; bool ret; - spin_lock(&dd->lock); + spin_lock_irq(&dd->lock); ret = blk_mq_sched_try_merge(q, bio, nr_segs, &free); - spin_unlock(&dd->lock); + spin_unlock_irq(&dd->lock); if (free) blk_mq_free_request(free); @@ -696,7 +696,7 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx, struct deadline_data *dd = q->elevator->elevator_data; LIST_HEAD(free); - spin_lock(&dd->lock); + spin_lock_irq(&dd->lock); while (!list_empty(list)) { struct request *rq; @@ -704,7 +704,7 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx, list_del_init(&rq->queuelist); dd_insert_request(hctx, rq, flags, &free); } - spin_unlock(&dd->lock); + spin_unlock_irq(&dd->lock); blk_mq_free_requests(&free); } @@ -828,7 +828,7 @@ static void *deadline_##name##_fifo_start(struct seq_file *m, \ struct deadline_data *dd = q->elevator->elevator_data; \ struct dd_per_prio *per_prio = &dd->per_prio[prio]; \ \ - spin_lock(&dd->lock); \ + spin_lock_irq(&dd->lock); \ return seq_list_start(&per_prio->fifo_list[data_dir], *pos); \ } \ \ @@ -848,7 +848,7 @@ static void deadline_##name##_fifo_stop(struct seq_file *m, void *v) \ struct request_queue *q = m->private; \ struct deadline_data *dd = q->elevator->elevator_data; \ \ - spin_unlock(&dd->lock); \ + spin_unlock_irq(&dd->lock); \ } \ \ static const struct seq_operations deadline_##name##_fifo_seq_ops = { \ @@ -914,11 +914,11 @@ static int dd_queued_show(void *data, struct seq_file *m) struct deadline_data *dd = q->elevator->elevator_data; u32 rt, be, idle; - spin_lock(&dd->lock); + spin_lock_irq(&dd->lock); rt = dd_queued(dd, DD_RT_PRIO); be = dd_queued(dd, DD_BE_PRIO); idle = dd_queued(dd, DD_IDLE_PRIO); - spin_unlock(&dd->lock); + spin_unlock_irq(&dd->lock); seq_printf(m, "%u %u %u\n", rt, be, idle); @@ -942,11 +942,11 @@ static int dd_owned_by_driver_show(void *data, struct seq_file *m) struct deadline_data *dd = q->elevator->elevator_data; u32 rt, be, idle; - spin_lock(&dd->lock); + spin_lock_irq(&dd->lock); rt = dd_owned_by_driver(dd, DD_RT_PRIO); be = dd_owned_by_driver(dd, DD_BE_PRIO); idle = dd_owned_by_driver(dd, DD_IDLE_PRIO); - spin_unlock(&dd->lock); + spin_unlock_irq(&dd->lock); seq_printf(m, "%u %u %u\n", rt, be, idle); @@ -959,7 +959,7 @@ static void *deadline_dispatch_start(struct seq_file *m, loff_t *pos) struct request_queue *q = m->private; struct deadline_data *dd = q->elevator->elevator_data; - spin_lock(&dd->lock); + spin_lock_irq(&dd->lock); return seq_list_start(&dd->dispatch, *pos); } @@ -977,7 +977,7 @@ static void deadline_dispatch_stop(struct seq_file *m, void *v) struct request_queue *q = m->private; struct deadline_data *dd = q->elevator->elevator_data; - spin_unlock(&dd->lock); + spin_unlock_irq(&dd->lock); } static const struct seq_operations deadline_dispatch_seq_ops = {