| Message ID | 20231027180302.418676-8-kartilak@cisco.com |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce support for multiqueue (MQ) in fnic | expand |
On 10/27/23 20:02, Karan Tilak Kumar wrote: > Modify interrupt service routines for INTx, MSI, and MSI-x > to support multiqueue. > Modify parameter list of fnic_wq_copy_cmpl_handler > to take cq_index. > Modify fnic_cleanup function to use the new > function call of fnic_wq_copy_cmpl_handler. > Refactor code to set > interrupt mode to MSI-x to a new function. > Add a new stat for intx_dummy. > > Changes between v1 and v2: > Suppress warning from kernel test bot. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202310251847.4T8BVZAZ-lkp@intel.com/ > Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com> > Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com> > Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com> > --- > drivers/scsi/fnic/fnic.h | 3 +- > drivers/scsi/fnic/fnic_isr.c | 164 ++++++++++++++++++++++++--------- > drivers/scsi/fnic/fnic_main.c | 4 +- > drivers/scsi/fnic/fnic_scsi.c | 38 +++----- > drivers/scsi/fnic/fnic_stats.h | 1 + > 5 files changed, 140 insertions(+), 70 deletions(-) > > diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h > index f4390fc96323..9e104468b0d4 100644 > --- a/drivers/scsi/fnic/fnic.h > +++ b/drivers/scsi/fnic/fnic.h > @@ -343,6 +343,7 @@ extern const struct attribute_group *fnic_host_groups[]; > > void fnic_clear_intr_mode(struct fnic *fnic); > int fnic_set_intr_mode(struct fnic *fnic); > +int fnic_set_intr_mode_msix(struct fnic *fnic); > void fnic_free_intr(struct fnic *fnic); > int fnic_request_intr(struct fnic *fnic); > > @@ -369,7 +370,7 @@ void fnic_scsi_cleanup(struct fc_lport *); > void fnic_scsi_abort_io(struct fc_lport *); > void fnic_empty_scsi_cleanup(struct fc_lport *); > void fnic_exch_mgr_reset(struct fc_lport *, u32, u32); > -int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int); > +int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do, unsigned int cq_index); > int fnic_wq_cmpl_handler(struct fnic *fnic, int); > int fnic_flogi_reg_handler(struct fnic *fnic, u32); > void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq, > diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c > index dff9689023e4..82e4e3e8ec4b 100644 > --- a/drivers/scsi/fnic/fnic_isr.c > +++ b/drivers/scsi/fnic/fnic_isr.c > @@ -38,8 +38,13 @@ static irqreturn_t fnic_isr_legacy(int irq, void *data) > fnic_log_q_error(fnic); > } > > + if (pba & (1 << FNIC_INTX_DUMMY)) { > + atomic64_inc(&fnic->fnic_stats.misc_stats.intx_dummy); > + vnic_intr_return_all_credits(&fnic->intr[FNIC_INTX_DUMMY]); > + } > + > if (pba & (1 << FNIC_INTX_WQ_RQ_COPYWQ)) { > - work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions); > + work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions, FNIC_MQ_CQ_INDEX); > work_done += fnic_wq_cmpl_handler(fnic, -1); > work_done += fnic_rq_cmpl_handler(fnic, -1); > > @@ -60,7 +65,7 @@ static irqreturn_t fnic_isr_msi(int irq, void *data) > fnic->fnic_stats.misc_stats.last_isr_time = jiffies; > atomic64_inc(&fnic->fnic_stats.misc_stats.isr_count); > > - work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions); > + work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions, FNIC_MQ_CQ_INDEX); > work_done += fnic_wq_cmpl_handler(fnic, -1); > work_done += fnic_rq_cmpl_handler(fnic, -1); > > @@ -109,12 +114,22 @@ static irqreturn_t fnic_isr_msix_wq_copy(int irq, void *data) > { > struct fnic *fnic = data; > unsigned long wq_copy_work_done = 0; > + int i; > > fnic->fnic_stats.misc_stats.last_isr_time = jiffies; > atomic64_inc(&fnic->fnic_stats.misc_stats.isr_count); > > - wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, io_completions); > - vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ_COPY], > + i = irq - fnic->msix[0].irq_num; > + if (i >= fnic->wq_copy_count + fnic->cpy_wq_base || > + i < 0 || fnic->msix[i].irq_num != irq) { > + for (i = fnic->cpy_wq_base; i < fnic->wq_copy_count + fnic->cpy_wq_base ; i++) { > + if (fnic->msix[i].irq_num == irq) > + break; > + } > + } > + > + wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, io_completions, i); > + vnic_intr_return_credits(&fnic->intr[i], > wq_copy_work_done, > 1 /* unmask intr */, > 1 /* reset intr timer */); > @@ -128,7 +143,7 @@ static irqreturn_t fnic_isr_msix_err_notify(int irq, void *data) > fnic->fnic_stats.misc_stats.last_isr_time = jiffies; > atomic64_inc(&fnic->fnic_stats.misc_stats.isr_count); > > - vnic_intr_return_all_credits(&fnic->intr[FNIC_MSIX_ERR_NOTIFY]); > + vnic_intr_return_all_credits(&fnic->intr[fnic->err_intr_offset]); > fnic_log_q_error(fnic); > fnic_handle_link_event(fnic); > > @@ -186,26 +201,30 @@ int fnic_request_intr(struct fnic *fnic) > fnic->msix[FNIC_MSIX_WQ].isr = fnic_isr_msix_wq; > fnic->msix[FNIC_MSIX_WQ].devid = fnic; > > - sprintf(fnic->msix[FNIC_MSIX_WQ_COPY].devname, > - "%.11s-scsi-wq", fnic->name); > - fnic->msix[FNIC_MSIX_WQ_COPY].isr = fnic_isr_msix_wq_copy; > - fnic->msix[FNIC_MSIX_WQ_COPY].devid = fnic; > + for (i = fnic->cpy_wq_base; i < fnic->wq_copy_count + fnic->cpy_wq_base; i++) { > + sprintf(fnic->msix[i].devname, > + "%.11s-scsi-wq-%d", fnic->name, i-FNIC_MSIX_WQ_COPY); > + fnic->msix[i].isr = fnic_isr_msix_wq_copy; > + fnic->msix[i].devid = fnic; > + } > > - sprintf(fnic->msix[FNIC_MSIX_ERR_NOTIFY].devname, > + sprintf(fnic->msix[fnic->err_intr_offset].devname, > "%.11s-err-notify", fnic->name); > - fnic->msix[FNIC_MSIX_ERR_NOTIFY].isr = > + fnic->msix[fnic->err_intr_offset].isr = > fnic_isr_msix_err_notify; > - fnic->msix[FNIC_MSIX_ERR_NOTIFY].devid = fnic; > + fnic->msix[fnic->err_intr_offset].devid = fnic; > + > + for (i = 0; i < fnic->intr_count; i++) { > + fnic->msix[i].irq_num = pci_irq_vector(fnic->pdev, i); > > - for (i = 0; i < ARRAY_SIZE(fnic->msix); i++) { > - err = request_irq(pci_irq_vector(fnic->pdev, i), > - fnic->msix[i].isr, 0, > - fnic->msix[i].devname, > - fnic->msix[i].devid); > + err = request_irq(fnic->msix[i].irq_num, > + fnic->msix[i].isr, 0, > + fnic->msix[i].devname, > + fnic->msix[i].devid); > if (err) { > - shost_printk(KERN_ERR, fnic->lport->host, > - "MSIX: request_irq" > - " failed %d\n", err); > + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, > + "fnic<%d>: %s: %d request_irq failed with error: %d\n", > + fnic->fnic_num, __func__, __LINE__, err); > fnic_free_intr(fnic); > break; > } > @@ -220,44 +239,101 @@ int fnic_request_intr(struct fnic *fnic) > return err; > } > > -int fnic_set_intr_mode(struct fnic *fnic) > +int fnic_set_intr_mode_msix(struct fnic *fnic) > { > unsigned int n = ARRAY_SIZE(fnic->rq); > unsigned int m = ARRAY_SIZE(fnic->wq); > unsigned int o = ARRAY_SIZE(fnic->hw_copy_wq); > + unsigned int min_irqs = n + m + 1 + 1; /*rq, raw wq, wq, err*/ > > /* > - * Set interrupt mode (INTx, MSI, MSI-X) depending > - * system capabilities. > - * > - * Try MSI-X first > - * > * We need n RQs, m WQs, o Copy WQs, n+m+o CQs, and n+m+o+1 INTRs > * (last INTR is used for WQ/RQ errors and notification area) > */ > - if (fnic->rq_count >= n && > - fnic->raw_wq_count >= m && > - fnic->wq_copy_count >= o && > - fnic->cq_count >= n + m + o) { > - int vecs = n + m + o + 1; > - > - if (pci_alloc_irq_vectors(fnic->pdev, vecs, vecs, > - PCI_IRQ_MSIX) == vecs) { > + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, > + "fnic<%d>: %s: %d: rq-array size: %d wq-array size: %d copy-wq array size: %d\n", > + fnic->fnic_num, __func__, __LINE__, n, m, o); > + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, > + "fnic<%d>: %s: %d: rq_count: %d raw_wq_count: %d wq_copy_count: %d cq_count: %d\n", > + fnic->fnic_num, __func__, __LINE__, fnic->rq_count, fnic->raw_wq_count, > + fnic->wq_copy_count, fnic->cq_count); > + > + if (fnic->rq_count <= n && fnic->raw_wq_count <= m && > + fnic->wq_copy_count <= o) { > + int vec_count = 0; > + int vecs = fnic->rq_count + fnic->raw_wq_count + fnic->wq_copy_count + 1; > + > + vec_count = pci_alloc_irq_vectors(fnic->pdev, min_irqs, vecs, > + PCI_IRQ_MSIX | PCI_IRQ_AFFINITY); > + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, > + "fnic<%d>: %s: %d: allocated %d MSI-X vectors\n", > + fnic->fnic_num, __func__, __LINE__, vec_count); > + > + if (vec_count > 0) { > + if (vec_count < vecs) { > + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, > + "fnic<%d>: %s: %d: interrupts number mismatch: vec_count: %d vecs: %d\n", > + fnic->fnic_num, __func__, __LINE__, vec_count, vecs); > + if (vec_count < min_irqs) { > + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, > + "fnic<%d>: %s: %d: no interrupts for copy wq\n", > + fnic->fnic_num, __func__, __LINE__); > + return 1; > + } > + } > + > fnic->rq_count = n; > fnic->raw_wq_count = m; > - fnic->wq_copy_count = o; > - fnic->wq_count = m + o; > - fnic->cq_count = n + m + o; > - fnic->intr_count = vecs; > - fnic->err_intr_offset = FNIC_MSIX_ERR_NOTIFY; > - > - FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host, > - "Using MSI-X Interrupts\n"); > - vnic_dev_set_intr_mode(fnic->vdev, > - VNIC_DEV_INTR_MODE_MSIX); > + fnic->cpy_wq_base = fnic->rq_count + fnic->raw_wq_count; > + fnic->wq_copy_count = vec_count - n - m - 1; > + fnic->wq_count = fnic->raw_wq_count + fnic->wq_copy_count; > + if (fnic->cq_count != vec_count - 1) { > + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, > + "fnic<%d>: %s: %d: CQ count: %d does not match MSI-X vector count: %d\n", > + fnic->fnic_num, __func__, __LINE__, fnic->cq_count, vec_count); > + fnic->cq_count = vec_count - 1; > + } > + fnic->intr_count = vec_count; > + fnic->err_intr_offset = fnic->rq_count + fnic->wq_count; > + > + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, > + "fnic<%d>: %s: %d: rq_count: %d raw_wq_count: %d cpy_wq_base: %d\n", > + fnic->fnic_num, __func__, __LINE__, fnic->rq_count, > + fnic->raw_wq_count, fnic->cpy_wq_base); > + > + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, > + "fnic<%d>: %s: %d: wq_copy_count: %d wq_count: %d cq_count: %d\n", > + fnic->fnic_num, __func__, __LINE__, fnic->wq_copy_count, > + fnic->wq_count, fnic->cq_count); > + > + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, > + "fnic<%d>: %s: %d: intr_count: %d err_intr_offset: %u", > + fnic->fnic_num, __func__, __LINE__, fnic->intr_count, > + fnic->err_intr_offset); > + > + vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_MSIX); > + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, > + "fnic<%d>: %s: %d: fnic using MSI-X\n", fnic->fnic_num, > + __func__, __LINE__); > return 0; > } > } > + return 1; > +} //fnic_set_intr_mode_msix Please avoid C99 style comments. [ .. ] Otherwise: Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On Thursday, November 2, 2023 12:46 AM, Hannes Reinecke <hare@suse.de> wrote: > > Please avoid C99 style comments. Sure, I'll make suitable changes in v3. Regards, Karan
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index f4390fc96323..9e104468b0d4 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -343,6 +343,7 @@ extern const struct attribute_group *fnic_host_groups[]; void fnic_clear_intr_mode(struct fnic *fnic); int fnic_set_intr_mode(struct fnic *fnic); +int fnic_set_intr_mode_msix(struct fnic *fnic); void fnic_free_intr(struct fnic *fnic); int fnic_request_intr(struct fnic *fnic); @@ -369,7 +370,7 @@ void fnic_scsi_cleanup(struct fc_lport *); void fnic_scsi_abort_io(struct fc_lport *); void fnic_empty_scsi_cleanup(struct fc_lport *); void fnic_exch_mgr_reset(struct fc_lport *, u32, u32); -int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int); +int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do, unsigned int cq_index); int fnic_wq_cmpl_handler(struct fnic *fnic, int); int fnic_flogi_reg_handler(struct fnic *fnic, u32); void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq, diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c index dff9689023e4..82e4e3e8ec4b 100644 --- a/drivers/scsi/fnic/fnic_isr.c +++ b/drivers/scsi/fnic/fnic_isr.c @@ -38,8 +38,13 @@ static irqreturn_t fnic_isr_legacy(int irq, void *data) fnic_log_q_error(fnic); } + if (pba & (1 << FNIC_INTX_DUMMY)) { + atomic64_inc(&fnic->fnic_stats.misc_stats.intx_dummy); + vnic_intr_return_all_credits(&fnic->intr[FNIC_INTX_DUMMY]); + } + if (pba & (1 << FNIC_INTX_WQ_RQ_COPYWQ)) { - work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions); + work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions, FNIC_MQ_CQ_INDEX); work_done += fnic_wq_cmpl_handler(fnic, -1); work_done += fnic_rq_cmpl_handler(fnic, -1); @@ -60,7 +65,7 @@ static irqreturn_t fnic_isr_msi(int irq, void *data) fnic->fnic_stats.misc_stats.last_isr_time = jiffies; atomic64_inc(&fnic->fnic_stats.misc_stats.isr_count); - work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions); + work_done += fnic_wq_copy_cmpl_handler(fnic, io_completions, FNIC_MQ_CQ_INDEX); work_done += fnic_wq_cmpl_handler(fnic, -1); work_done += fnic_rq_cmpl_handler(fnic, -1); @@ -109,12 +114,22 @@ static irqreturn_t fnic_isr_msix_wq_copy(int irq, void *data) { struct fnic *fnic = data; unsigned long wq_copy_work_done = 0; + int i; fnic->fnic_stats.misc_stats.last_isr_time = jiffies; atomic64_inc(&fnic->fnic_stats.misc_stats.isr_count); - wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, io_completions); - vnic_intr_return_credits(&fnic->intr[FNIC_MSIX_WQ_COPY], + i = irq - fnic->msix[0].irq_num; + if (i >= fnic->wq_copy_count + fnic->cpy_wq_base || + i < 0 || fnic->msix[i].irq_num != irq) { + for (i = fnic->cpy_wq_base; i < fnic->wq_copy_count + fnic->cpy_wq_base ; i++) { + if (fnic->msix[i].irq_num == irq) + break; + } + } + + wq_copy_work_done = fnic_wq_copy_cmpl_handler(fnic, io_completions, i); + vnic_intr_return_credits(&fnic->intr[i], wq_copy_work_done, 1 /* unmask intr */, 1 /* reset intr timer */); @@ -128,7 +143,7 @@ static irqreturn_t fnic_isr_msix_err_notify(int irq, void *data) fnic->fnic_stats.misc_stats.last_isr_time = jiffies; atomic64_inc(&fnic->fnic_stats.misc_stats.isr_count); - vnic_intr_return_all_credits(&fnic->intr[FNIC_MSIX_ERR_NOTIFY]); + vnic_intr_return_all_credits(&fnic->intr[fnic->err_intr_offset]); fnic_log_q_error(fnic); fnic_handle_link_event(fnic); @@ -186,26 +201,30 @@ int fnic_request_intr(struct fnic *fnic) fnic->msix[FNIC_MSIX_WQ].isr = fnic_isr_msix_wq; fnic->msix[FNIC_MSIX_WQ].devid = fnic; - sprintf(fnic->msix[FNIC_MSIX_WQ_COPY].devname, - "%.11s-scsi-wq", fnic->name); - fnic->msix[FNIC_MSIX_WQ_COPY].isr = fnic_isr_msix_wq_copy; - fnic->msix[FNIC_MSIX_WQ_COPY].devid = fnic; + for (i = fnic->cpy_wq_base; i < fnic->wq_copy_count + fnic->cpy_wq_base; i++) { + sprintf(fnic->msix[i].devname, + "%.11s-scsi-wq-%d", fnic->name, i-FNIC_MSIX_WQ_COPY); + fnic->msix[i].isr = fnic_isr_msix_wq_copy; + fnic->msix[i].devid = fnic; + } - sprintf(fnic->msix[FNIC_MSIX_ERR_NOTIFY].devname, + sprintf(fnic->msix[fnic->err_intr_offset].devname, "%.11s-err-notify", fnic->name); - fnic->msix[FNIC_MSIX_ERR_NOTIFY].isr = + fnic->msix[fnic->err_intr_offset].isr = fnic_isr_msix_err_notify; - fnic->msix[FNIC_MSIX_ERR_NOTIFY].devid = fnic; + fnic->msix[fnic->err_intr_offset].devid = fnic; + + for (i = 0; i < fnic->intr_count; i++) { + fnic->msix[i].irq_num = pci_irq_vector(fnic->pdev, i); - for (i = 0; i < ARRAY_SIZE(fnic->msix); i++) { - err = request_irq(pci_irq_vector(fnic->pdev, i), - fnic->msix[i].isr, 0, - fnic->msix[i].devname, - fnic->msix[i].devid); + err = request_irq(fnic->msix[i].irq_num, + fnic->msix[i].isr, 0, + fnic->msix[i].devname, + fnic->msix[i].devid); if (err) { - shost_printk(KERN_ERR, fnic->lport->host, - "MSIX: request_irq" - " failed %d\n", err); + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, + "fnic<%d>: %s: %d request_irq failed with error: %d\n", + fnic->fnic_num, __func__, __LINE__, err); fnic_free_intr(fnic); break; } @@ -220,44 +239,101 @@ int fnic_request_intr(struct fnic *fnic) return err; } -int fnic_set_intr_mode(struct fnic *fnic) +int fnic_set_intr_mode_msix(struct fnic *fnic) { unsigned int n = ARRAY_SIZE(fnic->rq); unsigned int m = ARRAY_SIZE(fnic->wq); unsigned int o = ARRAY_SIZE(fnic->hw_copy_wq); + unsigned int min_irqs = n + m + 1 + 1; /*rq, raw wq, wq, err*/ /* - * Set interrupt mode (INTx, MSI, MSI-X) depending - * system capabilities. - * - * Try MSI-X first - * * We need n RQs, m WQs, o Copy WQs, n+m+o CQs, and n+m+o+1 INTRs * (last INTR is used for WQ/RQ errors and notification area) */ - if (fnic->rq_count >= n && - fnic->raw_wq_count >= m && - fnic->wq_copy_count >= o && - fnic->cq_count >= n + m + o) { - int vecs = n + m + o + 1; - - if (pci_alloc_irq_vectors(fnic->pdev, vecs, vecs, - PCI_IRQ_MSIX) == vecs) { + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, + "fnic<%d>: %s: %d: rq-array size: %d wq-array size: %d copy-wq array size: %d\n", + fnic->fnic_num, __func__, __LINE__, n, m, o); + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, + "fnic<%d>: %s: %d: rq_count: %d raw_wq_count: %d wq_copy_count: %d cq_count: %d\n", + fnic->fnic_num, __func__, __LINE__, fnic->rq_count, fnic->raw_wq_count, + fnic->wq_copy_count, fnic->cq_count); + + if (fnic->rq_count <= n && fnic->raw_wq_count <= m && + fnic->wq_copy_count <= o) { + int vec_count = 0; + int vecs = fnic->rq_count + fnic->raw_wq_count + fnic->wq_copy_count + 1; + + vec_count = pci_alloc_irq_vectors(fnic->pdev, min_irqs, vecs, + PCI_IRQ_MSIX | PCI_IRQ_AFFINITY); + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, + "fnic<%d>: %s: %d: allocated %d MSI-X vectors\n", + fnic->fnic_num, __func__, __LINE__, vec_count); + + if (vec_count > 0) { + if (vec_count < vecs) { + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, + "fnic<%d>: %s: %d: interrupts number mismatch: vec_count: %d vecs: %d\n", + fnic->fnic_num, __func__, __LINE__, vec_count, vecs); + if (vec_count < min_irqs) { + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, + "fnic<%d>: %s: %d: no interrupts for copy wq\n", + fnic->fnic_num, __func__, __LINE__); + return 1; + } + } + fnic->rq_count = n; fnic->raw_wq_count = m; - fnic->wq_copy_count = o; - fnic->wq_count = m + o; - fnic->cq_count = n + m + o; - fnic->intr_count = vecs; - fnic->err_intr_offset = FNIC_MSIX_ERR_NOTIFY; - - FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host, - "Using MSI-X Interrupts\n"); - vnic_dev_set_intr_mode(fnic->vdev, - VNIC_DEV_INTR_MODE_MSIX); + fnic->cpy_wq_base = fnic->rq_count + fnic->raw_wq_count; + fnic->wq_copy_count = vec_count - n - m - 1; + fnic->wq_count = fnic->raw_wq_count + fnic->wq_copy_count; + if (fnic->cq_count != vec_count - 1) { + FNIC_ISR_DBG(KERN_ERR, fnic->lport->host, + "fnic<%d>: %s: %d: CQ count: %d does not match MSI-X vector count: %d\n", + fnic->fnic_num, __func__, __LINE__, fnic->cq_count, vec_count); + fnic->cq_count = vec_count - 1; + } + fnic->intr_count = vec_count; + fnic->err_intr_offset = fnic->rq_count + fnic->wq_count; + + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, + "fnic<%d>: %s: %d: rq_count: %d raw_wq_count: %d cpy_wq_base: %d\n", + fnic->fnic_num, __func__, __LINE__, fnic->rq_count, + fnic->raw_wq_count, fnic->cpy_wq_base); + + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, + "fnic<%d>: %s: %d: wq_copy_count: %d wq_count: %d cq_count: %d\n", + fnic->fnic_num, __func__, __LINE__, fnic->wq_copy_count, + fnic->wq_count, fnic->cq_count); + + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, + "fnic<%d>: %s: %d: intr_count: %d err_intr_offset: %u", + fnic->fnic_num, __func__, __LINE__, fnic->intr_count, + fnic->err_intr_offset); + + vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_MSIX); + FNIC_ISR_DBG(KERN_INFO, fnic->lport->host, + "fnic<%d>: %s: %d: fnic using MSI-X\n", fnic->fnic_num, + __func__, __LINE__); return 0; } } + return 1; +} //fnic_set_intr_mode_msix + +int fnic_set_intr_mode(struct fnic *fnic) +{ + int ret_status = 0; + + /* + * Set interrupt mode (INTx, MSI, MSI-X) depending + * system capabilities. + * + * Try MSI-X first + */ + ret_status = fnic_set_intr_mode_msix(fnic); + if (ret_status == 0) + return ret_status; /* * Next try MSI diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 887e3e168579..66e85754c1d6 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -478,6 +478,7 @@ static int fnic_cleanup(struct fnic *fnic) { unsigned int i; int err; + int raw_wq_rq_counts; vnic_dev_disable(fnic->vdev); for (i = 0; i < fnic->intr_count; i++) @@ -497,10 +498,11 @@ static int fnic_cleanup(struct fnic *fnic) err = vnic_wq_copy_disable(&fnic->hw_copy_wq[i]); if (err) return err; + raw_wq_rq_counts = fnic->raw_wq_count + fnic->rq_count; + fnic_wq_copy_cmpl_handler(fnic, -1, i + raw_wq_rq_counts); } /* Clean up completed IOs and FCS frames */ - fnic_wq_copy_cmpl_handler(fnic, io_completions); fnic_wq_cmpl_handler(fnic, -1); fnic_rq_cmpl_handler(fnic, -1); diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 3498a8d670b1..f32781f8fdd0 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -1303,10 +1303,8 @@ static int fnic_fcpio_cmpl_handler(struct vnic_dev *vdev, * fnic_wq_copy_cmpl_handler * Routine to process wq copy */ -int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do) +int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do, unsigned int cq_index) { - unsigned int wq_work_done = 0; - unsigned int i, cq_index; unsigned int cur_work_done; struct misc_stats *misc_stats = &fnic->fnic_stats.misc_stats; u64 start_jiffies = 0; @@ -1314,28 +1312,20 @@ int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do) u64 delta_jiffies = 0; u64 delta_ms = 0; - for (i = 0; i < fnic->wq_copy_count; i++) { - cq_index = i + fnic->raw_wq_count + fnic->rq_count; - - start_jiffies = jiffies; - cur_work_done = vnic_cq_copy_service(&fnic->cq[cq_index], - fnic_fcpio_cmpl_handler, - copy_work_to_do); - end_jiffies = jiffies; - - wq_work_done += cur_work_done; - delta_jiffies = end_jiffies - start_jiffies; - if (delta_jiffies > - (u64) atomic64_read(&misc_stats->max_isr_jiffies)) { - atomic64_set(&misc_stats->max_isr_jiffies, - delta_jiffies); - delta_ms = jiffies_to_msecs(delta_jiffies); - atomic64_set(&misc_stats->max_isr_time_ms, delta_ms); - atomic64_set(&misc_stats->corr_work_done, - cur_work_done); - } + start_jiffies = jiffies; + cur_work_done = vnic_cq_copy_service(&fnic->cq[cq_index], + fnic_fcpio_cmpl_handler, + copy_work_to_do); + end_jiffies = jiffies; + delta_jiffies = end_jiffies - start_jiffies; + if (delta_jiffies > (u64) atomic64_read(&misc_stats->max_isr_jiffies)) { + atomic64_set(&misc_stats->max_isr_jiffies, delta_jiffies); + delta_ms = jiffies_to_msecs(delta_jiffies); + atomic64_set(&misc_stats->max_isr_time_ms, delta_ms); + atomic64_set(&misc_stats->corr_work_done, cur_work_done); } - return wq_work_done; + + return cur_work_done; } static bool fnic_cleanup_io_iter(struct scsi_cmnd *sc, void *data) diff --git a/drivers/scsi/fnic/fnic_stats.h b/drivers/scsi/fnic/fnic_stats.h index bdf639eef8cf..07d1556e3c32 100644 --- a/drivers/scsi/fnic/fnic_stats.h +++ b/drivers/scsi/fnic/fnic_stats.h @@ -103,6 +103,7 @@ struct misc_stats { atomic64_t rport_not_ready; atomic64_t frame_errors; atomic64_t current_port_speed; + atomic64_t intx_dummy; }; struct fnic_stats {
Modify interrupt service routines for INTx, MSI, and MSI-x to support multiqueue. Modify parameter list of fnic_wq_copy_cmpl_handler to take cq_index. Modify fnic_cleanup function to use the new function call of fnic_wq_copy_cmpl_handler. Refactor code to set interrupt mode to MSI-x to a new function. Add a new stat for intx_dummy. Changes between v1 and v2: Suppress warning from kernel test bot. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202310251847.4T8BVZAZ-lkp@intel.com/ Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com> Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com> Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com> --- drivers/scsi/fnic/fnic.h | 3 +- drivers/scsi/fnic/fnic_isr.c | 164 ++++++++++++++++++++++++--------- drivers/scsi/fnic/fnic_main.c | 4 +- drivers/scsi/fnic/fnic_scsi.c | 38 +++----- drivers/scsi/fnic/fnic_stats.h | 1 + 5 files changed, 140 insertions(+), 70 deletions(-)