Skip to content

Commit

Permalink
[SCSI] qla2xxx: Explicitly tear-down vports during PCI remove_one().
Browse files Browse the repository at this point in the history
During internal testing, we've seen issues (hangs) with the
'deferred' vport tear-down-processing typically accompanied with
the fc_remove_host() call.  This is due to the current
implementation's back-end vport handling being performed by the
physical-HA's DPC thread where premature shutdown could lead to
latent vport requests without a processor.

This should also address a problem reported by Gal Rosen
(http://marc.info/?l=linux-scsi&m=121731664417358&w=2) where the
driver would attempt to awaken a previously torn-down DPC thread
from interrupt context by implicitly calling wake_up_process()
rather than the driver's qla2xxx_wake_dpc() helper.  Rather, than
reshuffle the remove_one() device-removal code, during unload,
depend on the driver's timer to wake-up the DPC process, by
limiting wake-ups based on an 'unloading' flag.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Andrew Vasquez authored and James Bottomley committed Aug 16, 2008
1 parent 19851f1 commit c795c1e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions drivers/scsi/qla2xxx/qla_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -2237,6 +2237,7 @@ typedef struct scsi_qla_host {
#define REGISTER_FDMI_NEEDED 26
#define FCPORT_UPDATE_NEEDED 27
#define VP_DPC_NEEDED 28 /* wake up for VP dpc handling */
#define UNLOADING 29

uint32_t device_flags;
#define DFLG_LOCAL_DEVICES BIT_0
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/qla2xxx/qla_mbx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2686,7 +2686,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *ha,
set_bit(VP_IDX_ACQUIRED, &vha->vp_flags);
set_bit(VP_DPC_NEEDED, &ha->dpc_flags);

wake_up_process(ha->dpc_thread);
qla2xxx_wake_dpc(ha);
}
}

Expand Down
13 changes: 10 additions & 3 deletions drivers/scsi/qla2xxx/qla_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -1775,10 +1775,15 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
static void
qla2x00_remove_one(struct pci_dev *pdev)
{
scsi_qla_host_t *ha;
scsi_qla_host_t *ha, *vha, *temp;

ha = pci_get_drvdata(pdev);

list_for_each_entry_safe(vha, temp, &ha->vp_list, vp_list)
fc_vport_terminate(vha->fc_vport);

set_bit(UNLOADING, &ha->dpc_flags);

qla2x00_dfs_remove(ha);

qla84xx_put_chip(ha);
Expand Down Expand Up @@ -2450,8 +2455,10 @@ qla2x00_do_dpc(void *data)
void
qla2xxx_wake_dpc(scsi_qla_host_t *ha)
{
if (ha->dpc_thread)
wake_up_process(ha->dpc_thread);
struct task_struct *t = ha->dpc_thread;

if (!test_bit(UNLOADING, &ha->dpc_flags) && t)
wake_up_process(t);
}

/*
Expand Down

0 comments on commit c795c1e

Please sign in to comment.