block: remove old blk_iopoll_enabled variable

This was a debugging measure to toggle enabled/disabled
when testing. But for real production setups, it's not
safe to toggle this setting without either reloading
drivers of quiescing IO first. Neither of which the toggle
enforces.

Additionally, it makes drivers deal with the conditional
state.

Remove it completely. It's up to the driver whether iopoll
is enabled or not.

Signed-off-by: Jens Axboe <axboe@fb.com>

5 files changed, 68 insertions, 170 deletions

diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
index 1855bf51edb0..c11d24e379e2 100644
--- a/block/blk-iopoll.c
+++ b/block/blk-iopoll.c
@@ -14,9 +14,6 @@
 
 #include "blk.h"
 
-int blk_iopoll_enabled = 1;
-EXPORT_SYMBOL(blk_iopoll_enabled);
-
 static unsigned int blk_iopoll_budget __read_mostly = 256;
 
 static DEFINE_PER_CPU(struct list_head, blk_cpu_iopoll);
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 1f375051483a..a929c3c9aedc 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -873,7 +873,6 @@ static irqreturn_t be_isr_msix(int irq, void *dev_id)
         struct be_queue_info *cq;
         unsigned int num_eq_processed;
         struct be_eq_obj *pbe_eq;
-        unsigned long flags;
 
         pbe_eq = dev_id;
         eq = &pbe_eq->q;
@@ -882,31 +881,15 @@ static irqreturn_t be_isr_msix(int irq, void *dev_id)
 
         phba = pbe_eq->phba;
         num_eq_processed = 0;
-        if (blk_iopoll_enabled) {
-                while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32]
-                                        & EQE_VALID_MASK) {
-                        if (!blk_iopoll_sched_prep(&pbe_eq->iopoll))
-                                blk_iopoll_sched(&pbe_eq->iopoll);
-
-                        AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);
-                        queue_tail_inc(eq);
-                        eqe = queue_tail_node(eq);
-                        num_eq_processed++;
-                }
-        } else {
-                while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32]
-                                                & EQE_VALID_MASK) {
-                        spin_lock_irqsave(&phba->isr_lock, flags);
-                        pbe_eq->todo_cq = true;
-                        spin_unlock_irqrestore(&phba->isr_lock, flags);
-                        AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);
-                        queue_tail_inc(eq);
-                        eqe = queue_tail_node(eq);
-                        num_eq_processed++;
-                }
+        while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32]
+                                & EQE_VALID_MASK) {
+                if (!blk_iopoll_sched_prep(&pbe_eq->iopoll))
+                        blk_iopoll_sched(&pbe_eq->iopoll);
 
-                if (pbe_eq->todo_cq)
-                        queue_work(phba->wq, &pbe_eq->work_cqs);
+                AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);
+                queue_tail_inc(eq);
+                eqe = queue_tail_node(eq);
+                num_eq_processed++;
         }
 
         if (num_eq_processed)
@@ -927,7 +910,6 @@ static irqreturn_t be_isr(int irq, void *dev_id)
         struct hwi_context_memory *phwi_context;
         struct be_eq_entry *eqe = NULL;
         struct be_queue_info *eq;
-        struct be_queue_info *cq;
         struct be_queue_info *mcc;
         unsigned long flags, index;
         unsigned int num_mcceq_processed, num_ioeq_processed;
@@ -953,72 +935,40 @@ static irqreturn_t be_isr(int irq, void *dev_id)
 
         num_ioeq_processed = 0;
         num_mcceq_processed = 0;
-        if (blk_iopoll_enabled) {
-                while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32]
-                                        & EQE_VALID_MASK) {
-                        if (((eqe->dw[offsetof(struct amap_eq_entry,
-                             resource_id) / 32] &
-                             EQE_RESID_MASK) >> 16) == mcc->id) {
-                                spin_lock_irqsave(&phba->isr_lock, flags);
-                                pbe_eq->todo_mcc_cq = true;
-                                spin_unlock_irqrestore(&phba->isr_lock, flags);
-                                num_mcceq_processed++;
-                        } else {
-                                if (!blk_iopoll_sched_prep(&pbe_eq->iopoll))
-                                        blk_iopoll_sched(&pbe_eq->iopoll);
-                                num_ioeq_processed++;
-                        }
-                        AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);
-                        queue_tail_inc(eq);
-                        eqe = queue_tail_node(eq);
-                }
-                if (num_ioeq_processed || num_mcceq_processed) {
-                        if (pbe_eq->todo_mcc_cq)
-                                queue_work(phba->wq, &pbe_eq->work_cqs);
-
-                        if ((num_mcceq_processed) && (!num_ioeq_processed))
-                                hwi_ring_eq_db(phba, eq->id, 0,
-                                              (num_ioeq_processed +
-                                               num_mcceq_processed) , 1, 1);
-                        else
-                                hwi_ring_eq_db(phba, eq->id, 0,
-                                               (num_ioeq_processed +
-                                                num_mcceq_processed), 0, 1);
-
-                        return IRQ_HANDLED;
-                } else
-                        return IRQ_NONE;
-        } else {
-                cq = &phwi_context->be_cq[0];
-                while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32]
-                                                & EQE_VALID_MASK) {
-
-                        if (((eqe->dw[offsetof(struct amap_eq_entry,
-                             resource_id) / 32] &
-                             EQE_RESID_MASK) >> 16) != cq->id) {
-                                spin_lock_irqsave(&phba->isr_lock, flags);
-                                pbe_eq->todo_mcc_cq = true;
-                                spin_unlock_irqrestore(&phba->isr_lock, flags);
-                        } else {
-                                spin_lock_irqsave(&phba->isr_lock, flags);
-                                pbe_eq->todo_cq = true;
-                                spin_unlock_irqrestore(&phba->isr_lock, flags);
-                        }
-                        AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);
-                        queue_tail_inc(eq);
-                        eqe = queue_tail_node(eq);
+        while (eqe->dw[offsetof(struct amap_eq_entry, valid) / 32]
+                                & EQE_VALID_MASK) {
+                if (((eqe->dw[offsetof(struct amap_eq_entry,
+                     resource_id) / 32] &
+                     EQE_RESID_MASK) >> 16) == mcc->id) {
+                        spin_lock_irqsave(&phba->isr_lock, flags);
+                        pbe_eq->todo_mcc_cq = true;
+                        spin_unlock_irqrestore(&phba->isr_lock, flags);
+                        num_mcceq_processed++;
+                } else {
+                        if (!blk_iopoll_sched_prep(&pbe_eq->iopoll))
+                                blk_iopoll_sched(&pbe_eq->iopoll);
                         num_ioeq_processed++;
                 }
-                if (pbe_eq->todo_cq || pbe_eq->todo_mcc_cq)
+                AMAP_SET_BITS(struct amap_eq_entry, valid, eqe, 0);
+                queue_tail_inc(eq);
+                eqe = queue_tail_node(eq);
+        }
+        if (num_ioeq_processed || num_mcceq_processed) {
+                if (pbe_eq->todo_mcc_cq)
                         queue_work(phba->wq, &pbe_eq->work_cqs);
 
-                if (num_ioeq_processed) {
+                if ((num_mcceq_processed) && (!num_ioeq_processed))
                         hwi_ring_eq_db(phba, eq->id, 0,
-                                       num_ioeq_processed, 1, 1);
-                        return IRQ_HANDLED;
-                } else
-                        return IRQ_NONE;
-        }
+                                      (num_ioeq_processed +
+                                       num_mcceq_processed) , 1, 1);
+                else
+                        hwi_ring_eq_db(phba, eq->id, 0,
+                                       (num_ioeq_processed +
+                                        num_mcceq_processed), 0, 1);
+
+                return IRQ_HANDLED;
+        } else
+                return IRQ_NONE;
 }