Commit d5cf4b28 authored by Abhijeet Joglekar's avatar Abhijeet Joglekar Committed by James Bottomley

[SCSI] fnic: Process all cq entries per ISR

Driver was processing a fixed max number of cq descriptors per ISR. For
instance, for the SCSI IO queue, number of IOs processed per ISR were 8.
If hardware writes 9 cq descriptors to the cq and generates an interrupt,
driver would process only 8 descriptors and decrement the outstanding
credit count by 8. Unless another interrupt event happens, the hw does
not generate any additional interrupt. This results in the cq descriptor
sitting in the queue without being procesed and can cause IO timeouts
and aborts.

Modify all ISR functions to process all queued cq descriptors in one shot.
Since bulk of ELS frame processing is done in thread context and bulk
of SCSI IO processing is done in soft ISR deferred context, the cycles
spent in the ISR per cq descriptor is small.
Signed-off-by: default avatarHerman Lee <hermlee@cisco.com>
Signed-off-by: default avatarAbhijeet Joglekar <abjoglek@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 8f550f93
...@@ -48,9 +48,9 @@ static irqreturn_t fnic_isr_legacy(int irq, void *data) ...@@ -48,9 +48,9 @@ static irqreturn_t fnic_isr_legacy(int irq, void *data)
} }
if (pba & (1 << FNIC_INTX_WQ_RQ_COPYWQ)) { if (pba & (1 << FNIC_INTX_WQ_RQ_COPYWQ)) {
work_done += fnic_wq_copy_cmpl_handler(fnic, 8); work_done += fnic_wq_copy_cmpl_handler(fnic, -1);
work_done += fnic_wq_cmpl_handler(fnic, 4); work_done += fnic_wq_cmpl_handler(fnic, -1);
work_done += fnic_rq_cmpl_handler(fnic, 4); work_done += fnic_rq_cmpl_handler(fnic, -1);
vnic_intr_return_credits(&fnic->intr[FNIC_INTX_WQ_RQ_COPYWQ], vnic_intr_return_credits(&fnic->intr[FNIC_INTX_WQ_RQ_COPYWQ],
work_done, work_done,
...@@ -66,9 +66,9 @@ static irqreturn_t fnic_isr_msi(int irq, void *data) ...@@ -66,9 +66,9 @@ static irqreturn_t fnic_isr_msi(int irq, void *data)
struct fnic *fnic = data; struct fnic *fnic = data;
unsigned long work_done = 0; unsigned long work_done = 0;
work_done += fnic_wq_copy_cmpl_handler(fnic, 8); work_done += fnic_wq_copy_cmpl_handler(fnic, -1);
work_done += fnic_wq_cmpl_handler(fnic, 4); work_done += fnic_wq_cmpl_handler(fnic, -1);
work_done += fnic_rq_cmpl_handler(fnic, 4); work_done += fnic_rq_cmpl_handler(fnic, -1);
vnic_intr_return_credits(&fnic->intr[0], vnic_intr_return_credits(&fnic->intr[0],
work_done, work_done,
...@@ -83,7 +83,7 @@ static irqreturn_t fnic_isr_msix_rq(int irq, void *data) ...@@ -83,7 +83,7 @@ static irqreturn_t fnic_isr_msix_rq(int irq, void *data)
struct fnic *fnic = data; struct fnic *fnic = data;
unsigned long rq_work_done = 0; unsigned long rq_work_done = 0;
rq_work_done = fnic_rq_cmpl_handler(fnic, 4); rq_work_done = fnic_rq_cmpl_handler(fnic, -1);
vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_RQ], vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_RQ],
rq_work_done, rq_work_done,
1 /* unmask intr */, 1 /* unmask intr */,
...@@ -97,7 +97,7 @@ static irqreturn_t fnic_isr_msix_wq(int irq, void *data) ...@@ -97,7 +97,7 @@ static irqreturn_t fnic_isr_msix_wq(int irq, void *data)
struct fnic *fnic = data; struct fnic *fnic = data;
unsigned long wq_work_done = 0; unsigned long wq_work_done = 0;
wq_work_done = fnic_wq_cmpl_handler(fnic, 4); wq_work_done = fnic_wq_cmpl_handler(fnic, -1);
vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ], vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ],
wq_work_done, wq_work_done,
1 /* unmask intr */, 1 /* unmask intr */,
...@@ -110,7 +110,7 @@ static irqreturn_t fnic_isr_msix_wq_copy(int irq, void *data) ...@@ -110,7 +110,7 @@ static irqreturn_t fnic_isr_msix_wq_copy(int irq, void *data)
struct fnic *fnic = data; struct fnic *fnic = data;
unsigned long wq_copy_work_done = 0; unsigned long wq_copy_work_done = 0;
wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, 8); wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, -1);
vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ_COPY], vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ_COPY],
wq_copy_work_done, wq_copy_work_done,
1 /* unmask intr */, 1 /* unmask intr */,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment