Home| summaryrefslogtreecommitdiff |
diff options
| author | Johannes Thumshirn <jthumshirn@suse.de> | 2018-07-03 11:36:14 +0200 |
|---|---|---|
| committer | Johannes Thumshirn <jthumshirn@suse.de> | 2018-07-03 11:36:19 +0200 |
| commit | f26439b3009963a997def2585766c14198f64ed1 (patch) | |
| tree | 3c71a7291351e4a671dd9574c92e518e0853cede | |
| parent | f6b4bf11e570c1f6306f9d5a5f7cfdc83cb3f32e (diff) | |
scsi: lpfc: Driver NVME load fails when CPU cnt > WQ resource
cnt (bsc#1092207).
suse-commit: e62a4303d398a5a218c8a84dc1f157f0a5031694
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 6036202076ce..aaa78229c12d 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -7742,6 +7742,40 @@ lpfc_sli4_read_config(struct lpfc_hba *phba) phba->sli4_hba.max_cfg_param.max_wq, phba->sli4_hba.max_cfg_param.max_rq); + /* + * Calculate NVME queue resources based on how + * many WQ/CQs are available. + */ + if (phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME) { + length = phba->sli4_hba.max_cfg_param.max_wq; + if (phba->sli4_hba.max_cfg_param.max_cq < + phba->sli4_hba.max_cfg_param.max_wq) + length = phba->sli4_hba.max_cfg_param.max_cq; + + /* + * Whats left after this can go toward NVME. + * The minus 6 accounts for ELS, NVME LS, MBOX + * fof plus a couple extra. When configured for + * NVMET, FCP io channel WQs are not created. + */ + length -= 6; + if (!phba->nvmet_support) + length -= phba->cfg_fcp_io_channel; + + if (phba->cfg_nvme_io_channel > length) { + lpfc_printf_log( + phba, KERN_ERR, LOG_SLI, + "2005 Reducing NVME IO channel to %d: " + "WQ %d CQ %d NVMEIO %d FCPIO %d\n", + length, + phba->sli4_hba.max_cfg_param.max_wq, + phba->sli4_hba.max_cfg_param.max_cq, + phba->cfg_nvme_io_channel, + phba->cfg_fcp_io_channel); + + phba->cfg_nvme_io_channel = length; + } + } } if (rc) |