Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43ebf16d authored by Arun Easi's avatar Arun Easi Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Fix hang during driver unload when vport is active. 



Bumping ref count during fc_vport_terminate() was the cause. vport
delete would wait for ref count to drop to zero and that would never
happen.

Cc: stable@kernel.org
Signed-off-by: default avatarArun Easi <arun.easi@qlogic.com>
Signed-off-by: default avatarMadhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent fa96d927

drivers/scsi/qla2xxx/qla_os.c

+15 −10
Original line number Diff line number Diff line
@@ -2368,21 +2368,26 @@ qla2x00_remove_one(struct pci_dev *pdev) 
	base_vha = pci_get_drvdata(pdev);

	ha = base_vha->hw;



	mutex_lock(&ha->vport_lock);

	while (ha->cur_vport_count) {

		struct Scsi_Host *scsi_host;



		spin_lock_irqsave(&ha->vport_slock, flags);

	list_for_each_entry(vha, &ha->vp_list, list) {

		atomic_inc(&vha->vref_count);



		if (vha->fc_vport) {

		BUG_ON(base_vha->list.next == &ha->vp_list);

		/* This assumes first entry in ha->vp_list is always base vha */

		vha = list_first_entry(&base_vha->list, scsi_qla_host_t, list);

		scsi_host = scsi_host_get(vha->host);



		spin_unlock_irqrestore(&ha->vport_slock, flags);

		mutex_unlock(&ha->vport_lock);



		fc_vport_terminate(vha->fc_vport);

		scsi_host_put(vha->host);



			spin_lock_irqsave(&ha->vport_slock, flags);

		}



		atomic_dec(&vha->vref_count);

		mutex_lock(&ha->vport_lock);

	}

	spin_unlock_irqrestore(&ha->vport_slock, flags);

	mutex_unlock(&ha->vport_lock);



	set_bit(UNLOADING, &base_vha->dpc_flags);