qla2xxx: synchronize rport dev_loss_tmo setting
Subsystems (2)
PATCH 1/1 qla2xxx: synchronize rport dev_loss_tmo setting
From: Hannes Reinecke <[email protected]>
Currently, the dev_loss_tmo setting is only ever used for SCSI devices. This patch reshuffles initialisation such that the SCSI remote ports are registered before the NVMe ones, allowing the dev_loss_tmo setting to be synchronized between SCSI and NVMe.
---
Hi,
This is a followup on
https://lore.kernel.org/linux-scsi/[email protected]/
Hannes and I started to play with this patch. After a few iterations on getting the right dev_loss_tmo variables set, it works as hoped. With this change, it's possible to use the same udev rule for qla2xxx as we currently use for lpfc driver. And it survived serious testing sessions.
Thanks,
Daniel
drivers/scsi/qla2xxx/qla_attr.c | 6 ++++++ drivers/scsi/qla2xxx/qla_init.c | 10 +++------- drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++- 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +6 -0
@@ -2648,7 +2648,13 @@ qla2x00_get_starget_port_id(struct scsi_target *starget)static inline void qla2x00_set_rport_loss_tmo (struct fc_rport *rport,uint32_t timeout) { +fc_port_t *fcport = *(fc_port_t **)rport->dd_data; + rport->dev_loss_tmo = timeout ? timeout :1 ; + +if (fcport->nvme_remote_port) +nvme_fc_set_remoteport_devloss (fcport->nvme_remote_port, + rport->dev_loss_tmo); } static void
drivers/scsi/qla2xxx/qla_init.c +3 -7
@@ -5629,13 +5629,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)qla2x00_dfs_create_rport (vha, fcport); -if (NVME_TARGET (vha->hw, fcport)) { -qla_nvme_register_remote (vha, fcport); -qla2x00_set_fcport_disc_state (fcport,DSC_LOGIN_COMPLETE ); -qla2x00_set_fcport_state (fcport,FCS_ONLINE ); -return ; - } -qla24xx_update_fcport_fcp_prio (vha, fcport);switch (vha->host->active_mode) {
@@ -5657,6 +5650,9 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)break ; } +if (NVME_TARGET (vha->hw, fcport)) +qla_nvme_register_remote (vha, fcport); +qla2x00_set_fcport_state (fcport,FCS_ONLINE );if (IS_IIDMA_CAPABLE (vha->hw) && vha->hw->flags.gpsc_supported) {
drivers/scsi/qla2xxx/qla_nvme.c +4 -1
@@ -41,7 +41,7 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) req.port_name =wwn_to_u64 (fcport->port_name); req.node_name =wwn_to_u64 (fcport->node_name); req.port_role =0 ; - req.dev_loss_tmo =0 ; + req.dev_loss_tmo = fcport->dev_loss_tmo;if (fcport->nvme_prli_service_param &NVME_PRLI_SP_INITIATOR ) req.port_role =FC_PORT_ROLE_NVME_INITIATOR ;
@@ -68,6 +68,9 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)return ret; } +nvme_fc_set_remoteport_devloss (fcport->nvme_remote_port, + fcport->dev_loss_tmo); +if (fcport->nvme_prli_service_param &NVME_PRLI_SP_SLER )ql_log (ql_log_info, vha,0x212a ,"PortID:%06x Supports SLER\n" , req.port_id);
Signature · 1 line
2.29.2
kernel test robot
build botI love your patch! Yet something to improve:
Hi Daniel,
I love your patch! Yet something to improve:
[auto build test ERROR on scsi/for-next]
[also build test ERROR on mkp-scsi/for-next v5.13-rc6 next-20210616] [cannot apply to target/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Daniel-Wagner/qla2xxx-synchronize-rport-dev_loss_tmo-setting/20210616-215100 base: https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next config: x86_64-kexec (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/76d2d6c3cf0cdcaa27d9e0fb9adbfaf5e9d20368 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Daniel-Wagner/qla2xxx-synchronize-rport-dev_loss_tmo-setting/20210616-215100 git checkout 76d2d6c3cf0cdcaa27d9e0fb9adbfaf5e9d20368 # save the attached .config to linux build tree make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "nvme_fc_set_remoteport_devloss" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org