From: Nilesh Javali <njavali@marvell.com>
To: <martin.petersen@oracle.com>
Cc: <linux-scsi@vger.kernel.org>,
<GR-QLogic-Storage-Upstream@marvell.com>, <loberman@redhat.com>
Subject: [PATCH v2 04/12] qla2xxx: consolidate zio threshold setting for both fcp & nvme
Date: Mon, 29 Mar 2021 01:52:21 -0700 [thread overview]
Message-ID: <20210329085229.4367-5-njavali@marvell.com> (raw)
In-Reply-To: <20210329085229.4367-1-njavali@marvell.com>
From: Quinn Tran <qutran@marvell.com>
consolidate zio threshold setting for both fcp & nvme to prevent
one protocol from clobbering the setting of the other protocol.
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
---
drivers/scsi/qla2xxx/qla_def.h | 1 -
drivers/scsi/qla2xxx/qla_os.c | 34 ++++++++++++++--------------------
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 49b42b430df4..3d09f31895e7 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -4727,7 +4727,6 @@ typedef struct scsi_qla_host {
#define FX00_CRITEMP_RECOVERY 25
#define FX00_HOST_INFO_RESEND 26
#define QPAIR_ONLINE_CHECK_NEEDED 27
-#define SET_NVME_ZIO_THRESHOLD_NEEDED 28
#define DETECT_SFP_CHANGE 29
#define N2N_LOGIN_NEEDED 30
#define IOCB_WORK_ACTIVE 31
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 074392560f3d..6563d69706ba 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -6969,28 +6969,23 @@ qla2x00_do_dpc(void *data)
mutex_unlock(&ha->mq_lock);
}
- if (test_and_clear_bit(SET_NVME_ZIO_THRESHOLD_NEEDED,
- &base_vha->dpc_flags)) {
+ if (test_and_clear_bit(SET_ZIO_THRESHOLD_NEEDED,
+ &base_vha->dpc_flags)) {
+ u16 threshold = ha->nvme_last_rptd_aen + ha->last_zio_threshold;
+
+ if (threshold > ha->orig_fw_xcb_count)
+ threshold = ha->orig_fw_xcb_count;
+
ql_log(ql_log_info, base_vha, 0xffffff,
- "nvme: SET ZIO Activity exchange threshold to %d.\n",
- ha->nvme_last_rptd_aen);
- if (qla27xx_set_zio_threshold(base_vha,
- ha->nvme_last_rptd_aen)) {
+ "SET ZIO Activity exchange threshold to %d.\n",
+ threshold);
+ if (qla27xx_set_zio_threshold(base_vha, threshold)) {
ql_log(ql_log_info, base_vha, 0xffffff,
- "nvme: Unable to SET ZIO Activity exchange threshold to %d.\n",
- ha->nvme_last_rptd_aen);
+ "Unable to SET ZIO Activity exchange threshold to %d.\n",
+ threshold);
}
}
- if (test_and_clear_bit(SET_ZIO_THRESHOLD_NEEDED,
- &base_vha->dpc_flags)) {
- ql_log(ql_log_info, base_vha, 0xffffff,
- "SET ZIO Activity exchange threshold to %d.\n",
- ha->last_zio_threshold);
- qla27xx_set_zio_threshold(base_vha,
- ha->last_zio_threshold);
- }
-
if (!IS_QLAFX00(ha))
qla2x00_do_dpc_all_vps(base_vha);
@@ -7218,14 +7213,13 @@ qla2x00_timer(struct timer_list *t)
index = atomic_read(&ha->nvme_active_aen_cnt);
if (!vha->vp_idx &&
(index != ha->nvme_last_rptd_aen) &&
- (index >= DEFAULT_ZIO_THRESHOLD) &&
ha->zio_mode == QLA_ZIO_MODE_6 &&
!ha->flags.host_shutting_down) {
+ ha->nvme_last_rptd_aen = atomic_read(&ha->nvme_active_aen_cnt);
ql_log(ql_log_info, vha, 0x3002,
"nvme: Sched: Set ZIO exchange threshold to %d.\n",
ha->nvme_last_rptd_aen);
- ha->nvme_last_rptd_aen = atomic_read(&ha->nvme_active_aen_cnt);
- set_bit(SET_NVME_ZIO_THRESHOLD_NEEDED, &vha->dpc_flags);
+ set_bit(SET_ZIO_THRESHOLD_NEEDED, &vha->dpc_flags);
start_dpc++;
}
--
2.19.0.rc0
next prev parent reply other threads:[~2021-03-29 8:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 8:52 [PATCH v2 00/12] qla2xxx driver bug fixes Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 01/12] qla2xxx: Fix IOPS drop seen in some adapters Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 02/12] qla2xxx: Add H:C:T info in the log message for fc ports Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 03/12] qla2xxx: fix stuck session Nilesh Javali
2021-03-29 14:41 ` Himanshu Madhani
2021-03-29 8:52 ` Nilesh Javali [this message]
2021-03-29 8:52 ` [PATCH v2 05/12] qla2xxx: Fix use after free in bsg Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 06/12] qla2xxx: Fix crash in qla2xxx_mqueuecommand Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 07/12] qla2xxx: fix RISC RESET completion polling Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 08/12] qla2xxx: fix crash in PCIe error handling Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 09/12] qla2xxx: fix mailbox recovery during PCIe error Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 10/12] qla2xxx: include AER debug mask to default Nilesh Javali
2021-03-29 8:52 ` [PATCH v2 11/12] qla2xxx: Do logout even if fabric scan retries got exhausted Nilesh Javali
2021-03-29 14:13 ` Himanshu Madhani
2021-03-29 8:52 ` [PATCH v2 12/12] qla2xxx: Update version to 10.02.00.106-k Nilesh Javali
2021-03-30 2:41 ` [PATCH v2 00/12] qla2xxx driver bug fixes Martin K. Petersen
2021-04-02 3:54 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210329085229.4367-5-njavali@marvell.com \
--to=njavali@marvell.com \
--cc=GR-QLogic-Storage-Upstream@marvell.com \
--cc=linux-scsi@vger.kernel.org \
--cc=loberman@redhat.com \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.