Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1606754

[PATCH 13/23] scsi: hisi_sas: fix some sas_task.task_state_lock locking

From John Garry <john.garry@huawei.com>
Newsgroups linux.kernel
Subject [PATCH 13/23] scsi: hisi_sas: fix some sas_task.task_state_lock locking
Date 2017-03-22 18:00 +0100
Message-ID <tnRM6-5ys-25@gated-at.bofh.it> (permalink)
References <tnRM5-5ys-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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: John Garry <john.garry@huawei.com>
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
---
 drivers/scsi/hisi_sas/hisi_sas_main.c  | 13 ++++++-------
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c |  3 +++
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |  7 +++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 49cac22..f9ea5cc 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -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 @@ static int hisi_sas_query_task(struct sas_task *task)
 	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 @@ static int hisi_sas_query_task(struct sas_task *task)
 
 
 	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;
 
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 2f3e877..fc1c1b2 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -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;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index f4d8200..2b6e64c 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -1737,6 +1737,7 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
 			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 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
 	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 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
 	}
 
 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;
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/23] hisi_sas: error handling and other misc fixes and improvements John Garry <john.garry@huawei.com> - 2017-03-22 18:00 +0100
  [PATCH 13/23] scsi: hisi_sas: fix some sas_task.task_state_lock locking John Garry <john.garry@huawei.com> - 2017-03-22 18:00 +0100
  [PATCH 12/23] scsi: hisi_sas: free slots after hardreset John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 10/23] scsi: hisi_sas: hardreset for SATA disk in LU reset John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 09/23] scsi: hisi_sas: modify hisi_sas_abort_task() for SSP John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 14/23] scsi: hisi_sas: remove task free'ing for timeouts John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 06/23] scsi: hisi_sas: error hisi_sas_task_prep() when port down John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 15/23] scsi: hisi_sas: process error codes according to their priority John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 02/23] scsi: hisi_sas: add controller reset John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 19/23] scsi: hisi_sas: add hisi_sas_clear_nexus_ha() John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 22/23] scsi: hisi_sas: use dev_is_sata to identify SATA or SAS disk John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 17/23] scsi: hisi_sas: handle PHY UP+DOWN simultaneous irq John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 05/23] scsi: hisi_sas: remove hisi_sas_port_deformed() John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 16/23] scsi: hisi_sas: some modifications to v2 hw reg init values John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 04/23] scsi: hisi_sas: add softreset function for SATA disk John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 20/23] scsi: hisi_sas: release SMP slot in lldd_abort_task John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  [PATCH 03/23] scsi: hisi_sas: move PHY init to hisi_sas_scan_start() John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100
  Re: [PATCH 00/23] hisi_sas: error handling and other misc fixes and improvements "Martin K. Petersen" <martin.petersen@oracle.com> - 2017-03-23 16:20 +0100

csiph-web