leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lpfc: Fix crash in vport_delete.

Browse Source 
We inadvertantly took the path to recreate the vport while in a
driver teardown path

Signed-off-by: Dick Kennedy <dick.kennedy@avagotech.com>
Signed-off-by: James Smart <james.smart@avagotech.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
James Smart 2015-05-21 13:55:26 -04:00 committed by James Bottomley
parent ed243d37be
commit cc82355a6e
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/lpfc/lpfc_init.c
View File

@ -4483,7 +4483,13 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,
lpfc_destroy_vport_work_array(phba, vports); lpfc_destroy_vport_work_array(phba, vports);
} }
if (active_vlink_present) { /*
* Don't re-instantiate if vport is marked for deletion.
* If we are here first then vport_delete is going to wait
* for discovery to complete.
*/
if (!(vport->load_flag & FC_UNLOADING) &&
active_vlink_present) {
/* /*
* If there are other active VLinks present, * If there are other active VLinks present,
* re-instantiate the Vlink using FDISC. * re-instantiate the Vlink using FDISC.

8
drivers/scsi/lpfc/lpfc_nportdisc.c
View File

@ -661,7 +661,13 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
lpfc_destroy_vport_work_array(phba, vports); lpfc_destroy_vport_work_array(phba, vports);
} }
if (active_vlink_present) { /*
* Don't re-instantiate if vport is marked for deletion.
* If we are here first then vport_delete is going to wait
* for discovery to complete.
*/
if (!(vport->load_flag & FC_UNLOADING) &&
active_vlink_present) {
/* /*
* If there are other active VLinks present, * If there are other active VLinks present,
* re-instantiate the Vlink using FDISC. * re-instantiate the Vlink using FDISC.

9
drivers/scsi/lpfc/lpfc_vport.c
View File

@ -567,8 +567,8 @@ int
lpfc_vport_delete(struct fc_vport *fc_vport) lpfc_vport_delete(struct fc_vport *fc_vport)
{ {
struct lpfc_nodelist *ndlp = NULL; struct lpfc_nodelist *ndlp = NULL;
struct Scsi_Host *shost = (struct Scsi_Host *) fc_vport->shost;
struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data; struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data;
struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
long timeout; long timeout;
bool ns_ndlp_referenced = false; bool ns_ndlp_referenced = false;
@ -645,8 +645,8 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
} }
/* Remove FC host and then SCSI host with the vport */ /* Remove FC host and then SCSI host with the vport */
fc_remove_host(lpfc_shost_from_vport(vport)); fc_remove_host(shost);
scsi_remove_host(lpfc_shost_from_vport(vport)); scsi_remove_host(shost);
ndlp = lpfc_findnode_did(phba->pport, Fabric_DID); ndlp = lpfc_findnode_did(phba->pport, Fabric_DID);
@ -772,7 +772,8 @@ skip_logo:
* Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi) * Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi)
* does the scsi_host_put() to release the vport. * does the scsi_host_put() to release the vport.
*/ */
if (lpfc_mbx_unreg_vpi(vport)) if (!(vport->vpi_state & LPFC_VPI_REGISTERED) ||
lpfc_mbx_unreg_vpi(vport))
scsi_host_put(shost); scsi_host_put(shost);
} else } else
scsi_host_put(shost); scsi_host_put(shost);