blk-mq: add warning to __blk_mq_run_hw_queue() for ints disabled

[sfrench/cifs-2.6.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 6cef42f419a57d43ece64983915f3aefce7fefcf..a5d369dc762202822fc8b9ce9845370c9e3096fc 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -620,11 +620,10 @@ static void blk_mq_requeue_work(struct work_struct *work)
                container_of(work, struct request_queue, requeue_work.work);
        LIST_HEAD(rq_list);
        struct request *rq, *next;
-       unsigned long flags;
 
-       spin_lock_irqsave(&q->requeue_lock, flags);
+       spin_lock_irq(&q->requeue_lock);
        list_splice_init(&q->requeue_list, &rq_list);
-       spin_unlock_irqrestore(&q->requeue_lock, flags);
+       spin_unlock_irq(&q->requeue_lock);
 
        list_for_each_entry_safe(rq, next, &rq_list, queuelist) {
                if (!(rq->rq_flags & RQF_SOFTBARRIER))
@@ -1098,9 +1097,19 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)
 {
        int srcu_idx;
 
+       /*
+        * We should be running this queue from one of the CPUs that
+        * are mapped to it.
+        */
        WARN_ON(!cpumask_test_cpu(raw_smp_processor_id(), hctx->cpumask) &&
                cpu_online(hctx->next_cpu));
 
+       /*
+        * We can't run the queue inline with ints disabled. Ensure that
+        * we catch bad users of this early.
+        */
+       WARN_ON_ONCE(in_interrupt());
+
        if (!(hctx->flags & BLK_MQ_F_BLOCKING)) {
                rcu_read_lock();
                blk_mq_sched_dispatch_requests(hctx);
@@ -1547,10 +1556,8 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
 
        blk_queue_split(q, &bio);
 
-       if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
-               bio_io_error(bio);
+       if (!bio_integrity_prep(bio))
                return BLK_QC_T_NONE;
-       }
 
        if (!is_flush_fua && !blk_queue_nomerges(q) &&
            blk_attempt_plug_merge(q, bio, &request_count, &same_queue_rq))