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

Commit 9d1aa4e1 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Add lock protection around host lookup 



Host lookup via btree is currently protected by the hardware_lock.
Add hardware_lock when modifying btree to store host pointer.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a4239945

drivers/scsi/qla2xxx/qla_init.c

+3 −0
Original line number Diff line number Diff line
@@ -3939,6 +3939,7 @@ qla2x00_configure_hba(scsi_qla_host_t *vha) 
	struct qla_hw_data *ha = vha->hw;

	scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);

	port_id_t id;

	unsigned long flags;



	/* Get host addresses. */

	rval = qla2x00_get_adapter_id(vha,
@@ -4020,7 +4021,9 @@ qla2x00_configure_hba(scsi_qla_host_t *vha) 
	id.b.area = area;

	id.b.al_pa = al_pa;

	id.b.rsvd_1 = 0;

	spin_lock_irqsave(&ha->hardware_lock, flags);

	qlt_update_host_map(vha, id);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	if (!vha->flags.init_done)

		ql_log(ql_log_info, vha, 0x2010,

drivers/scsi/qla2xxx/qla_mid.c

+5 −4
Original line number Diff line number Diff line
@@ -50,10 +50,11 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *vha) 


	spin_lock_irqsave(&ha->vport_slock, flags);

	list_add_tail(&vha->list, &ha->vp_list);

	spin_unlock_irqrestore(&ha->vport_slock, flags);



	spin_lock_irqsave(&ha->hardware_lock, flags);

	qlt_update_vp_map(vha, SET_VP_IDX);



	spin_unlock_irqrestore(&ha->vport_slock, flags);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	mutex_unlock(&ha->vport_lock);

	return vp_id;
@@ -158,9 +159,9 @@ qla24xx_disable_vp(scsi_qla_host_t *vha) 
	atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);



	/* Remove port id from vp target map */

	spin_lock_irqsave(&vha->hw->vport_slock, flags);

	spin_lock_irqsave(&vha->hw->hardware_lock, flags);

	qlt_update_vp_map(vha, RESET_AL_PA);

	spin_unlock_irqrestore(&vha->hw->vport_slock, flags);

	spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);



	qla2x00_mark_vp_devices_dead(vha);

	atomic_set(&vha->vp_state, VP_FAILED);

drivers/scsi/qla2xxx/qla_target.c

+0 −6
Original line number Diff line number Diff line
@@ -7184,20 +7184,14 @@ qlt_update_vp_map(struct scsi_qla_host *vha, int cmd) 


void qlt_update_host_map(struct scsi_qla_host *vha, port_id_t id)

{

	unsigned long flags;

	struct qla_hw_data *ha = vha->hw;



	if (!vha->d_id.b24) {

		spin_lock_irqsave(&ha->vport_slock, flags);

		vha->d_id = id;

		qlt_update_vp_map(vha, SET_AL_PA);

		spin_unlock_irqrestore(&ha->vport_slock, flags);

	} else if (vha->d_id.b24 != id.b24) {

		spin_lock_irqsave(&ha->vport_slock, flags);

		qlt_update_vp_map(vha, RESET_AL_PA);

		vha->d_id = id;

		qlt_update_vp_map(vha, SET_AL_PA);

		spin_unlock_irqrestore(&ha->vport_slock, flags);

	}

}