aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAbhijeet Joglekar <abjoglek@cisco.com>2009-10-21 19:28:14 -0400
committerJames Bottomley <James.Bottomley@suse.de>2009-12-04 13:00:35 -0500
commitd5cf4b28e13989ace24cf26de1e1debec18e9685 (patch)
treef1b5ad05036ef81a5ab1c16d25d6484dadb73d13 /drivers/scsi
parent8f550f937e9fdafa5c37e348e214aecec851ef3f (diff)
[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: Herman Lee <hermlee@cisco.com> Signed-off-by: Abhijeet Joglekar <abjoglek@cisco.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/fnic/fnic_isr.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c
index 2b3064828aea..5c1f223cabce 100644
--- a/drivers/scsi/fnic/fnic_isr.c
+++ b/drivers/scsi/fnic/fnic_isr.c
@@ -48,9 +48,9 @@ static irqreturn_t fnic_isr_legacy(int irq, void *data)
48 } 48 }
49 49
50 if (pba & (1 << FNIC_INTX_WQ_RQ_COPYWQ)) { 50 if (pba & (1 << FNIC_INTX_WQ_RQ_COPYWQ)) {
51 work_done += fnic_wq_copy_cmpl_handler(fnic, 8); 51 work_done += fnic_wq_copy_cmpl_handler(fnic, -1);
52 work_done += fnic_wq_cmpl_handler(fnic, 4); 52 work_done += fnic_wq_cmpl_handler(fnic, -1);
53 work_done += fnic_rq_cmpl_handler(fnic, 4); 53 work_done += fnic_rq_cmpl_handler(fnic, -1);
54 54
55 vnic_intr_return_credits(&fnic->intr[FNIC_INTX_WQ_RQ_COPYWQ], 55 vnic_intr_return_credits(&fnic->intr[FNIC_INTX_WQ_RQ_COPYWQ],
56 work_done, 56 work_done,
@@ -66,9 +66,9 @@ static irqreturn_t fnic_isr_msi(int irq, void *data)
66 struct fnic *fnic = data; 66 struct fnic *fnic = data;
67 unsigned long work_done = 0; 67 unsigned long work_done = 0;
68 68
69 work_done += fnic_wq_copy_cmpl_handler(fnic, 8); 69 work_done += fnic_wq_copy_cmpl_handler(fnic, -1);
70 work_done += fnic_wq_cmpl_handler(fnic, 4); 70 work_done += fnic_wq_cmpl_handler(fnic, -1);
71 work_done += fnic_rq_cmpl_handler(fnic, 4); 71 work_done += fnic_rq_cmpl_handler(fnic, -1);
72 72
73 vnic_intr_return_credits(&fnic->intr[0], 73 vnic_intr_return_credits(&fnic->intr[0],
74 work_done, 74 work_done,
@@ -83,7 +83,7 @@ static irqreturn_t fnic_isr_msix_rq(int irq, void *data)
83 struct fnic *fnic = data; 83 struct fnic *fnic = data;
84 unsigned long rq_work_done = 0; 84 unsigned long rq_work_done = 0;
85 85
86 rq_work_done = fnic_rq_cmpl_handler(fnic, 4); 86 rq_work_done = fnic_rq_cmpl_handler(fnic, -1);
87 vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_RQ], 87 vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_RQ],
88 rq_work_done, 88 rq_work_done,
89 1 /* unmask intr */, 89 1 /* unmask intr */,
@@ -97,7 +97,7 @@ static irqreturn_t fnic_isr_msix_wq(int irq, void *data)
97 struct fnic *fnic = data; 97 struct fnic *fnic = data;
98 unsigned long wq_work_done = 0; 98 unsigned long wq_work_done = 0;
99 99
100 wq_work_done = fnic_wq_cmpl_handler(fnic, 4); 100 wq_work_done = fnic_wq_cmpl_handler(fnic, -1);
101 vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ], 101 vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ],
102 wq_work_done, 102 wq_work_done,
103 1 /* unmask intr */, 103 1 /* unmask intr */,
@@ -110,7 +110,7 @@ static irqreturn_t fnic_isr_msix_wq_copy(int irq, void *data)
110 struct fnic *fnic = data; 110 struct fnic *fnic = data;
111 unsigned long wq_copy_work_done = 0; 111 unsigned long wq_copy_work_done = 0;
112 112
113 wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, 8); 113 wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, -1);
114 vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ_COPY], 114 vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ_COPY],
115 wq_copy_work_done, 115 wq_copy_work_done,
116 1 /* unmask intr */, 116 1 /* unmask intr */,