qla2xxx misc. bug fixes
Subsystems (2)
Nilesh Javali
maintainerv2 cover qla2xxx misc. bug fixes
Martin,
Please apply the qla2xxx driver miscellaneous bug fixes to the scsi tree at your earliest convenience.
v2:
- Fix smatch warn, val_is_in_range() warn: always true condition '(val <= 4294967295) => (0-u32max <= u32max)'
- Fix smatch warn, qla24xx_get_flash_version() warn: missing error code? 'ret'
Thanks,
Nilesh
Manish Rangankar (1):
qla2xxx: During vport delete send async logout explicitly
Nilesh Javali (2):
qla2xxx: validate nvme_local_port correctly
qla2xxx: Update version to 10.02.09.300-k
Quinn Tran (4):
qla2xxx: unable to act on RSCN for port online
qla2xxx: Fix flash read failure
qla2xxx: Reduce fabric scan duplicate code
qla2xxx: Use QP lock to search for bsg
Saurav Kashyap (1):
qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Shreyas Deodhar (3):
qla2xxx: Fix for possible memory corruption
qla2xxx: complete command early within lock
qla2xxx: Fix optrom version displayed in FDMI
drivers/scsi/qla2xxx/qla_bsg.c | 98 +++--- drivers/scsi/qla2xxx/qla_def.h | 17 +- drivers/scsi/qla2xxx/qla_gbl.h | 6 +- drivers/scsi/qla2xxx/qla_gs.c | 467 +++++++++++++---------------- drivers/scsi/qla2xxx/qla_init.c | 92 ++++-- drivers/scsi/qla2xxx/qla_inline.h | 8 + drivers/scsi/qla2xxx/qla_mid.c | 2 +- drivers/scsi/qla2xxx/qla_nvme.c | 5 +- drivers/scsi/qla2xxx/qla_os.c | 19 +- drivers/scsi/qla2xxx/qla_sup.c | 108 +++++-- drivers/scsi/qla2xxx/qla_version.h | 4 +- 11 files changed, 452 insertions(+), 374 deletions(-)
base-commit: e8a1d87b7983b461d1d625e2973cdaadc0bd8ff5
Signature · 1 line
2.23.1
Nilesh Javali
maintainerPATCH v2 1/11 qla2xxx: unable to act on RSCN for port online
From: Quinn Tran <[email protected]>
The device does not come online when the target port is online. There were multiple RSCNs indicating multiple devices were affected. Driver is in the process of finishing a fabric scan. A new RSCN (device up) arrived at the tail end of the last fabric scan. Driver mistaken the new RSCN is being taken care of by the previous fabric scan, where this notification is cleared and not act on. The laser needs to be blinked again to get the device to show up.
To prevent driver from accidentally clearing the RSCN notification, each RSCN is given a generation value. A fabric scan will scan for that generation(s). Any new RSCN arrive after the scan start will have a new generation value. This will trigger another scan to get latest data. The RSCN notification flag will be cleared when the scan is associate to that generation.
---
v2:
- Fix smatch warn, val_is_in_range() warn: always true condition '(val <= 4294967295) => (0-u32max <= u32max)'
drivers/scsi/qla2xxx/qla_def.h | 3 +++ drivers/scsi/qla2xxx/qla_gs.c | 33 ++++++++++++++++++++++++++++--- drivers/scsi/qla2xxx/qla_init.c | 24 +++++++++++++++++----- drivers/scsi/qla2xxx/qla_inline.h | 8 ++++++++ 4 files changed, 60 insertions(+), 8 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +3 -0
@@ -3312,6 +3312,8 @@ struct fab_scan_rp {struct fab_scan {struct fab_scan_rp *l;u32 size; +u32 rscn_gen_start; +u32 rscn_gen_end;u16 scan_retry;#define MAX_SCAN_RETRIES 5enum scan_flags_t scan_flags;
@@ -5030,6 +5032,7 @@ typedef struct scsi_qla_host {/* Counter to detect races between ELS and RSCN events */ atomic_t generation_tick; +atomic_t rscn_gen;/* Time when global fcport update has been scheduled */ int total_fcport_update_gen;/* List of pending LOGOs, protected by tgt_mutex */
drivers/scsi/qla2xxx/qla_gs.c +30 -3
@@ -3168,6 +3168,29 @@ static int qla2x00_is_a_vp(scsi_qla_host_t *vha, u64 wwn)return rc; } +static bool qla_ok_to_clear_rscn (scsi_qla_host_t *vha,fc_port_t *fcport) +{ +u32 rscn_gen; + + rscn_gen =atomic_read (&vha->rscn_gen); +ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0x2017 , +"%s %d %8phC rscn_gen %x start %x end %x current %x\n" , + __func__, __LINE__, fcport->port_name, fcport->rscn_gen, + vha->scan.rscn_gen_start, vha->scan.rscn_gen_end, rscn_gen); + +if (val_is_in_range (fcport->rscn_gen, vha->scan.rscn_gen_start, + vha->scan.rscn_gen_end)) +/* rscn came in before fabric scan */ +return true; + +if (val_is_in_range (fcport->rscn_gen, vha->scan.rscn_gen_end, rscn_gen)) +/* rscn came in after fabric scan */ +return false; + +/* rare: fcport's scan_needed + rscn_gen must be stale */ +return true; +} +void qla24xx_async_gnnft_done (scsi_qla_host_t *vha,srb_t *sp) {fc_port_t *fcport;
@@ -3281,10 +3304,10 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) (fcport->scan_needed && fcport->port_type != FCT_INITIATOR && fcport->port_type != FCT_NVME_INITIATOR)) { + fcport->scan_needed =0 ;qlt_schedule_sess_for_deletion (fcport); } fcport->d_id.b24 = rp->id.b24; - fcport->scan_needed =0 ;break ; }
@@ -3325,7 +3348,9 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) do_delete = true; } - fcport->scan_needed =0 ; +if (qla_ok_to_clear_rscn (vha, fcport)) + fcport->scan_needed =0 ; + if (((qla_dual_mode_enabled(vha) || qla_ini_mode_enabled(vha)) && atomic_read(&fcport->state) == FCS_ONLINE) ||
@@ -3355,7 +3380,9 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) fcport->port_name, fcport->loop_id, fcport->login_retry); } - fcport->scan_needed =0 ; + +if (qla_ok_to_clear_rscn (vha, fcport)) + fcport->scan_needed =0 ;qla24xx_fcport_handle_login (vha, fcport); } }
drivers/scsi/qla2xxx/qla_init.c +19 -5
@@ -1842,10 +1842,18 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *vha, port_id_t *id,return qla2x00_post_work (vha, e); } +static void qla_rscn_gen_tick (scsi_qla_host_t *vha,u32 *ret_rscn_gen) +{ + *ret_rscn_gen =atomic_inc_return (&vha->rscn_gen); +/* memory barrier */ +wmb (); +} +void qla2x00_handle_rscn (scsi_qla_host_t *vha,struct event_arg *ea) {fc_port_t *fcport;unsigned long flags; +u32 rscn_gen;switch (ea->id.b.rsvd_1) {case RSCN_PORT_ADDR :
@@ -1875,15 +1883,16 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea)* Otherwise we're already in the middle of a relogin */ fcport->scan_needed =1 ; - fcport->rscn_gen++; +qla_rscn_gen_tick (vha, &fcport->rscn_gen); } }else { fcport->scan_needed =1 ; - fcport->rscn_gen++; +qla_rscn_gen_tick (vha, &fcport->rscn_gen); } }break ;case RSCN_AREA_ADDR : +qla_rscn_gen_tick (vha, &rscn_gen);list_for_each_entry (fcport, &vha->vp_fcports, list) {if (fcport->flags &FCF_FCP2_DEVICE &&atomic_read (&fcport->state) ==FCS_ONLINE )
@@ -1891,11 +1900,12 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea)if ((ea->id.b24 &0xffff00 ) == (fcport->d_id.b24 &0xffff00 )) { fcport->scan_needed =1 ; - fcport->rscn_gen++; + fcport->rscn_gen = rscn_gen; } }break ;case RSCN_DOM_ADDR : +qla_rscn_gen_tick (vha, &rscn_gen);list_for_each_entry (fcport, &vha->vp_fcports, list) {if (fcport->flags &FCF_FCP2_DEVICE &&atomic_read (&fcport->state) ==FCS_ONLINE )
@@ -1903,19 +1913,20 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea)if ((ea->id.b24 &0xff0000 ) == (fcport->d_id.b24 &0xff0000 )) { fcport->scan_needed =1 ; - fcport->rscn_gen++; + fcport->rscn_gen = rscn_gen; } }break ;case RSCN_FAB_ADDR :default : +qla_rscn_gen_tick (vha, &rscn_gen);list_for_each_entry (fcport, &vha->vp_fcports, list) {if (fcport->flags &FCF_FCP2_DEVICE &&atomic_read (&fcport->state) ==FCS_ONLINE )continue ; fcport->scan_needed =1 ; - fcport->rscn_gen++; + fcport->rscn_gen = rscn_gen; }break ; }
@@ -1924,6 +1935,7 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea)if (vha->scan.scan_flags ==0 ) {ql_dbg (ql_dbg_disc, vha,0xffff ,"%s: schedule\n" , __func__); vha->scan.scan_flags |=SF_QUEUED ; + vha->scan.rscn_gen_start =atomic_read (&vha->rscn_gen);schedule_delayed_work (&vha->scan.scan_work,5 ); }spin_unlock_irqrestore (&vha->work_lock, flags);
@@ -6393,6 +6405,8 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)qlt_do_generation_tick (vha, &discovery_gen);if (USE_ASYNC_SCAN (ha)) { +/* start of scan begins here */ + vha->scan.rscn_gen_end =atomic_read (&vha->rscn_gen); rval =qla24xx_async_gpnft (vha,FC4_TYPE_FCP_SCSI ,NULL );if (rval)
drivers/scsi/qla2xxx/qla_inline.h +8 -0
@@ -631,3 +631,11 @@ static inline int qla_mapq_alloc_qp_cpu_map(struct qla_hw_data *ha) }return 0 ; } + +static inline bool val_is_in_range (u32 val,u32 start,u32 end) +{ +if (val >= start && val <= end) +return true; +else +return false; +}
Signature · 1 line
2.23.1
Nilesh Javali
maintainerPATCH v2 2/11 qla2xxx: validate nvme_local_port correctly
In reply to Nilesh JavaliThe driver load failed with error message,
qla2xxx [0000:04:00.0]-ffff:0: register_localport failed: ret=ffffffef
and with a kernel crash,
BUG: unable to handle kernel NULL pointer dereference at 0000000000000070 Workqueue: events_unbound qla_register_fcport_fn [qla2xxx] RIP: 0010:nvme_fc_register_remoteport+0x16/0x430 [nvme_fc] RSP: 0018:ffffaaa040eb3d98 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff9dfb46b78c00 RCX: 0000000000000000 RDX: ffff9dfb46b78da8 RSI: ffffaaa040eb3e08 RDI: 0000000000000000 RBP: ffff9dfb612a0a58 R08: ffffffffaf1d6270 R09: 3a34303a30303030 R10: 34303a303030305b R11: 2078787832616c71 R12: ffff9dfb46b78dd4 R13: ffff9dfb46b78c24 R14: ffff9dfb41525300 R15: ffff9dfb46b78da8 FS: 0000000000000000(0000) GS:ffff9dfc67c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000070 CR3: 000000018da10004 CR4: 00000000000206f0 Call Trace: qla_nvme_register_remote+0xeb/0x1f0 [qla2xxx] ? qla2x00_dfs_create_rport+0x231/0x270 [qla2xxx] qla2x00_update_fcport+0x2a1/0x3c0 [qla2xxx] qla_register_fcport_fn+0x54/0xc0 [qla2xxx]
Exit the qla_nvme_register_remote function when qla_nvme_register_hba fails and correctly validate nvme_local_port.
--- drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_nvme.c +4 -1
@@ -49,7 +49,10 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)return 0 ; } -if (!vha->nvme_local_port &&qla_nvme_register_hba (vha)) +if (qla_nvme_register_hba (vha)) +return 0 ; + +if (!vha->nvme_local_port)return 0 ; if (!(fcport->nvme_prli_service_param &
Signature · 1 line
2.23.1
Re: [PATCH v2 02/11] qla2xxx: validate nvme_local_port correctly
Quoted 40 lines · Nilesh Javali
The driver load failed with error message,
qla2xxx [0000:04:00.0]-ffff:0:
register_localportfailed: ret=ffffffefand with a kernel crash,
BUG: unable to handle kernel NULL pointer dereference at 0000000000000070 Workqueue: events_unbound qla_register_fcport_fn [qla2xxx] RIP: 0010:nvme_fc_register_remoteport+0x16/0x430 [nvme_fc] RSP: 0018:ffffaaa040eb3d98 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff9dfb46b78c00 RCX: 0000000000000000 RDX: ffff9dfb46b78da8 RSI: ffffaaa040eb3e08 RDI: 0000000000000000 RBP: ffff9dfb612a0a58 R08: ffffffffaf1d6270 R09: 3a34303a30303030 R10: 34303a303030305b R11: 2078787832616c71 R12: ffff9dfb46b78dd4 R13: ffff9dfb46b78c24 R14: ffff9dfb41525300 R15: ffff9dfb46b78da8 FS: 0000000000000000(0000) GS:ffff9dfc67c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000070 CR3: 000000018da10004 CR4: 00000000000206f0 Call Trace: qla_nvme_register_remote+0xeb/0x1f0 [qla2xxx] ? qla2x00_dfs_create_rport+0x231/0x270 [qla2xxx] qla2x00_update_fcport+0x2a1/0x3c0 [qla2xxx] qla_register_fcport_fn+0x54/0xc0 [qla2xxx]Exit the
qla_nvme_register_remotefunction whenqla_nvme_register_hbafails and correctly validatenvme_local_port.Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/scsi/qla2xxx/qla_nvme.c +0
-0@@ -49,7 +49,10 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)return 0 ;
drivers/scsi/qla2xxx/qla_nvme.c int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) · line 58
Quoted 10 lines
drivers/scsi/qla2xxx/qla_nvme.c +4
-1} -if (!vha->nvme_local_port &&qla_nvme_register_hba (vha)) +if (qla_nvme_register_hba (vha)) +return 0 ; + +if (!vha->nvme_local_port)return 0 ; if (!(fcport->nvme_prli_service_param &
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 3/11 qla2xxx: Fix for possible memory corruption
In reply to Nilesh JavaliFrom: Shreyas Deodhar <[email protected]>
Init Control Block is dereferenced incorrectly.
Correctly dereference ICB
--- drivers/scsi/qla2xxx/qla_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_os.c +1 -1
@@ -4689,7 +4689,7 @@ static void qla2x00_number_of_exch(scsi_qla_host_t *vha, u32 *ret_cnt, u16 max_cnt) {u32 temp; -struct init_cb_81xx *icb = (struct init_cb_81xx *)&vha->hw->init_cb; +struct init_cb_81xx *icb = (struct init_cb_81xx *)vha->hw->init_cb; *ret_cnt =FW_DEF_EXCHANGES_CNT ;if (max_cnt > vha->hw->max_exchg)
Signature · 1 line
2.23.1
Re: [PATCH v2 03/11] qla2xxx: Fix for possible memory corruption
Quoted 17 lines · Nilesh Javali
From: Shreyas Deodhar <[email protected]>
Init Control Block is dereferenced incorrectly.
Correctly dereference ICBSigned-off-by Shreyas Deodhar<[email protected]>Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/scsi/qla2xxx/qla_os.c +0
-0
drivers/scsi/qla2xxx/qla_os.c static void · line 4695
Quoted 8 lines
drivers/scsi/qla2xxx/qla_os.c +1
-1@@ -4689,7 +4689,7 @@ static void qla2x00_number_of_exch(scsi_qla_host_t *vha, u32 *ret_cnt, u16 max_cnt) {u32 temp; -struct init_cb_81xx *icb = (struct init_cb_81xx *)&vha->hw->init_cb; +struct init_cb_81xx *icb = (struct init_cb_81xx *)vha->hw->init_cb; *ret_cnt =FW_DEF_EXCHANGES_CNT ;if (max_cnt > vha->hw->max_exchg)
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 4/11 qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
In reply to Nilesh JavaliFrom: Saurav Kashyap <[email protected]>
Firmware only supports single DSDs in ELS Pass-through IOCB (0x53h), sg cnt is decided by the SCSI ML. User is not aware of the cause of an acutal error.
Return the appropriate return code that will be decoded by API and application and proper error message will be displayed to user.
--- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_bsg.c +1 -1
@@ -324,7 +324,7 @@ qla2x00_process_els(struct bsg_job *bsg_job)"request_sg_cnt=%x reply_sg_cnt=%x.\n" , bsg_job->request_payload.sg_cnt, bsg_job->reply_payload.sg_cnt); - rval = -EPERM ; + rval = -ENOBUFS ; goto done; }
Signature · 1 line
2.23.1
Re: [PATCH v2 04/11] qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Quoted 23 lines · Nilesh Javali
From: Saurav Kashyap <[email protected]>
Firmware only supports single DSDs in ELS Pass-through IOCB (0x53h), sg cnt is decided by the SCSI ML. User is not aware of the cause of an acutal error.
Return the appropriate return code that will be decoded by API and application and proper error message will be displayed to user.
Fixes 6e98016ca077 ("[SCSI] qla2xxx: Re-organized BSG interface specific code.")Signed-off-by Saurav Kashyap <[email protected]>Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/scsi/qla2xxx/qla_bsg.c +0
-0
drivers/scsi/qla2xxx/qla_bsg.c qla2x00_process_els(struct bsg_job *bsg_job) · line 330
Quoted 8 lines
drivers/scsi/qla2xxx/qla_bsg.c +1
-1@@ -324,7 +324,7 @@ qla2x00_process_els(struct bsg_job *bsg_job)"request_sg_cnt=%x reply_sg_cnt=%x.\n" , bsg_job->request_payload.sg_cnt, bsg_job->reply_payload.sg_cnt); - rval = -EPERM ; + rval = -ENOBUFS ; goto done; }
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 5/11 qla2xxx: Fix flash read failure
In reply to Nilesh JavaliFrom: Quinn Tran <[email protected]>
Link up failure is observed as a result of flash read failure. Current code does not check flash read return code where it relies on FW checksum to detect the problem.
Add check of flash read failure to detect the problem sooner.
---
v2:
- Fix smatch warn, qla24xx_get_flash_version() warn: missing error code? 'ret'
drivers/scsi/qla2xxx/qla_init.c | 63 +++++++++++++++---- drivers/scsi/qla2xxx/qla_sup.c | 108 ++++++++++++++++++++++---------- 2 files changed, 125 insertions(+), 46 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +50 -13
@@ -8221,15 +8221,21 @@ qla28xx_get_aux_images(struct qla27xx_image_status pri_aux_image_status, sec_aux_image_status;bool valid_pri_image = false, valid_sec_image = false;bool active_pri_image = false, active_sec_image = false; +int rc;if (!ha->flt_region_aux_img_status_pri) {ql_dbg (ql_dbg_init, vha,0x018a ,"Primary aux image not addressed\n" ); goto check_sec_image; } -qla24xx_read_flash_data (vha, (uint32_t *)&pri_aux_image_status, + rc =qla24xx_read_flash_data (vha, (uint32_t *)&pri_aux_image_status, ha->flt_region_aux_img_status_pri,sizeof (pri_aux_image_status) >>2 ); +if (rc) { +ql_log (ql_log_info, vha,0x01a1 , +"Unable to read Primary aux image(%x).\n" , rc); + goto check_sec_image; + }qla27xx_print_image (vha,"Primary aux image" , &pri_aux_image_status);if (qla28xx_check_aux_image_status_signature (&pri_aux_image_status)) {
@@ -8260,9 +8266,15 @@ qla28xx_get_aux_images( goto check_valid_image; } -qla24xx_read_flash_data (vha, (uint32_t *)&sec_aux_image_status, + rc =qla24xx_read_flash_data (vha, (uint32_t *)&sec_aux_image_status, ha->flt_region_aux_img_status_sec,sizeof (sec_aux_image_status) >>2 ); +if (rc) { +ql_log (ql_log_info, vha,0x01a2 , +"Unable to read Secondary aux image(%x).\n" , rc); + goto check_valid_image; + } +qla27xx_print_image (vha,"Secondary aux image" , &sec_aux_image_status);if (qla28xx_check_aux_image_status_signature (&sec_aux_image_status)) {
@@ -8320,6 +8332,7 @@ qla27xx_get_active_image(struct scsi_qla_host *vha,struct qla27xx_image_status pri_image_status, sec_image_status;bool valid_pri_image = false, valid_sec_image = false;bool active_pri_image = false, active_sec_image = false; +int rc;if (!ha->flt_region_img_status_pri) {ql_dbg (ql_dbg_init, vha,0x018a ,"Primary image not addressed\n" );
@@ -8361,8 +8374,14 @@ qla27xx_get_active_image(struct scsi_qla_host *vha, goto check_valid_image; } -qla24xx_read_flash_data (vha, (uint32_t *)(&sec_image_status), + rc =qla24xx_read_flash_data (vha, (uint32_t *)(&sec_image_status), ha->flt_region_img_status_sec,sizeof (sec_image_status) >>2 ); +if (rc) { +ql_log (ql_log_info, vha,0x01a3 , +"Unable to read Secondary image status(%x).\n" , rc); + goto check_valid_image; + } +qla27xx_print_image (vha,"Secondary image" , &sec_image_status);if (qla27xx_check_image_status_signature (&sec_image_status)) {
@@ -8434,11 +8453,10 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, "FW: Loading firmware from flash (%x).\n", faddr); dcode = (uint32_t *)req->ring; -qla24xx_read_flash_data (vha, dcode, faddr,8 ); -if (qla24xx_risc_firmware_invalid (dcode)) { + rval =qla24xx_read_flash_data (vha, dcode, faddr,8 ); +if (rval ||qla24xx_risc_firmware_invalid (dcode)) {ql_log (ql_log_fatal, vha,0x008c , -"Unable to verify the integrity of flash firmware " -"image.\n" ); +"Unable to verify the integrity of flash firmware image (rval %x).\n" , rval);ql_log (ql_log_fatal, vha,0x008d ,"Firmware data: %08x %08x %08x %08x.\n" , dcode[0 ], dcode[1 ], dcode[2 ], dcode[3 ]);
@@ -8452,7 +8470,12 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,for (j =0 ; j < segments; j++) {ql_dbg (ql_dbg_init, vha,0x008d ,"-> Loading segment %u...\n" , j); -qla24xx_read_flash_data (vha, dcode, faddr,10 ); + rval =qla24xx_read_flash_data (vha, dcode, faddr,10 ); +if (rval) { +ql_log (ql_log_fatal, vha,0x016a , +"-> Unable to read segment addr + size .\n" ); +return QLA_FUNCTION_FAILED ; + } risc_addr =be32_to_cpu ((__force __be32 )dcode[2 ]); risc_size =be32_to_cpu ((__force __be32 )dcode[3 ]);if (!*srisc_addr) {
@@ -8468,7 +8491,13 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,ql_dbg (ql_dbg_init, vha,0x008e ,"-> Loading fragment %u: %#x <- %#x (%#lx dwords)...\n" , fragment, risc_addr, faddr, dlen); -qla24xx_read_flash_data (vha, dcode, faddr, dlen); + rval =qla24xx_read_flash_data (vha, dcode, faddr, dlen); +if (rval) { +ql_log (ql_log_fatal, vha,0x016b , +"-> Unable to read fragment(faddr %#x dlen %#lx).\n" , + faddr, dlen); +return QLA_FUNCTION_FAILED ; + }for (i =0 ; i < dlen; i++) dcode[i] =swab32 (dcode[i]);
@@ -8497,7 +8526,14 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, fwdt->length =0 ; dcode = (uint32_t *)req->ring; -qla24xx_read_flash_data (vha, dcode, faddr,7 ); + + rval =qla24xx_read_flash_data (vha, dcode, faddr,7 ); +if (rval) { +ql_log (ql_log_fatal, vha,0x016c , +"-> Unable to read template size.\n" ); + goto failed; + } + risc_size =be32_to_cpu ((__force __be32 )dcode[2 ]); ql_dbg(ql_dbg_init, vha, 0x0161, "-> fwdt%u template array at %#x (%#x dwords)\n",
@@ -8523,11 +8559,12 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, } dcode = fwdt->template; -qla24xx_read_flash_data (vha, dcode, faddr, risc_size); + rval =qla24xx_read_flash_data (vha, dcode, faddr, risc_size); -if (!qla27xx_fwdt_template_valid (dcode)) { +if (rval || !qla27xx_fwdt_template_valid (dcode)) {ql_log (ql_log_warn, vha,0x0165 , -"-> fwdt%u failed template validate\n" , j); +"-> fwdt%u failed template validate (rval %x)\n" , + j, rval); goto failed; }
drivers/scsi/qla2xxx/qla_sup.c +75 -33
188 lines not on this page · raw message
Signature · 1 line
2.23.1
Nilesh Javali
maintainerPATCH v2 6/11 qla2xxx: complete command early within lock
In reply to Nilesh JavaliFrom: Shreyas Deodhar <[email protected]>
A crash was observed while performing NPIV and FW reset,
BUG: kernel NULL pointer dereference, address: 000000000000001c #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 1 PREEMPT_RT SMP NOPTI RIP: 0010:dma_direct_unmap_sg+0x51/0x1e0 RSP: 0018:ffffc90026f47b88 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000021 RCX: 0000000000000002 RDX: 0000000000000021 RSI: 0000000000000000 RDI: ffff8881041130d0 RBP: ffff8881041130d0 R08: 0000000000000000 R09: 0000000000000034 R10: ffffc90026f47c48 R11: 0000000000000031 R12: 0000000000000000 R13: 0000000000000000 R14: ffff8881565e4a20 R15: 0000000000000000 FS: 00007f4c69ed3d00(0000) GS:ffff889faac80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000001c CR3: 0000000288a50002 CR4: 00000000007706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> ? __die_body+0x1a/0x60 ? page_fault_oops+0x16f/0x4a0 ? do_user_addr_fault+0x174/0x7f0 ? exc_page_fault+0x69/0x1a0 ? asm_exc_page_fault+0x22/0x30 ? dma_direct_unmap_sg+0x51/0x1e0 ? preempt_count_sub+0x96/0xe0 qla2xxx_qpair_sp_free_dma+0x29f/0x3b0 [qla2xxx] qla2xxx_qpair_sp_compl+0x60/0x80 [qla2xxx] __qla2x00_abort_all_cmds+0xa2/0x450 [qla2xxx]
The command completion was done early while aborting the commands in driver unload path but outside lock to avoid the WARN_ON condition of performing dma_free_attr within the lock. However this caused race condition while command completion via multiple paths causing system crash.
Hence complete the command early in unload path but within the lock to avoid race condition.
--- drivers/scsi/qla2xxx/qla_os.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +0 -5
@@ -1875,14 +1875,9 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)for (cnt =1 ; cnt < req->num_outstanding_cmds; cnt++) { sp = req->outstanding_cmds[cnt];if (sp) { -/* -* perform lockless completion during driver unload -*/ if (qla2x00_chip_is_down (vha)) { req->outstanding_cmds[cnt] =NULL ; -spin_unlock_irqrestore (qp->qp_lock_ptr, flags); sp->done (sp, res); -spin_lock_irqsave (qp->qp_lock_ptr, flags);continue ; }
Signature · 1 line
2.23.1
Re: [PATCH v2 06/11] qla2xxx: complete command early within lock
Quoted 62 lines · Nilesh Javali
From: Shreyas Deodhar <[email protected]>
A crash was observed while performing NPIV and FW reset,
BUG: kernel NULL pointer dereference, address: 000000000000001c #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 1 PREEMPT_RT SMP NOPTI RIP: 0010:dma_direct_unmap_sg+0x51/0x1e0 RSP: 0018:ffffc90026f47b88 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000021 RCX: 0000000000000002 RDX: 0000000000000021 RSI: 0000000000000000 RDI: ffff8881041130d0 RBP: ffff8881041130d0 R08: 0000000000000000 R09: 0000000000000034 R10: ffffc90026f47c48 R11: 0000000000000031 R12: 0000000000000000 R13: 0000000000000000 R14: ffff8881565e4a20 R15: 0000000000000000 FS: 00007f4c69ed3d00(0000) GS:ffff889faac80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000001c CR3: 0000000288a50002 CR4: 00000000007706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> ? __die_body+0x1a/0x60 ? page_fault_oops+0x16f/0x4a0 ? do_user_addr_fault+0x174/0x7f0 ? exc_page_fault+0x69/0x1a0 ? asm_exc_page_fault+0x22/0x30 ? dma_direct_unmap_sg+0x51/0x1e0 ? preempt_count_sub+0x96/0xe0 qla2xxx_qpair_sp_free_dma+0x29f/0x3b0 [qla2xxx] qla2xxx_qpair_sp_compl+0x60/0x80 [qla2xxx] __qla2x00_abort_all_cmds+0xa2/0x450 [qla2xxx]The command completion was done early while aborting the commands in driver unload path but outside lock to avoid the
WARN_ONcondition of performingdma_free_attrwithin the lock. However this caused race condition while command completion via multiple paths causing system crash.Hence complete the command early in unload path but within the lock to avoid race condition.
Fixes 0367076b0817 ("scsi: qla2xxx: Perform lockless command completion in abort path")Signed-off-by Shreyas Deodhar <[email protected]>Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_os.c | 5 ----- 1 file changed, 5 deletions(-)drivers/scsi/qla2xxx/qla_os.c +0
-1@@ -1875,14 +1875,9 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)for (cnt =1 ; cnt < req->num_outstanding_cmds; cnt++) { sp = req->outstanding_cmds[cnt];if (sp) { -/*
drivers/scsi/qla2xxx/qla_os.c __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res) · line 1883
Quoted 10 lines
drivers/scsi/qla2xxx/qla_os.c +0
-4-* perform lockless completion during driver unload -*/ if (qla2x00_chip_is_down (vha)) { req->outstanding_cmds[cnt] =NULL ; -spin_unlock_irqrestore (qp->qp_lock_ptr, flags); sp->done (sp, res); -spin_lock_irqsave (qp->qp_lock_ptr, flags);continue ; }
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 7/11 qla2xxx: During vport delete send async logout explicitly
In reply to Nilesh JavaliFrom: Manish Rangankar <[email protected]>
During vport delete, it is observed that during unload we hit a crash because of stale entries in outstanding command array. For all these stale I/O entries, eh_abort was issued and aborted (fast_fail_io = 2009h) but I/Os could not complete while vport delete is in process of deleting.
BUG: kernel NULL pointer dereference, address: 000000000000001c #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI Workqueue: qla2xxx_wq qla_do_work [qla2xxx] RIP: 0010:dma_direct_unmap_sg+0x51/0x1e0 RSP: 0018:ffffa1e1e150fc68 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000021 RCX: 0000000000000001 RDX: 0000000000000021 RSI: 0000000000000000 RDI: ffff8ce208a7a0d0 RBP: ffff8ce208a7a0d0 R08: 0000000000000000 R09: ffff8ce378aac9c8 R10: ffff8ce378aac8a0 R11: ffffa1e1e150f9d8 R12: 0000000000000000 R13: 0000000000000000 R14: ffff8ce378aac9c8 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8d217f000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000001c CR3: 0000002089acc000 CR4: 0000000000350ee0 Call Trace: <TASK> qla2xxx_qpair_sp_free_dma+0x417/0x4e0 ? qla2xxx_qpair_sp_compl+0x10d/0x1a0 ? qla2x00_status_entry+0x768/0x2830 ? newidle_balance+0x2f0/0x430 ? dequeue_entity+0x100/0x3c0 ? qla24xx_process_response_queue+0x6a1/0x19e0 ? __schedule+0x2d5/0x1140 ? qla_do_work+0x47/0x60 ? process_one_work+0x267/0x440 ? process_one_work+0x440/0x440 ? worker_thread+0x2d/0x3d0 ? process_one_work+0x440/0x440 ? kthread+0x156/0x180 ? set_kthread_struct+0x50/0x50 ? ret_from_fork+0x22/0x30 </TASK>
Send out async logout explicitly for all the ports during vport delete.
--- drivers/scsi/qla2xxx/qla_mid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_mid.c +1 -1
@@ -180,7 +180,7 @@ qla24xx_disable_vp(scsi_qla_host_t *vha)atomic_set (&vha->loop_state,LOOP_DOWN );atomic_set (&vha->loop_down_timer,LOOP_DOWN_TIME );list_for_each_entry (fcport, &vha->vp_fcports, list) - fcport->logout_on_delete =0 ; + fcport->logout_on_delete =1 ;if (!vha->hw->flags.edif_enabled)qla2x00_wait_for_sess_deletion (vha);
Signature · 1 line
2.23.1
Re: [PATCH v2 07/11] qla2xxx: During vport delete send async logout explicitly
Quoted 58 lines · Nilesh Javali
From: Manish Rangankar <[email protected]>
During vport delete, it is observed that during unload we hit a crash because of stale entries in outstanding command array. For all these stale I/O entries,
eh_abortwas issued and aborted (fast_fail_io= 2009h) but I/Os could not complete while vport delete is in process of deleting.BUG: kernel NULL pointer dereference, address: 000000000000001c #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI Workqueue: qla2xxx_wq qla_do_work [qla2xxx] RIP: 0010:dma_direct_unmap_sg+0x51/0x1e0 RSP: 0018:ffffa1e1e150fc68 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000021 RCX: 0000000000000001 RDX: 0000000000000021 RSI: 0000000000000000 RDI: ffff8ce208a7a0d0 RBP: ffff8ce208a7a0d0 R08: 0000000000000000 R09: ffff8ce378aac9c8 R10: ffff8ce378aac8a0 R11: ffffa1e1e150f9d8 R12: 0000000000000000 R13: 0000000000000000 R14: ffff8ce378aac9c8 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8d217f000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000000001c CR3: 0000002089acc000 CR4: 0000000000350ee0 Call Trace: <TASK> qla2xxx_qpair_sp_free_dma+0x417/0x4e0 ? qla2xxx_qpair_sp_compl+0x10d/0x1a0 ? qla2x00_status_entry+0x768/0x2830 ? newidle_balance+0x2f0/0x430 ? dequeue_entity+0x100/0x3c0 ? qla24xx_process_response_queue+0x6a1/0x19e0 ? __schedule+0x2d5/0x1140 ? qla_do_work+0x47/0x60 ? process_one_work+0x267/0x440 ? process_one_work+0x440/0x440 ? worker_thread+0x2d/0x3d0 ? process_one_work+0x440/0x440 ? kthread+0x156/0x180 ? set_kthread_struct+0x50/0x50 ? ret_from_fork+0x22/0x30 </TASK>Send out async logout explicitly for all the ports during vport delete.
Signed-off-by Manish Rangankar <[email protected]>Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_mid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/scsi/qla2xxx/qla_mid.c +0
-0
drivers/scsi/qla2xxx/qla_mid.c qla24xx_disable_vp(scsi_qla_host_t *vha) · line 186
Quoted 8 lines
drivers/scsi/qla2xxx/qla_mid.c +1
-1@@ -180,7 +180,7 @@ qla24xx_disable_vp(scsi_qla_host_t *vha)atomic_set (&vha->loop_state,LOOP_DOWN );atomic_set (&vha->loop_down_timer,LOOP_DOWN_TIME );list_for_each_entry (fcport, &vha->vp_fcports, list) - fcport->logout_on_delete =0 ; + fcport->logout_on_delete =1 ;if (!vha->hw->flags.edif_enabled)qla2x00_wait_for_sess_deletion (vha);
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 8/11 qla2xxx: Fix optrom version displayed in FDMI
In reply to Nilesh JavaliFrom: Shreyas Deodhar <[email protected]>
Bios version was popluated for FDMI response. Systems with EFI would show optrom version as 0.
EFI version is populated here and BIOS version is already displayed under FDMI_HBA_BOOT_BIOS_NAME.
--- drivers/scsi/qla2xxx/qla_gs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_gs.c +1 -1
@@ -1710,7 +1710,7 @@ qla2x00_hba_attributes(scsi_qla_host_t *vha, void *entries, eiter->type =cpu_to_be16 (FDMI_HBA_OPTION_ROM_VERSION ); alen =scnprintf ( eiter->a.orom_version,sizeof (eiter->a.orom_version), -"%d.%02d" , ha->bios_revision[1 ], ha->bios_revision[0 ]); +"%d.%02d" , ha->efi_revision[1 ], ha->efi_revision[0 ]); alen +=FDMI_ATTR_ALIGNMENT (alen); alen +=FDMI_ATTR_TYPELEN (eiter); eiter->len =cpu_to_be16 (alen);
Signature · 1 line
2.23.1
Re: [PATCH v2 08/11] qla2xxx: Fix optrom version displayed in FDMI
Quoted 19 lines · Nilesh Javali
From: Shreyas Deodhar <[email protected]>
Bios version was popluated for FDMI response. Systems with EFI would show optrom version as 0.
EFI version is populated here and BIOS version is already displayed underFDMI_HBA_BOOT_BIOS_NAME.Signed-off-by Shreyas Deodhar<[email protected]>Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_gs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/scsi/qla2xxx/qla_gs.c +0
-0
drivers/scsi/qla2xxx/qla_gs.c qla2x00_hba_attributes(scsi_qla_host_t *vha, void *entries, · line 1716
Quoted 8 lines
drivers/scsi/qla2xxx/qla_gs.c +1
-1@@ -1710,7 +1710,7 @@ qla2x00_hba_attributes(scsi_qla_host_t *vha, void *entries, eiter->type =cpu_to_be16 (FDMI_HBA_OPTION_ROM_VERSION ); alen =scnprintf ( eiter->a.orom_version,sizeof (eiter->a.orom_version), -"%d.%02d" , ha->bios_revision[1 ], ha->bios_revision[0 ]); +"%d.%02d" , ha->efi_revision[1 ], ha->efi_revision[0 ]); alen +=FDMI_ATTR_ALIGNMENT (alen); alen +=FDMI_ATTR_TYPELEN (eiter); eiter->len =cpu_to_be16 (alen);
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 9/11 qla2xxx: Reduce fabric scan duplicate code
In reply to Nilesh JavaliFrom: Quinn Tran <[email protected]>
For fabric scan, current code uses switch scan opcode and flags as the method to iterate through different commands to carry out the process. This makes it hard to read. This patch convert those opcode and flags into steps. In addition, this help reduce some duplicate code.
Consolidate routines that handle GPNFT & GNNFT.
--- drivers/scsi/qla2xxx/qla_def.h | 14 +- drivers/scsi/qla2xxx/qla_gbl.h | 6 +- drivers/scsi/qla2xxx/qla_gs.c | 432 +++++++++++++------------------- drivers/scsi/qla2xxx/qla_init.c | 5 +- drivers/scsi/qla2xxx/qla_os.c | 12 +- 5 files changed, 200 insertions(+), 269 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +11 -3
@@ -3309,11 +3309,20 @@ struct fab_scan_rp {u8 node_name[8 ]; }; +enum scan_step { +FAB_SCAN_START , +FAB_SCAN_GPNFT_FCP , +FAB_SCAN_GNNFT_FCP , +FAB_SCAN_GPNFT_NVME , +FAB_SCAN_GNNFT_NVME , +}; +struct fab_scan {struct fab_scan_rp *l;u32 size;u32 rscn_gen_start;u32 rscn_gen_end; +enum scan_step step;u16 scan_retry;#define MAX_SCAN_RETRIES 5enum scan_flags_t scan_flags;
@@ -3539,9 +3548,8 @@ enum qla_work_type {QLA_EVT_RELOGIN ,QLA_EVT_ASYNC_PRLO ,QLA_EVT_ASYNC_PRLO_DONE , -QLA_EVT_GPNFT , -QLA_EVT_GPNFT_DONE , -QLA_EVT_GNNFT_DONE , +QLA_EVT_SCAN_CMD , +QLA_EVT_SCAN_FINISH ,QLA_EVT_GFPNID ,QLA_EVT_SP_RETRY , QLA_EVT_IIDMA,
drivers/scsi/qla2xxx/qla_gbl.h +3 -3
@@ -728,9 +728,9 @@ int qla24xx_async_gpsc(scsi_qla_host_t *, fc_port_t *);void qla24xx_handle_gpsc_event (scsi_qla_host_t *,struct event_arg *);int qla2x00_mgmt_svr_login (scsi_qla_host_t *);int qla24xx_async_gffid (scsi_qla_host_t *vha,fc_port_t *fcport,bool ); -int qla24xx_async_gpnft (scsi_qla_host_t *,u8 ,srb_t *); -void qla24xx_async_gpnft_done (scsi_qla_host_t *,srb_t *); -void qla24xx_async_gnnft_done (scsi_qla_host_t *,srb_t *); +int qla_fab_async_scan (scsi_qla_host_t *,srb_t *); +void qla_fab_scan_start (struct scsi_qla_host *); +void qla_fab_scan_finish (scsi_qla_host_t *,srb_t *);int qla24xx_post_gfpnid_work (struct scsi_qla_host *,fc_port_t *);int qla24xx_async_gfpnid (scsi_qla_host_t *,fc_port_t *);void qla24xx_handle_gfpnid_event (scsi_qla_host_t *,struct event_arg *);
drivers/scsi/qla2xxx/qla_gs.c +181 -251
578 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_init.c +1 -4
@@ -6407,10 +6407,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)if (USE_ASYNC_SCAN (ha)) {/* start of scan begins here */ vha->scan.rscn_gen_end =atomic_read (&vha->rscn_gen); - rval =qla24xx_async_gpnft (vha,FC4_TYPE_FCP_SCSI , -NULL ); -if (rval) -set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags); +qla_fab_scan_start (vha); }else {list_for_each_entry (fcport, &vha->vp_fcports, list) fcport->scan_state =QLA_FCPORT_SCAN ;
drivers/scsi/qla2xxx/qla_os.c +4 -8
@@ -5558,15 +5558,11 @@ qla2x00_do_work(struct scsi_qla_host *vha)qla2x00_async_prlo_done (vha, e->u.logio.fcport, e->u.logio.data);break ; -case QLA_EVT_GPNFT : -qla24xx_async_gpnft (vha, e->u.gpnft.fc4_type, - e->u.gpnft.sp); +case QLA_EVT_SCAN_CMD : +qla_fab_async_scan (vha, e->u.iosb.sp);break ; -case QLA_EVT_GPNFT_DONE : -qla24xx_async_gpnft_done (vha, e->u.iosb.sp); -break ; -case QLA_EVT_GNNFT_DONE : -qla24xx_async_gnnft_done (vha, e->u.iosb.sp); +case QLA_EVT_SCAN_FINISH : +qla_fab_scan_finish (vha, e->u.iosb.sp);break ;case QLA_EVT_GFPNID :qla24xx_async_gfpnid (vha, e->u.fcport.fcport);
Signature · 1 line
2.23.1
Re: [PATCH v2 09/11] qla2xxx: Reduce fabric scan duplicate code
Quoted 700 lines · Nilesh Javali
From: Quinn Tran <[email protected]>
For fabric scan, current code uses switch scan opcode and flags as the method to iterate through different commands to carry out the process. This makes it hard to read. This patch convert those opcode and flags into steps. In addition, this help reduce some duplicate code.
Consolidate routines that handle GPNFT & GNNFT.
Signed-off-by Quinn Tran <[email protected]>Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_def.h | 14 +- drivers/scsi/qla2xxx/qla_gbl.h | 6 +- drivers/scsi/qla2xxx/qla_gs.c | 432 +++++++++++++------------------- drivers/scsi/qla2xxx/qla_init.c | 5 +- drivers/scsi/qla2xxx/qla_os.c | 12 +- 5 files changed, 200 insertions(+), 269 deletions(-)drivers/scsi/qla2xxx/qla_def.h +11
-3@@ -3309,11 +3309,20 @@ struct fab_scan_rp {u8 node_name[8 ]; }; +enum scan_step { +FAB_SCAN_START , +FAB_SCAN_GPNFT_FCP , +FAB_SCAN_GNNFT_FCP , +FAB_SCAN_GPNFT_NVME , +FAB_SCAN_GNNFT_NVME , +}; +struct fab_scan {struct fab_scan_rp *l;u32 size;u32 rscn_gen_start;u32 rscn_gen_end; +enum scan_step step;u16 scan_retry;#define MAX_SCAN_RETRIES 5enum scan_flags_t scan_flags;@@ -3539,9 +3548,8 @@ enum qla_work_type {QLA_EVT_RELOGIN ,QLA_EVT_ASYNC_PRLO ,QLA_EVT_ASYNC_PRLO_DONE , -QLA_EVT_GPNFT , -QLA_EVT_GPNFT_DONE , -QLA_EVT_GNNFT_DONE , +QLA_EVT_SCAN_CMD , +QLA_EVT_SCAN_FINISH ,QLA_EVT_GFPNID ,QLA_EVT_SP_RETRY , QLA_EVT_IIDMA,drivers/scsi/qla2xxx/qla_gbl.h +3
-3@@ -728,9 +728,9 @@ int qla24xx_async_gpsc(scsi_qla_host_t *, fc_port_t *);void qla24xx_handle_gpsc_event (scsi_qla_host_t *,struct event_arg *);int qla2x00_mgmt_svr_login (scsi_qla_host_t *);int qla24xx_async_gffid (scsi_qla_host_t *vha,fc_port_t *fcport,bool ); -int qla24xx_async_gpnft (scsi_qla_host_t *,u8 ,srb_t *); -void qla24xx_async_gpnft_done (scsi_qla_host_t *,srb_t *); -void qla24xx_async_gnnft_done (scsi_qla_host_t *,srb_t *); +int qla_fab_async_scan (scsi_qla_host_t *,srb_t *); +void qla_fab_scan_start (struct scsi_qla_host *); +void qla_fab_scan_finish (scsi_qla_host_t *,srb_t *);int qla24xx_post_gfpnid_work (struct scsi_qla_host *,fc_port_t *);int qla24xx_async_gfpnid (scsi_qla_host_t *,fc_port_t *);void qla24xx_handle_gfpnid_event (scsi_qla_host_t *,struct event_arg *);drivers/scsi/qla2xxx/qla_gs.c +181
-251@@ -3191,7 +3191,7 @@ static bool qla_ok_to_clear_rscn(scsi_qla_host_t *vha, fc_port_t *fcport)return true; } -void qla24xx_async_gnnft_done (scsi_qla_host_t *vha,srb_t *sp) +void qla_fab_scan_finish (scsi_qla_host_t *vha,srb_t *sp) {fc_port_t *fcport;u32 i, rc;@@ -3406,14 +3406,11 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) } } -static int qla2x00_post_gnnft_gpnft_done_work (struct scsi_qla_host *vha, +static int qla2x00_post_next_scan_work (struct scsi_qla_host *vha,srb_t *sp,int cmd) {struct qla_work_evt *e; -if (cmd !=QLA_EVT_GPNFT_DONE && cmd !=QLA_EVT_GNNFT_DONE ) -return QLA_PARAMETER_ERROR ; - e =qla2x00_alloc_work (vha, cmd);if (!e)return QLA_FUNCTION_FAILED ;@@ -3423,37 +3420,15 @@ static int qla2x00_post_gnnft_gpnft_done_work(struct scsi_qla_host *vha,return qla2x00_post_work (vha, e); } -static int qla2x00_post_nvme_gpnft_work (struct scsi_qla_host *vha, -srb_t *sp,int cmd) -{ -struct qla_work_evt *e; - -if (cmd !=QLA_EVT_GPNFT ) -return QLA_PARAMETER_ERROR ; - - e =qla2x00_alloc_work (vha, cmd); -if (!e) -return QLA_FUNCTION_FAILED ; - - e->u.gpnft.fc4_type =FC4_TYPE_NVME ; - e->u.gpnft.sp = sp; - -return qla2x00_post_work (vha, e); -} -static void qla2x00_find_free_fcp_nvme_slot (struct scsi_qla_host *vha,struct srb *sp) {struct qla_hw_data *ha = vha->hw;int num_fibre_dev = ha->max_fibre_devices; -struct ct_sns_req *ct_req = - (struct ct_sns_req *)sp->u.iocb_cmd.u.ctarg.req;struct ct_sns_gpnft_rsp *ct_rsp = (struct ct_sns_gpnft_rsp *)sp->u.iocb_cmd.u.ctarg.rsp;struct ct_sns_gpn_ft_data *d;struct fab_scan_rp *rp; -u16 cmd =be16_to_cpu (ct_req->command); -u8 fc4_type = sp->gen2;int i, j, k;port_id_t id;u8 found;@@ -3472,85 +3447,83 @@ static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha,if (id.b24 ==0 || wwn ==0 )continue ; -if (fc4_type ==FC4_TYPE_FCP_SCSI ) { -if (cmd ==GPN_FT_CMD ) { - rp = &vha->scan.l[j]; - rp->id = id; -memcpy (rp->port_name, d->port_name,8 ); - j++; - rp->fc4type =FS_FC4TYPE_FCP ; - }else { -for (k =0 ; k < num_fibre_dev; k++) { - rp = &vha->scan.l[k]; -if (id.b24 == rp->id.b24) { -memcpy (rp->node_name, - d->port_name,8 ); -break ; - } +ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0x2025 , +"%s %06x %8ph \n" , + __func__, id.b24, d->port_name); + +switch (vha->scan.step) { +case FAB_SCAN_GPNFT_FCP : + rp = &vha->scan.l[j]; + rp->id = id; +memcpy (rp->port_name, d->port_name,8 ); + j++; + rp->fc4type =FS_FC4TYPE_FCP ; +break ; +case FAB_SCAN_GNNFT_FCP : +for (k =0 ; k < num_fibre_dev; k++) { + rp = &vha->scan.l[k]; +if (id.b24 == rp->id.b24) { +memcpy (rp->node_name, + d->port_name,8 ); +break ; } } - }else { -/* Search if the fibre device supports FC4_TYPE_NVME */ -if (cmd ==GPN_FT_CMD ) { - found =0 ; - -for (k =0 ; k < num_fibre_dev; k++) { - rp = &vha->scan.l[k]; -if (!memcmp (rp->port_name, - d->port_name,8 )) { -/* -* Supports FC-NVMe & FCP -*/ - rp->fc4type |=FS_FC4TYPE_NVME ; - found =1 ; -break ; - } +break ; +case FAB_SCAN_GPNFT_NVME : + found =0 ; + +for (k =0 ; k < num_fibre_dev; k++) { + rp = &vha->scan.l[k]; +if (!memcmp (rp->port_name, d->port_name,8 )) { +/* +* Supports FC-NVMe & FCP +*/ + rp->fc4type |=FS_FC4TYPE_NVME ; + found =1 ; +break ; } + } -/* We found new FC-NVMe only port */ -if (!found) { -for (k =0 ; k < num_fibre_dev; k++) { - rp = &vha->scan.l[k]; -if (wwn_to_u64 (rp->port_name)) { -continue ; - }else { - rp->id = id; -memcpy (rp->port_name, - d->port_name,8 ); - rp->fc4type = -FS_FC4TYPE_NVME ; -break ; - } - } - } - }else { +/* We found new FC-NVMe only port */ +if (!found) {for (k =0 ; k < num_fibre_dev; k++) { rp = &vha->scan.l[k]; -if (id.b24 == rp->id.b24) { -memcpy (rp->node_name, - d->port_name,8 ); +if (wwn_to_u64 (rp->port_name)) { +continue ; + }else { + rp->id = id; +memcpy (rp->port_name, d->port_name,8 ); + rp->fc4type =FS_FC4TYPE_NVME ;break ; } } } +break ; +case FAB_SCAN_GNNFT_NVME : +for (k =0 ; k < num_fibre_dev; k++) { + rp = &vha->scan.l[k]; +if (id.b24 == rp->id.b24) { +memcpy (rp->node_name, d->port_name,8 ); +break ; + } + } +break ; +default : +break ; } } } -static void qla2x00_async_gpnft_gnnft_sp_done (srb_t *sp,int res) +static void qla_async_scan_sp_done (srb_t *sp,int res) {struct scsi_qla_host *vha = sp->vha; -struct ct_sns_req *ct_req = - (struct ct_sns_req *)sp->u.iocb_cmd.u.ctarg.req; -u16 cmd =be16_to_cpu (ct_req->command); -u8 fc4_type = sp->gen2;unsigned long flags;int rc;/* gen2 field is holding the fc4type */ -ql_dbg (ql_dbg_disc, vha,0xffff , -"Async done-%s res %x FC4Type %x\n" , - sp->name, res, sp->gen2); +ql_dbg (ql_dbg_disc, vha,0x2026 , +"Async done-%s res %x step %x\n" , + sp->name, res, vha->scan.step); sp->rc = res;if (res) {@@ -3574,8 +3547,7 @@ static void qla2x00_async_gpnft_gnnft_sp_done(srb_t *sp, int res)* sp for GNNFT_DONE work. This will allow all * the resource to get freed up. */ - rc =qla2x00_post_gnnft_gpnft_done_work (vha, sp, -QLA_EVT_GNNFT_DONE ); + rc =qla2x00_post_next_scan_work (vha, sp,QLA_EVT_SCAN_FINISH );if (rc) {/* Cleanup here to prevent memory leak */ qla24xx_sp_unmap (vha, sp);@@ -3600,28 +3572,30 @@ static void qla2x00_async_gpnft_gnnft_sp_done(srb_t *sp, int res)qla2x00_find_free_fcp_nvme_slot (vha, sp); -if ((fc4_type ==FC4_TYPE_FCP_SCSI ) && vha->flags.nvme_enabled && - cmd ==GNN_FT_CMD ) { -spin_lock_irqsave (&vha->work_lock, flags); - vha->scan.scan_flags &= ~SF_SCANNING ; -spin_unlock_irqrestore (&vha->work_lock, flags); +spin_lock_irqsave (&vha->work_lock, flags); + vha->scan.scan_flags &= ~SF_SCANNING ; +spin_unlock_irqrestore (&vha->work_lock, flags); - sp->rc = res; - rc =qla2x00_post_nvme_gpnft_work (vha, sp,QLA_EVT_GPNFT ); -if (rc) { -qla24xx_sp_unmap (vha, sp); -set_bit (LOCAL_LOOP_UPDATE , &vha->dpc_flags); -set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags); - } -return ; - } +switch (vha->scan.step) { +case FAB_SCAN_GPNFT_FCP : +case FAB_SCAN_GPNFT_NVME : + rc =qla2x00_post_next_scan_work (vha, sp,QLA_EVT_SCAN_CMD ); +break ; +case FAB_SCAN_GNNFT_FCP : +if (vha->flags.nvme_enabled) + rc =qla2x00_post_next_scan_work (vha, sp,QLA_EVT_SCAN_CMD ); +else + rc =qla2x00_post_next_scan_work (vha, sp,QLA_EVT_SCAN_FINISH ); -if (cmd ==GPN_FT_CMD ) { - rc =qla2x00_post_gnnft_gpnft_done_work (vha, sp, -QLA_EVT_GPNFT_DONE ); - }else { - rc =qla2x00_post_gnnft_gpnft_done_work (vha, sp, -QLA_EVT_GNNFT_DONE ); +break ; +case FAB_SCAN_GNNFT_NVME : + rc =qla2x00_post_next_scan_work (vha, sp,QLA_EVT_SCAN_FINISH ); +break ; +default : +/* should not be here */ +WARN_ON (1 ); + rc =QLA_FUNCTION_FAILED ; +break ; }if (rc) {@@ -3632,127 +3606,16 @@ static void qla2x00_async_gpnft_gnnft_sp_done(srb_t *sp, int res) } } -/* -* Get WWNN list for fc4_type -* -* It is assumed the same SRB is re-used from GPNFT to avoid -* mem free & re-alloc -*/ -static int qla24xx_async_gnnft (scsi_qla_host_t *vha,struct srb *sp, -u8 fc4_type) -{ -int rval =QLA_FUNCTION_FAILED ; -struct ct_sns_req *ct_req; -struct ct_sns_pkt *ct_sns; -unsigned long flags; - -if (!vha->flags.online) { -spin_lock_irqsave (&vha->work_lock, flags); - vha->scan.scan_flags &= ~SF_SCANNING ; -spin_unlock_irqrestore (&vha->work_lock, flags); - goto done_free_sp; - } - -if (!sp->u.iocb_cmd.u.ctarg.req || !sp->u.iocb_cmd.u.ctarg.rsp) { -ql_log (ql_log_warn, vha,0xffff , -"%s: req %p rsp %p are not setup\n" , - __func__, sp->u.iocb_cmd.u.ctarg.req, - sp->u.iocb_cmd.u.ctarg.rsp); -spin_lock_irqsave (&vha->work_lock, flags); - vha->scan.scan_flags &= ~SF_SCANNING ; -spin_unlock_irqrestore (&vha->work_lock, flags); -WARN_ON (1 ); -set_bit (LOCAL_LOOP_UPDATE , &vha->dpc_flags); -set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags); - goto done_free_sp; - } - -ql_dbg (ql_dbg_disc, vha,0xfffff , -"%s: FC4Type %x, CT-PASSTHRU %s command ctarg rsp size %d, ctarg req size %d\n" , - __func__, fc4_type, sp->name, sp->u.iocb_cmd.u.ctarg.rsp_size, - sp->u.iocb_cmd.u.ctarg.req_size); - - sp->type =SRB_CT_PTHRU_CMD ; - sp->name ="gnnft" ; - sp->gen1 = vha->hw->base_qpair->chip_reset; - sp->gen2 = fc4_type; -qla2x00_init_async_sp (sp,qla2x00_get_async_timeout (vha) +2 , - qla2x00_async_gpnft_gnnft_sp_done); - -memset (sp->u.iocb_cmd.u.ctarg.rsp,0 , sp->u.iocb_cmd.u.ctarg.rsp_size); -memset (sp->u.iocb_cmd.u.ctarg.req,0 , sp->u.iocb_cmd.u.ctarg.req_size); - - ct_sns = (struct ct_sns_pkt *)sp->u.iocb_cmd.u.ctarg.req; -/* CT_IU preamble */ - ct_req =qla2x00_prep_ct_req (ct_sns,GNN_FT_CMD , - sp->u.iocb_cmd.u.ctarg.rsp_size); - -/* GPN_FT req */ - ct_req->req.gpn_ft.port_type = fc4_type; - - sp->u.iocb_cmd.u.ctarg.req_size =GNN_FT_REQ_SIZE ; - sp->u.iocb_cmd.u.ctarg.nport_handle =NPH_SNS ; - -ql_dbg (ql_dbg_disc, vha,0xffff , -"Async-%s hdl=%x FC4Type %x.\n" , sp->name, - sp->handle, ct_req->req.gpn_ft.port_type); - - rval =qla2x00_start_sp (sp); -if (rval !=QLA_SUCCESS ) { - goto done_free_sp; - } - -return rval; - -done_free_sp: -if (sp->u.iocb_cmd.u.ctarg.req) { -dma_free_coherent (&vha->hw->pdev->dev, - sp->u.iocb_cmd.u.ctarg.req_allocated_size, - sp->u.iocb_cmd.u.ctarg.req, - sp->u.iocb_cmd.u.ctarg.req_dma); - sp->u.iocb_cmd.u.ctarg.req =NULL ; - } -if (sp->u.iocb_cmd.u.ctarg.rsp) { -dma_free_coherent (&vha->hw->pdev->dev, - sp->u.iocb_cmd.u.ctarg.rsp_allocated_size, - sp->u.iocb_cmd.u.ctarg.rsp, - sp->u.iocb_cmd.u.ctarg.rsp_dma); - sp->u.iocb_cmd.u.ctarg.rsp =NULL ; - } -/* ref: INIT */ -kref_put (&sp->cmd_kref, qla2x00_sp_release); - -spin_lock_irqsave (&vha->work_lock, flags); - vha->scan.scan_flags &= ~SF_SCANNING ; -if (vha->scan.scan_flags ==0 ) { -ql_dbg (ql_dbg_disc, vha,0xffff , -"%s: schedule\n" , __func__); - vha->scan.scan_flags |=SF_QUEUED ; -schedule_delayed_work (&vha->scan.scan_work,5 ); - } -spin_unlock_irqrestore (&vha->work_lock, flags); - - -return rval; -}/* GNNFT */ - -void qla24xx_async_gpnft_done (scsi_qla_host_t *vha,srb_t *sp) -{ -ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0xffff , -"%s enter\n" , __func__); -qla24xx_async_gnnft (vha, sp, sp->gen2); -} -/* Get WWPN list for certain fc4_type */ -int qla24xx_async_gpnft (scsi_qla_host_t *vha,u8 fc4_type,srb_t *sp) +int qla_fab_async_scan (scsi_qla_host_t *vha,srb_t *sp) {int rval =QLA_FUNCTION_FAILED ;struct ct_sns_req *ct_req;struct ct_sns_pkt *ct_sns; -u32 rspsz; +u32 rspsz =0 ;unsigned long flags; -ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0xffff , +ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0x200c ,"%s enter\n" , __func__);if (!vha->flags.online)@@ -3761,22 +3624,21 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)spin_lock_irqsave (&vha->work_lock, flags);if (vha->scan.scan_flags &SF_SCANNING ) {spin_unlock_irqrestore (&vha->work_lock, flags); -ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0xffff , +ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0x2012 ,"%s: scan active\n" , __func__);return rval; } vha->scan.scan_flags |=SF_SCANNING ; +if (!sp) + vha->scan.step =FAB_SCAN_START ; +spin_unlock_irqrestore (&vha->work_lock, flags); -if (fc4_type ==FC4_TYPE_FCP_SCSI ) { -ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0xffff , +switch (vha->scan.step) { +case FAB_SCAN_START : +ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0x2018 ,"%s: Performing FCP Scan\n" , __func__); -if (sp) { -/* ref: INIT */ -kref_put (&sp->cmd_kref, qla2x00_sp_release); - } -/* ref: INIT */ sp =qla2x00_get_sp (vha,NULL ,GFP_KERNEL );if (!sp) {@@ -3792,7 +3654,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp) GFP_KERNEL); sp->u.iocb_cmd.u.ctarg.req_allocated_size =sizeof (struct ct_sns_pkt );if (!sp->u.iocb_cmd.u.ctarg.req) { -ql_log (ql_log_warn, vha,0xffff , +ql_log (ql_log_warn, vha,0x201a ,"Failed to allocate ct_sns request.\n" );spin_lock_irqsave (&vha->work_lock, flags); vha->scan.scan_flags &= ~SF_SCANNING ;@@ -3800,7 +3662,6 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)qla2x00_rel_sp (sp);return rval; } - sp->u.iocb_cmd.u.ctarg.req_size =GPN_FT_REQ_SIZE ; rspsz =sizeof (struct ct_sns_gpnft_rsp ) + vha->hw->max_fibre_devices *@@ -3812,7 +3673,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp) GFP_KERNEL); sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = rspsz;if (!sp->u.iocb_cmd.u.ctarg.rsp) { -ql_log (ql_log_warn, vha,0xffff , +ql_log (ql_log_warn, vha,0x201b ,"Failed to allocate ct_sns request.\n" );spin_lock_irqsave (&vha->work_lock, flags); vha->scan.scan_flags &= ~SF_SCANNING ;@@ -3832,35 +3693,95 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp) "%s scan list size %d\n", __func__, vha->scan.size);memset (vha->scan.l,0 , vha->scan.size); - }else if (!sp) { -ql_dbg (ql_dbg_disc, vha,0xffff , -"NVME scan did not provide SP\n" ); + + vha->scan.step =FAB_SCAN_GPNFT_FCP ; +break ; +case FAB_SCAN_GPNFT_FCP : + vha->scan.step =FAB_SCAN_GNNFT_FCP ; +break ; +case FAB_SCAN_GNNFT_FCP : + vha->scan.step =FAB_SCAN_GPNFT_NVME ; +break ; +case FAB_SCAN_GPNFT_NVME : + vha->scan.step =FAB_SCAN_GNNFT_NVME ; +break ; +case FAB_SCAN_GNNFT_NVME : +default : +/* should not be here */ +WARN_ON (1 ); + goto done_free_sp; + } + +if (!sp) { +ql_dbg (ql_dbg_disc, vha,0x201c , +"scan did not provide SP\n" );return rval; } +if (!sp->u.iocb_cmd.u.ctarg.req || !sp->u.iocb_cmd.u.ctarg.rsp) { +ql_log (ql_log_warn, vha,0x201d , +"%s: req %p rsp %p are not setup\n" , + __func__, sp->u.iocb_cmd.u.ctarg.req, + sp->u.iocb_cmd.u.ctarg.rsp); +spin_lock_irqsave (&vha->work_lock, flags); + vha->scan.scan_flags &= ~SF_SCANNING ; +spin_unlock_irqrestore (&vha->work_lock, flags); +WARN_ON (1 ); +set_bit (LOCAL_LOOP_UPDATE , &vha->dpc_flags); +set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags); + goto done_free_sp; + } + + rspsz = sp->u.iocb_cmd.u.ctarg.rsp_size; +memset (sp->u.iocb_cmd.u.ctarg.req,0 , sp->u.iocb_cmd.u.ctarg.req_size); +memset (sp->u.iocb_cmd.u.ctarg.rsp,0 , sp->u.iocb_cmd.u.ctarg.rsp_size); + sp->type =SRB_CT_PTHRU_CMD ; - sp->name ="gpnft" ; sp->gen1 = vha->hw->base_qpair->chip_reset; - sp->gen2 = fc4_type;qla2x00_init_async_sp (sp,qla2x00_get_async_timeout (vha) +2 , - qla2x00_async_gpnft_gnnft_sp_done); - - rspsz = sp->u.iocb_cmd.u.ctarg.rsp_size; -memset (sp->u.iocb_cmd.u.ctarg.rsp,0 , sp->u.iocb_cmd.u.ctarg.rsp_size); -memset (sp->u.iocb_cmd.u.ctarg.req,0 , sp->u.iocb_cmd.u.ctarg.req_size); + qla_async_scan_sp_done); ct_sns = (struct ct_sns_pkt *)sp->u.iocb_cmd.u.ctarg.req; -/* CT_IU preamble */ - ct_req =qla2x00_prep_ct_req (ct_sns,GPN_FT_CMD , rspsz); -/* GPN_FT req */ - ct_req->req.gpn_ft.port_type = fc4_type; +/* CT_IU preamble */ +switch (vha->scan.step) { +case FAB_SCAN_GPNFT_FCP : + sp->name ="gpnft" ; + ct_req =qla2x00_prep_ct_req (ct_sns,GPN_FT_CMD , rspsz); + ct_req->req.gpn_ft.port_type =FC4_TYPE_FCP_SCSI ; + sp->u.iocb_cmd.u.ctarg.req_size =GPN_FT_REQ_SIZE ; +break ; +case FAB_SCAN_GNNFT_FCP : + sp->name ="gnnft" ; + ct_req =qla2x00_prep_ct_req (ct_sns,GNN_FT_CMD , rspsz); + ct_req->req.gpn_ft.port_type =FC4_TYPE_FCP_SCSI ; + sp->u.iocb_cmd.u.ctarg.req_size =GNN_FT_REQ_SIZE ; +break ; +case FAB_SCAN_GPNFT_NVME : + sp->name ="gpnft" ; + ct_req =qla2x00_prep_ct_req (ct_sns,GPN_FT_CMD , rspsz); + ct_req->req.gpn_ft.port_type =FC4_TYPE_NVME ; + sp->u.iocb_cmd.u.ctarg.req_size =GPN_FT_REQ_SIZE ; +break ; +case FAB_SCAN_GNNFT_NVME : + sp->name ="gnnft" ; + ct_req =qla2x00_prep_ct_req (ct_sns,GNN_FT_CMD , rspsz); + ct_req->req.gpn_ft.port_type =FC4_TYPE_NVME ; + sp->u.iocb_cmd.u.ctarg.req_size =GNN_FT_REQ_SIZE ; +break ; +default : +/* should not be here */ +WARN_ON (1 ); + goto done_free_sp; + } sp->u.iocb_cmd.u.ctarg.nport_handle =NPH_SNS ; -ql_dbg (ql_dbg_disc, vha,0xffff , -"Async-%s hdl=%x FC4Type %x.\n" , sp->name, - sp->handle, ct_req->req.gpn_ft.port_type); +ql_dbg (ql_dbg_disc, vha,0x2003 , +"%s: step %d, rsp size %d, req size %d hdl %x %s FC4TYPE %x \n" , + __func__, vha->scan.step, sp->u.iocb_cmd.u.ctarg.rsp_size, + sp->u.iocb_cmd.u.ctarg.req_size, sp->handle, sp->name, + ct_req->req.gpn_ft.port_type); rval =qla2x00_start_sp (sp);if (rval !=QLA_SUCCESS ) {@@ -3891,7 +3812,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)spin_lock_irqsave (&vha->work_lock, flags); vha->scan.scan_flags &= ~SF_SCANNING ;if (vha->scan.scan_flags ==0 ) { -ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0xffff , +ql_dbg (ql_dbg_disc + ql_dbg_verbose, vha,0x2007 ,"%s: Scan scheduled.\n" , __func__); vha->scan.scan_flags |=SF_QUEUED ;schedule_delayed_work (&vha->scan.scan_work,5 );@@ -3902,6 +3823,15 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)return rval; } +void qla_fab_scan_start (struct scsi_qla_host *vha) +{ +int rval; + + rval =qla_fab_async_scan (vha,NULL ); +if (rval) +set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags); +} +void qla_scan_work_fn (struct work_struct *work) { struct fab_scan *s = container_of(to_delayed_work(work),drivers/scsi/qla2xxx/qla_init.c +1
-4@@ -6407,10 +6407,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)if (USE_ASYNC_SCAN (ha)) {/* start of scan begins here */ vha->scan.rscn_gen_end =atomic_read (&vha->rscn_gen); - rval =qla24xx_async_gpnft (vha,FC4_TYPE_FCP_SCSI , -NULL ); -if (rval) -set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags); +qla_fab_scan_start (vha); }else {list_for_each_entry (fcport, &vha->vp_fcports, list) fcport->scan_state =QLA_FCPORT_SCAN ;drivers/scsi/qla2xxx/qla_os.c +2
-3@@ -5558,15 +5558,11 @@ qla2x00_do_work(struct scsi_qla_host *vha)qla2x00_async_prlo_done (vha, e->u.logio.fcport, e->u.logio.data);break ; -case QLA_EVT_GPNFT : -qla24xx_async_gpnft (vha, e->u.gpnft.fc4_type, - e->u.gpnft.sp); +case QLA_EVT_SCAN_CMD : +qla_fab_async_scan (vha, e->u.iosb.sp);break ;
drivers/scsi/qla2xxx/qla_os.c qla2x00_do_work(struct scsi_qla_host *vha) · line 5568
Quoted 10 lines
drivers/scsi/qla2xxx/qla_os.c +2
-5-case QLA_EVT_GPNFT_DONE : -qla24xx_async_gpnft_done (vha, e->u.iosb.sp); -break ; -case QLA_EVT_GNNFT_DONE : -qla24xx_async_gnnft_done (vha, e->u.iosb.sp); +case QLA_EVT_SCAN_FINISH : +qla_fab_scan_finish (vha, e->u.iosb.sp);break ;case QLA_EVT_GFPNID :qla24xx_async_gfpnid (vha, e->u.fcport.fcport);
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 10/11 qla2xxx: Use QP lock to search for bsg
In reply to Nilesh JavaliFrom: Quinn Tran <[email protected]>
On bsg timeout, hardware_lock is used as part of search for the srb. Instead, qpair lock should be used to iterate through different qpair.
--- drivers/scsi/qla2xxx/qla_bsg.c | 96 ++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 39 deletions(-)
drivers/scsi/qla2xxx/qla_bsg.c +57 -39
@@ -3059,17 +3059,61 @@ qla24xx_bsg_request(struct bsg_job *bsg_job)return ret; } -int -qla24xx_bsg_timeout (struct bsg_job *bsg_job) +static bool qla_bsg_found (struct qla_qpair *qpair,struct bsg_job *bsg_job) { +bool found = false;struct fc_bsg_reply *bsg_reply = bsg_job->reply;scsi_qla_host_t *vha =shost_priv (fc_bsg_to_shost (bsg_job));struct qla_hw_data *ha = vha->hw; -srb_t *sp; -int cnt, que; +srb_t *sp =NULL ; +int cnt;unsigned long flags;struct req_que *req; +spin_lock_irqsave (qpair->qp_lock_ptr, flags); + req = qpair->req; + +for (cnt =1 ; cnt < req->num_outstanding_cmds; cnt++) { + sp = req->outstanding_cmds[cnt]; +if (sp && + (sp->type ==SRB_CT_CMD || + sp->type ==SRB_ELS_CMD_HST || + sp->type ==SRB_ELS_CMD_HST_NOLOGIN ) && + sp->u.bsg_job == bsg_job) { + req->outstanding_cmds[cnt] =NULL ; +spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); + +if (!ha->flags.eeh_busy && ha->isp_ops->abort_command (sp)) { +ql_log (ql_log_warn, vha,0x7089 , +"mbx abort_command failed.\n" ); + bsg_reply->result = -EIO ; + }else { +ql_dbg (ql_dbg_user, vha,0x708a , +"mbx abort_command success.\n" ); + bsg_reply->result =0 ; + } +/* ref: INIT */ +kref_put (&sp->cmd_kref, qla2x00_sp_release); + + found = true; + goto done; + } + } +spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); + +done: +return found; +} + +int +qla24xx_bsg_timeout (struct bsg_job *bsg_job) +{ +struct fc_bsg_reply *bsg_reply = bsg_job->reply; +scsi_qla_host_t *vha =shost_priv (fc_bsg_to_shost (bsg_job)); +struct qla_hw_data *ha = vha->hw; +int i; +struct qla_qpair *qpair; +ql_log (ql_log_info, vha,0x708b ,"%s CMD timeout. bsg ptr %p.\n" , __func__, bsg_job);
@@ -3079,48 +3123,22 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_job)qla_pci_set_eeh_busy (vha); } +if (qla_bsg_found (ha->base_qpair, bsg_job)) + goto done; +/* find the bsg job from the active list of commands */ -spin_lock_irqsave (&ha->hardware_lock, flags); -for (que =0 ; que < ha->max_req_queues; que++) { - req = ha->req_q_map[que]; -if (!req) +for (i =0 ; i < ha->max_qpairs; i++) { + qpair = vha->hw->queue_pair_map[i]; +if (!qpair)continue ; - -for (cnt =1 ; cnt < req->num_outstanding_cmds; cnt++) { - sp = req->outstanding_cmds[cnt]; -if (sp && - (sp->type ==SRB_CT_CMD || - sp->type ==SRB_ELS_CMD_HST || - sp->type ==SRB_ELS_CMD_HST_NOLOGIN || - sp->type ==SRB_FXIOCB_BCMD ) && - sp->u.bsg_job == bsg_job) { - req->outstanding_cmds[cnt] =NULL ; -spin_unlock_irqrestore (&ha->hardware_lock, flags); - -if (!ha->flags.eeh_busy && ha->isp_ops->abort_command (sp)) { -ql_log (ql_log_warn, vha,0x7089 , -"mbx abort_command failed.\n" ); - bsg_reply->result = -EIO ; - }else { -ql_dbg (ql_dbg_user, vha,0x708a , -"mbx abort_command success.\n" ); - bsg_reply->result =0 ; - } -spin_lock_irqsave (&ha->hardware_lock, flags); - goto done; - - } - } +if (qla_bsg_found (qpair, bsg_job)) + goto done; } -spin_unlock_irqrestore (&ha->hardware_lock, flags); +ql_log (ql_log_info, vha,0x708b ,"SRB not found to abort.\n" ); bsg_reply->result = -ENXIO ; -return 0 ; done: -spin_unlock_irqrestore (&ha->hardware_lock, flags); -/* ref: INIT */ -kref_put (&sp->cmd_kref, qla2x00_sp_release);return 0 ; }
Signature · 1 line
2.23.1
Re: [PATCH v2 10/11] qla2xxx: Use QP lock to search for bsg
Quoted 130 lines · Nilesh Javali
From: Quinn Tran <[email protected]>
On bsg timeout,
hardware_lockis used as part of search for the srb. Instead, qpair lock should be used to iterate through different qpair.Signed-off-by Quinn Tran <[email protected]>Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_bsg.c | 96 ++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 39 deletions(-)drivers/scsi/qla2xxx/qla_bsg.c +57
-35@@ -3059,17 +3059,61 @@ qla24xx_bsg_request(struct bsg_job *bsg_job)return ret; } -int -qla24xx_bsg_timeout (struct bsg_job *bsg_job) +static bool qla_bsg_found (struct qla_qpair *qpair,struct bsg_job *bsg_job) { +bool found = false;struct fc_bsg_reply *bsg_reply = bsg_job->reply;scsi_qla_host_t *vha =shost_priv (fc_bsg_to_shost (bsg_job));struct qla_hw_data *ha = vha->hw; -srb_t *sp; -int cnt, que; +srb_t *sp =NULL ; +int cnt;unsigned long flags;struct req_que *req; +spin_lock_irqsave (qpair->qp_lock_ptr, flags); + req = qpair->req; + +for (cnt =1 ; cnt < req->num_outstanding_cmds; cnt++) { + sp = req->outstanding_cmds[cnt]; +if (sp && + (sp->type ==SRB_CT_CMD || + sp->type ==SRB_ELS_CMD_HST || + sp->type ==SRB_ELS_CMD_HST_NOLOGIN ) && + sp->u.bsg_job == bsg_job) { + req->outstanding_cmds[cnt] =NULL ; +spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); + +if (!ha->flags.eeh_busy && ha->isp_ops->abort_command (sp)) { +ql_log (ql_log_warn, vha,0x7089 , +"mbx abort_command failed.\n" ); + bsg_reply->result = -EIO ; + }else { +ql_dbg (ql_dbg_user, vha,0x708a , +"mbx abort_command success.\n" ); + bsg_reply->result =0 ; + } +/* ref: INIT */ +kref_put (&sp->cmd_kref, qla2x00_sp_release); + + found = true; + goto done; + } + } +spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); + +done: +return found; +} + +int +qla24xx_bsg_timeout (struct bsg_job *bsg_job) +{ +struct fc_bsg_reply *bsg_reply = bsg_job->reply; +scsi_qla_host_t *vha =shost_priv (fc_bsg_to_shost (bsg_job)); +struct qla_hw_data *ha = vha->hw; +int i; +struct qla_qpair *qpair; +ql_log (ql_log_info, vha,0x708b ,"%s CMD timeout. bsg ptr %p.\n" , __func__, bsg_job);@@ -3079,48 +3123,22 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_job)qla_pci_set_eeh_busy (vha); } +if (qla_bsg_found (ha->base_qpair, bsg_job)) + goto done; +/* find the bsg job from the active list of commands */ -spin_lock_irqsave (&ha->hardware_lock, flags); -for (que =0 ; que < ha->max_req_queues; que++) { - req = ha->req_q_map[que]; -if (!req) +for (i =0 ; i < ha->max_qpairs; i++) { + qpair = vha->hw->queue_pair_map[i]; +if (!qpair)continue ; - -for (cnt =1 ; cnt < req->num_outstanding_cmds; cnt++) { - sp = req->outstanding_cmds[cnt]; -if (sp && - (sp->type ==SRB_CT_CMD || - sp->type ==SRB_ELS_CMD_HST || - sp->type ==SRB_ELS_CMD_HST_NOLOGIN || - sp->type ==SRB_FXIOCB_BCMD ) && - sp->u.bsg_job == bsg_job) { - req->outstanding_cmds[cnt] =NULL ; -spin_unlock_irqrestore (&ha->hardware_lock, flags); - -if (!ha->flags.eeh_busy && ha->isp_ops->abort_command (sp)) { -ql_log (ql_log_warn, vha,0x7089 , -"mbx abort_command failed.\n" ); - bsg_reply->result = -EIO ; - }else { -ql_dbg (ql_dbg_user, vha,0x708a , -"mbx abort_command success.\n" ); - bsg_reply->result =0 ; - } -spin_lock_irqsave (&ha->hardware_lock, flags); - goto done; - - } - } +if (qla_bsg_found (qpair, bsg_job)) + goto done; } -spin_unlock_irqrestore (&ha->hardware_lock, flags); +ql_log (ql_log_info, vha,0x708b ,"SRB not found to abort.\n" );
drivers/scsi/qla2xxx/qla_bsg.c qla24xx_bsg_timeout(struct bsg_job *bsg_job) · line 3144
Quoted 10 lines
drivers/scsi/qla2xxx/qla_bsg.c +0
-4bsg_reply->result = -ENXIO ; -return 0 ; done: -spin_unlock_irqrestore (&ha->hardware_lock, flags); -/* ref: INIT */ -kref_put (&sp->cmd_kref, qla2x00_sp_release);return 0 ; }
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Nilesh Javali
maintainerPATCH v2 11/11 qla2xxx: Update version to 10.02.09.300-k
In reply to Nilesh Javali--- drivers/scsi/qla2xxx/qla_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_version.h +2 -2
@@ -6,9 +6,9 @@/* * Driver version */ -#define QLA2XXX_VERSION "10.02.09.200-k" +#define QLA2XXX_VERSION "10.02.09.300-k"#define QLA_DRIVER_MAJOR_VER 10#define QLA_DRIVER_MINOR_VER 2#define QLA_DRIVER_PATCH_VER 9 -#define QLA_DRIVER_BETA_VER 200 +#define QLA_DRIVER_BETA_VER 300
Signature · 1 line
2.23.1
Re: [PATCH v2 11/11] qla2xxx: Update version to 10.02.09.300-k
Quoted 11 lines · Nilesh Javali
Signed-off-by Nilesh Javali <[email protected]>--- drivers/scsi/qla2xxx/qla_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/scsi/qla2xxx/qla_version.h +0
-0@@ -6,9 +6,9 @@/*
drivers/scsi/qla2xxx/qla_version.h line 14
Quoted 10 lines
drivers/scsi/qla2xxx/qla_version.h +2
-2* Driver version */ -#define QLA2XXX_VERSION "10.02.09.200-k" +#define QLA2XXX_VERSION "10.02.09.300-k"#define QLA_DRIVER_MAJOR_VER 10#define QLA_DRIVER_MINOR_VER 2#define QLA_DRIVER_PATCH_VER 9 -#define QLA_DRIVER_BETA_VER 200 +#define QLA_DRIVER_BETA_VER 300
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Martin K. Petersen
AppliedNilesh,
Quoted 2 lines
Please apply the qla2xxx driver miscellaneous bug fixes to the scsi tree at your earliest convenience.
Applied to 6.11/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 10 lines · Nilesh Javali
Martin,
Please apply the qla2xxx driver miscellaneous bug fixes to the scsi tree at your earliest convenience.
v2:
- Fix smatch warn,val_is_in_range()warn: always true condition '(val <= 4294967295) => (0-u32max <= u32max)'
- Fix smatch warn,qla24xx_get_flash_version()warn: missing error code? 'ret'[...]
Applied to 6.11/scsi-queue, thanks!
[01/11] qla2xxx: unable to act on RSCN for port online
https://git.kernel.org/mkp/scsi/c/c3d98b12eef8 [02/11] qla2xxx: validate nvme_local_port correctly https://git.kernel.org/mkp/scsi/c/eb1d4ce26095 [03/11] qla2xxx: Fix for possible memory corruption https://git.kernel.org/mkp/scsi/c/c03d740152f7 [04/11] qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds https://git.kernel.org/mkp/scsi/c/ce2065c4cc4f [05/11] qla2xxx: Fix flash read failure https://git.kernel.org/mkp/scsi/c/29e222085d89 [06/11] qla2xxx: complete command early within lock https://git.kernel.org/mkp/scsi/c/4475afa2646d [07/11] qla2xxx: During vport delete send async logout explicitly https://git.kernel.org/mkp/scsi/c/76f480d7c717 [08/11] qla2xxx: Fix optrom version displayed in FDMI https://git.kernel.org/mkp/scsi/c/348744f27a35 [09/11] qla2xxx: Reduce fabric scan duplicate code https://git.kernel.org/mkp/scsi/c/beafd6924614 [10/11] qla2xxx: Use QP lock to search for bsg https://git.kernel.org/mkp/scsi/c/c449b4198701 [11/11] qla2xxx: Update version to 10.02.09.300-k https://git.kernel.org/mkp/scsi/c/a1392b19ca59
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering