Skip to content

Commit

Permalink
scsi: qla2xxx: Move work element processing out of DPC thread
Browse files Browse the repository at this point in the history 
DPC thread can stall during switch scan due to slow switch response.
This will stall other work element that needs attention. Moving work
element processing and relogin logic out of DPC thread and into its
own work queue.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
@martinkpetersen
Quinn Tran authored and martinkpetersen committed Jan 4, 2018
1 parent f13515a commit 9b3e0f4
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 27 deletions.
6 changes: 2 additions & 4 deletions drivers/scsi/qla2xxx/qla_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3139,6 +3139,7 @@ enum qla_work_type {
QLA_EVT_UPD_FCPORT,
QLA_EVT_GNL,
QLA_EVT_NACK,
QLA_EVT_RELOGIN,
};


Expand Down Expand Up @@ -3447,10 +3448,6 @@ struct qlt_hw_data {

#define LEAK_EXCHG_THRESH_HOLD_PERCENT 75 /* 75 percent */

#define QLA_EARLY_LINKUP(_ha) \
((_ha->flags.n2n_ae || _ha->flags.lip_ae) && \
_ha->flags.fw_started && !_ha->flags.fw_init_done)

/*
* Qlogic host adapter specific data structure.
*/
Expand Down Expand Up @@ -4155,6 +4152,7 @@ typedef struct scsi_qla_host {
#define SET_ZIO_THRESHOLD_NEEDED 28
#define DETECT_SFP_CHANGE 29
#define N2N_LOGIN_NEEDED 30
#define IOCB_WORK_ACTIVE 31

unsigned long pci_flags;
#define PFLG_DISCONNECTED 0 /* PCI device removed */
Expand Down
1 change: 1 addition & 0 deletions drivers/scsi/qla2xxx/qla_gbl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *,
uint16_t *);
int qla24xx_post_gnl_work(struct scsi_qla_host *, fc_port_t *);
int qla24xx_async_abort_cmd(srb_t *);
int qla24xx_post_relogin_work(struct scsi_qla_host *vha);

/*
* Global Functions in qla_mid.c source file.
Expand Down
1 change: 1 addition & 0 deletions drivers/scsi/qla2xxx/qla_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
__func__, fcport->port_name, fcport->last_rscn_gen,
fcport->rscn_gen, fcport->last_login_gen,
fcport->login_gen);
set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
return;
} else if (ea->sp->gen1 != fcport->rscn_gen) {
ql_dbg(ql_dbg_disc, vha, 0x20d4, "%s %d %8phC post gidpn\n",
Expand Down
6 changes: 1 addition & 5 deletions drivers/scsi/qla2xxx/qla_mid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,6 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x4012,
"Entering %s vp_flags: 0x%lx.\n", __func__, vha->vp_flags);

qla2x00_do_work(vha);

/* Check if Fw is ready to configure VP first */
if (test_bit(VP_CONFIG_OK, &base_vha->vp_flags)) {
if (test_and_clear_bit(VP_IDX_ACQUIRED, &vha->vp_flags)) {
Expand Down Expand Up @@ -354,9 +352,7 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha)

ql_dbg(ql_dbg_dpc, vha, 0x4018,
"Relogin needed scheduled.\n");
qla2x00_relogin(vha);
ql_dbg(ql_dbg_dpc, vha, 0x4019,
"Relogin needed end.\n");
qla24xx_post_relogin_work(vha);
}
}

Expand Down
76 changes: 58 additions & 18 deletions drivers/scsi/qla2xxx/qla_os.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2698,14 +2698,22 @@ static void qla2x00_iocb_work_fn(struct work_struct *work)
{
struct scsi_qla_host *vha = container_of(work,
struct scsi_qla_host, iocb_work);
int cnt = 0;
struct qla_hw_data *ha = vha->hw;
struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
int i = 20;
unsigned long flags;

if (test_bit(UNLOADING, &base_vha->dpc_flags))
return;

while (!list_empty(&vha->work_list)) {
while (!list_empty(&vha->work_list) && i > 0) {
qla2x00_do_work(vha);
cnt++;
if (cnt > 10)
break;
i--;
}

spin_lock_irqsave(&vha->work_lock, flags);
clear_bit(IOCB_WORK_ACTIVE, &vha->dpc_flags);
spin_unlock_irqrestore(&vha->work_lock, flags);
}

/*
Expand Down Expand Up @@ -3203,7 +3211,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
host->can_queue, base_vha->req,
base_vha->mgmt_svr_loop_id, host->sg_tablesize);

ha->wq = alloc_workqueue("qla2xxx_wq", WQ_MEM_RECLAIM, 0);
ha->wq = alloc_workqueue("qla2xxx_wq", 0, 0);

if (ha->mqenable) {
bool mq = false;
Expand Down Expand Up @@ -4555,6 +4563,7 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,
INIT_LIST_HEAD(&vha->gnl.fcports);
INIT_LIST_HEAD(&vha->nvme_rport_list);
INIT_LIST_HEAD(&vha->gpnid_list);
INIT_WORK(&vha->iocb_work, qla2x00_iocb_work_fn);

spin_lock_init(&vha->work_lock);
spin_lock_init(&vha->cmd_list_lock);
Expand Down Expand Up @@ -4607,15 +4616,18 @@ int
qla2x00_post_work(struct scsi_qla_host *vha, struct qla_work_evt *e)
{
unsigned long flags;
bool q = false;

spin_lock_irqsave(&vha->work_lock, flags);
list_add_tail(&e->list, &vha->work_list);

if (!test_and_set_bit(IOCB_WORK_ACTIVE, &vha->dpc_flags))
q = true;

spin_unlock_irqrestore(&vha->work_lock, flags);

if (QLA_EARLY_LINKUP(vha->hw))
schedule_work(&vha->iocb_work);
else
qla2xxx_wake_dpc(vha);
if (q)
queue_work(vha->hw->wq, &vha->iocb_work);

return QLA_SUCCESS;
}
Expand Down Expand Up @@ -4747,6 +4759,9 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e)
fcport->d_id = e->u.new_sess.id;
if (pla) {
fcport->fw_login_state = DSC_LS_PLOGI_PEND;
memcpy(fcport->node_name,
pla->iocb.u.isp24.u.plogi.node_name,
WWN_SIZE);
qlt_plogi_ack_link(vha, pla, fcport, QLT_PLOGI_LINK_SAME_WWN);
/* we took an extra ref_count to prevent PLOGI ACK when
* fcport/sess has not been created.
Expand Down Expand Up @@ -4897,6 +4912,9 @@ qla2x00_do_work(struct scsi_qla_host *vha)
case QLA_EVT_GPNID_DONE:
qla24xx_async_gpnid_done(vha, e->u.iosb.sp);
break;
case QLA_EVT_RELOGIN:
qla2x00_relogin(vha);
break;
case QLA_EVT_NEW_SESS:
qla24xx_create_new_sess(vha, e);
break;
Expand Down Expand Up @@ -4928,6 +4946,20 @@ qla2x00_do_work(struct scsi_qla_host *vha)
}
}

int qla24xx_post_relogin_work(struct scsi_qla_host *vha)
{
struct qla_work_evt *e;

e = qla2x00_alloc_work(vha, QLA_EVT_RELOGIN);

if (!e) {
set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
return QLA_FUNCTION_FAILED;
}

return qla2x00_post_work(vha, e);
}

/* Relogins all the fcports of a vport
* Context: dpc thread
*/
Expand Down Expand Up @@ -4983,6 +5015,9 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
break;
}

ql_dbg(ql_dbg_disc, vha, 0x400e,
"Relogin end.\n");
}

/* Schedule work on any of the dpc-workqueues */
Expand Down Expand Up @@ -5758,8 +5793,6 @@ qla2x00_do_dpc(void *data)
if (test_bit(UNLOADING, &base_vha->dpc_flags))
break;

qla2x00_do_work(base_vha);

if (IS_P3P_TYPE(ha)) {
if (IS_QLA8044(ha)) {
if (test_and_clear_bit(ISP_UNRECOVERABLE,
Expand Down Expand Up @@ -5947,11 +5980,9 @@ qla2x00_do_dpc(void *data)
base_vha->relogin_jif = jiffies + HZ;
clear_bit(RELOGIN_NEEDED, &base_vha->dpc_flags);

ql_dbg(ql_dbg_dpc, base_vha, 0x400d,
ql_dbg(ql_dbg_disc, base_vha, 0x400d,
"Relogin scheduled.\n");
qla2x00_relogin(base_vha);
ql_dbg(ql_dbg_dpc, base_vha, 0x400e,
"Relogin end.\n");
qla24xx_post_relogin_work(base_vha);
}
}
loop_resync_check:
Expand Down Expand Up @@ -6211,8 +6242,17 @@ qla2x00_timer(struct timer_list *t)
}

/* Process any deferred work. */
if (!list_empty(&vha->work_list))
start_dpc++;
if (!list_empty(&vha->work_list)) {
unsigned long flags;
bool q = false;

spin_lock_irqsave(&vha->work_lock, flags);
if (!test_and_set_bit(IOCB_WORK_ACTIVE, &vha->dpc_flags))
q = true;
spin_unlock_irqrestore(&vha->work_lock, flags);
if (q)
queue_work(vha->hw->wq, &vha->iocb_work);
}

/*
* FC-NVME
Expand Down

0 comments on commit 9b3e0f4

Please sign in to comment.