Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8ba61435d73f2274e12d4d823fde06735e8f6a54

Authored by Tejun Heo
Committed by Jens Axboe
1 parent 481a7d6479
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

block: add missing blk_queue_dead() checks 

blk_insert_cloned_request(), blk_execute_rq_nowait() and
blk_flush_plug_list() either didn't check whether the queue was dead
or did it without holding queue_lock.  Update them so that dead state
is checked while holding queue_lock.

AFAICS, this plugs all holes (requeue doesn't matter as the request is
transitioning atomically from in_flight to queued).

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

Showing 2 changed files with 25 additions and 2 deletions Side-by-side Diff

... ... @@ -1731,6 +1731,10 @@
1731 1731 return -EIO;
1732 1732  
1733 1733 spin_lock_irqsave(q->queue_lock, flags);
  1734 + if (unlikely(blk_queue_dead(q))) {
  1735 + spin_unlock_irqrestore(q->queue_lock, flags);
  1736 + return -ENODEV;
  1737 + }
1734 1738  
1735 1739 /*
1736 1740 * Submitting request must be dequeued before calling this function
... ... @@ -2705,6 +2709,14 @@
2705 2709 trace_block_unplug(q, depth, !from_schedule);
2706 2710  
2707 2711 /*
  2712 + * Don't mess with dead queue.
  2713 + */
  2714 + if (unlikely(blk_queue_dead(q))) {
  2715 + spin_unlock(q->queue_lock);
  2716 + return;
  2717 + }
  2718 +
  2719 + /*
2708 2720 * If we are punting this to kblockd, then we can safely drop
2709 2721 * the queue_lock before waking kblockd (which needs to take
2710 2722 * this lock).
... ... @@ -2780,6 +2792,15 @@
2780 2792 depth = 0;
2781 2793 spin_lock(q->queue_lock);
2782 2794 }
  2795 +
  2796 + /*
  2797 + * Short-circuit if @q is dead
  2798 + */
  2799 + if (unlikely(blk_queue_dead(q))) {
  2800 + __blk_end_request_all(rq, -ENODEV);
  2801 + continue;
  2802 + }
  2803 +
2783 2804 /*
2784 2805 * rq is already accounted, so use raw insert
2785 2806 */
... ... @@ -50,7 +50,11 @@
50 50 {
51 51 int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
52 52  
  53 + WARN_ON(irqs_disabled());
  54 + spin_lock_irq(q->queue_lock);
  55 +
53 56 if (unlikely(blk_queue_dead(q))) {
  57 + spin_unlock_irq(q->queue_lock);
54 58 rq->errors = -ENXIO;
55 59 if (rq->end_io)
56 60 rq->end_io(rq, rq->errors);
... ... @@ -59,8 +63,6 @@
59 63  
60 64 rq->rq_disk = bd_disk;
61 65 rq->end_io = done;
62   - WARN_ON(irqs_disabled());
63   - spin_lock_irq(q->queue_lock);
64 66 __elv_add_request(q, rq, where);
65 67 __blk_run_queue(q);
66 68 /* the queue is stopped so it won't be run */