Commit 54c9dd2d authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: fix some sas_task.task_state_lock locking 



Some more locking needs to be added/modified for when
read-modify-writing sas_task.task_state_flags.

Note: since we can attempt to grab this lock in interrupt
      context we should use irq variant of spin_lock.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6131243a

drivers/scsi/hisi_sas/hisi_sas_main.c

+6 −7
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static int hisi_sas_task_prep(struct sas_task *task, struct hisi_hba *hisi_hba, 
	struct asd_sas_port *sas_port = device->port;

	struct device *dev = &hisi_hba->pdev->dev;

	int dlvry_queue_slot, dlvry_queue, n_elem = 0, rc, slot_idx;

	unsigned long flags;



	if (!sas_port) {

		struct task_status_struct *ts = &task->task_status;
@@ -308,9 +309,9 @@ static int hisi_sas_task_prep(struct sas_task *task, struct hisi_hba *hisi_hba, 
	}



	list_add_tail(&slot->entry, &sas_dev->list);

	spin_lock(&task->task_state_lock);

	spin_lock_irqsave(&task->task_state_lock, flags);

	task->task_state_flags |= SAS_TASK_AT_INITIATOR;

	spin_unlock(&task->task_state_lock);

	spin_unlock_irqrestore(&task->task_state_lock, flags);



	hisi_hba->slot_prep = slot;
@@ -922,14 +923,11 @@ static int hisi_sas_abort_task(struct sas_task *task) 
		return TMF_RESP_FUNC_FAILED;

	}



	spin_lock_irqsave(&task->task_state_lock, flags);

	if (task->task_state_flags & SAS_TASK_STATE_DONE) {

		spin_unlock_irqrestore(&task->task_state_lock, flags);

		rc = TMF_RESP_FUNC_COMPLETE;

		goto out;

	}



	spin_unlock_irqrestore(&task->task_state_lock, flags);

	sas_dev->dev_status = HISI_SAS_DEV_EH;

	if (task->lldd_task && task->task_proto & SAS_PROTOCOL_SSP) {

		struct scsi_cmnd *cmnd = task->uldd_task;
@@ -1127,6 +1125,7 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, u64 device_id, 
	struct asd_sas_port *sas_port = device->port;

	struct hisi_sas_cmd_hdr *cmd_hdr_base;

	int dlvry_queue_slot, dlvry_queue, n_elem = 0, rc, slot_idx;

	unsigned long flags;



	if (unlikely(test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags)))

		return -EINVAL;
@@ -1167,9 +1166,9 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, u64 device_id, 




	list_add_tail(&slot->entry, &sas_dev->list);

	spin_lock(&task->task_state_lock);

	spin_lock_irqsave(&task->task_state_lock, flags);

	task->task_state_flags |= SAS_TASK_AT_INITIATOR;

	spin_unlock(&task->task_state_lock);

	spin_unlock_irqrestore(&task->task_state_lock, flags);



	hisi_hba->slot_prep = slot;

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+3 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,7 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba, 
	struct hisi_sas_complete_v1_hdr *complete_queue =

			hisi_hba->complete_hdr[slot->cmplt_queue];

	struct hisi_sas_complete_v1_hdr *complete_hdr;

	unsigned long flags;

	u32 cmplt_hdr_data;



	complete_hdr = &complete_queue[slot->cmplt_queue_slot];
@@ -1300,9 +1301,11 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba, 
	device = task->dev;

	sas_dev = device->lldd_dev;



	spin_lock_irqsave(&task->task_state_lock, flags);

	task->task_state_flags &=

		~(SAS_TASK_STATE_PENDING | SAS_TASK_AT_INITIATOR);

	task->task_state_flags |= SAS_TASK_STATE_DONE;

	spin_unlock_irqrestore(&task->task_state_lock, flags);



	memset(ts, 0, sizeof(*ts));

	ts->resp = SAS_TASK_COMPLETE;

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+5 −2
Original line number Diff line number Diff line
@@ -1737,6 +1737,7 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 
			hisi_hba->complete_hdr[slot->cmplt_queue];

	struct hisi_sas_complete_v2_hdr *complete_hdr =

			&complete_queue[slot->cmplt_queue_slot];

	unsigned long flags;

	int aborted;



	if (unlikely(!task || !task->lldd_task || !task->dev))
@@ -1746,11 +1747,11 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 
	device = task->dev;

	sas_dev = device->lldd_dev;



	spin_lock(&task->task_state_lock);

	spin_lock_irqsave(&task->task_state_lock, flags);

	aborted = task->task_state_flags & SAS_TASK_STATE_ABORTED;

	task->task_state_flags &=

		~(SAS_TASK_STATE_PENDING | SAS_TASK_AT_INITIATOR);

	spin_unlock(&task->task_state_lock);

	spin_unlock_irqrestore(&task->task_state_lock, flags);



	memset(ts, 0, sizeof(*ts));

	ts->resp = SAS_TASK_COMPLETE;
@@ -1849,7 +1850,9 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 
	}



out:

	spin_lock_irqsave(&task->task_state_lock, flags);

	task->task_state_flags |= SAS_TASK_STATE_DONE;

	spin_unlock_irqrestore(&task->task_state_lock, flags);

	hisi_sas_slot_task_free(hisi_hba, task, slot);

	sts = ts->stat;

CRA Git | Maintained and supported by SUSTech CRA and CCSE