AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

scsi: hisi_sas: replace spin_lock_irqsave/spin_unlock_restore with spin_lock/spin_unlock

Browse Source 
After changing tasklet to workqueue or threaded irq, some critical
resources are only used on threads (not in interrupt or bottom half of
interrupt), so replace spin_lock_irqsave/spin_unlock_restore with
spin_lock/spin_unlock to protect those critical resources.

Link: https://lore.kernel.org/r/1579522957-4393-3-git-send-email-john.garry@huawei.com
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Xiang Chen 2020-01-20 20:22:32 +08:00 committed by Martin K. Petersen
parent 81f338e970
commit e9dc5e11c9
2 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/scsi/hisi_sas/hisi_sas_main.c
View File

@ -163,13 +163,11 @@ static void hisi_sas_slot_index_clear(struct hisi_hba *hisi_hba, int slot_idx)
static void hisi_sas_slot_index_free(struct hisi_hba *hisi_hba, int slot_idx) static void hisi_sas_slot_index_free(struct hisi_hba *hisi_hba, int slot_idx)
{ {
unsigned long flags;
if (hisi_hba->hw->slot_index_alloc || if (hisi_hba->hw->slot_index_alloc ||
slot_idx >= HISI_SAS_UNRESERVED_IPTT) { slot_idx >= HISI_SAS_UNRESERVED_IPTT) {
spin_lock_irqsave(&hisi_hba->lock, flags); spin_lock(&hisi_hba->lock);
hisi_sas_slot_index_clear(hisi_hba, slot_idx); hisi_sas_slot_index_clear(hisi_hba, slot_idx);
spin_unlock_irqrestore(&hisi_hba->lock, flags); spin_unlock(&hisi_hba->lock);
} }
} }
@ -185,12 +183,11 @@ static int hisi_sas_slot_index_alloc(struct hisi_hba *hisi_hba,
{ {
int index; int index;
void *bitmap = hisi_hba->slot_index_tags; void *bitmap = hisi_hba->slot_index_tags;
unsigned long flags;
if (scsi_cmnd) if (scsi_cmnd)
return scsi_cmnd->request->tag; return scsi_cmnd->request->tag;
spin_lock_irqsave(&hisi_hba->lock, flags); spin_lock(&hisi_hba->lock);
index = find_next_zero_bit(bitmap, hisi_hba->slot_index_count, index = find_next_zero_bit(bitmap, hisi_hba->slot_index_count,
hisi_hba->last_slot_index + 1); hisi_hba->last_slot_index + 1);
if (index >= hisi_hba->slot_index_count) { if (index >= hisi_hba->slot_index_count) {
@ -198,13 +195,13 @@ static int hisi_sas_slot_index_alloc(struct hisi_hba *hisi_hba,
hisi_hba->slot_index_count, hisi_hba->slot_index_count,
HISI_SAS_UNRESERVED_IPTT); HISI_SAS_UNRESERVED_IPTT);
if (index >= hisi_hba->slot_index_count) { if (index >= hisi_hba->slot_index_count) {
spin_unlock_irqrestore(&hisi_hba->lock, flags); spin_unlock(&hisi_hba->lock);
return -SAS_QUEUE_FULL; return -SAS_QUEUE_FULL;
} }
} }
hisi_sas_slot_index_set(hisi_hba, index); hisi_sas_slot_index_set(hisi_hba, index);
hisi_hba->last_slot_index = index; hisi_hba->last_slot_index = index;
spin_unlock_irqrestore(&hisi_hba->lock, flags); spin_unlock(&hisi_hba->lock);
return index; return index;
} }
@ -220,7 +217,6 @@ static void hisi_sas_slot_index_init(struct hisi_hba *hisi_hba)
void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task,
struct hisi_sas_slot *slot) struct hisi_sas_slot *slot)
{ {
unsigned long flags;
int device_id = slot->device_id; int device_id = slot->device_id;
struct hisi_sas_device *sas_dev = &hisi_hba->devices[device_id]; struct hisi_sas_device *sas_dev = &hisi_hba->devices[device_id];
@ -247,9 +243,9 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task,
} }
} }
spin_lock_irqsave(&sas_dev->lock, flags); spin_lock(&sas_dev->lock);
list_del_init(&slot->entry); list_del_init(&slot->entry);
spin_unlock_irqrestore(&sas_dev->lock, flags); spin_unlock(&sas_dev->lock);
memset(slot, 0, offsetof(struct hisi_sas_slot, buf)); memset(slot, 0, offsetof(struct hisi_sas_slot, buf));
@ -489,14 +485,14 @@ static int hisi_sas_task_prep(struct sas_task *task,
slot_idx = rc; slot_idx = rc;
slot = &hisi_hba->slot_info[slot_idx]; slot = &hisi_hba->slot_info[slot_idx];
spin_lock_irqsave(&dq->lock, flags); spin_lock(&dq->lock);
wr_q_index = dq->wr_point; wr_q_index = dq->wr_point;
dq->wr_point = (dq->wr_point + 1) % HISI_SAS_QUEUE_SLOTS; dq->wr_point = (dq->wr_point + 1) % HISI_SAS_QUEUE_SLOTS;
list_add_tail(&slot->delivery, &dq->list); list_add_tail(&slot->delivery, &dq->list);
spin_unlock_irqrestore(&dq->lock, flags); spin_unlock(&dq->lock);
spin_lock_irqsave(&sas_dev->lock, flags); spin_lock(&sas_dev->lock);
list_add_tail(&slot->entry, &sas_dev->list); list_add_tail(&slot->entry, &sas_dev->list);
spin_unlock_irqrestore(&sas_dev->lock, flags); spin_unlock(&sas_dev->lock);
dlvry_queue = dq->id; dlvry_queue = dq->id;
dlvry_queue_slot = wr_q_index; dlvry_queue_slot = wr_q_index;
@ -562,7 +558,6 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags,
{ {
u32 rc; u32 rc;
u32 pass = 0; u32 pass = 0;
unsigned long flags;
struct hisi_hba *hisi_hba; struct hisi_hba *hisi_hba;
struct device *dev; struct device *dev;
struct domain_device *device = task->dev; struct domain_device *device = task->dev;
@ -606,9 +601,9 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags,
dev_err(dev, "task exec: failed[%d]!\n", rc); dev_err(dev, "task exec: failed[%d]!\n", rc);
if (likely(pass)) { if (likely(pass)) {
spin_lock_irqsave(&dq->lock, flags); spin_lock(&dq->lock);
hisi_hba->hw->start_delivery(dq); hisi_hba->hw->start_delivery(dq);
spin_unlock_irqrestore(&dq->lock, flags); spin_unlock(&dq->lock);
} }
return rc; return rc;
@ -659,12 +654,11 @@ static struct hisi_sas_device *hisi_sas_alloc_dev(struct domain_device *device)
{ {
struct hisi_hba *hisi_hba = dev_to_hisi_hba(device); struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
struct hisi_sas_device *sas_dev = NULL; struct hisi_sas_device *sas_dev = NULL;
unsigned long flags;
int last = hisi_hba->last_dev_id; int last = hisi_hba->last_dev_id;
int first = (hisi_hba->last_dev_id + 1) % HISI_SAS_MAX_DEVICES; int first = (hisi_hba->last_dev_id + 1) % HISI_SAS_MAX_DEVICES;
int i; int i;
spin_lock_irqsave(&hisi_hba->lock, flags); spin_lock(&hisi_hba->lock);
for (i = first; i != last; i %= HISI_SAS_MAX_DEVICES) { for (i = first; i != last; i %= HISI_SAS_MAX_DEVICES) {
if (hisi_hba->devices[i].dev_type == SAS_PHY_UNUSED) { if (hisi_hba->devices[i].dev_type == SAS_PHY_UNUSED) {
int queue = i % hisi_hba->queue_count; int queue = i % hisi_hba->queue_count;
@ -684,7 +678,7 @@ static struct hisi_sas_device *hisi_sas_alloc_dev(struct domain_device *device)
i++; i++;
} }
hisi_hba->last_dev_id = i; hisi_hba->last_dev_id = i;
spin_unlock_irqrestore(&hisi_hba->lock, flags); spin_unlock(&hisi_hba->lock);
return sas_dev; return sas_dev;
} }
@ -1965,14 +1959,14 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id,
slot_idx = rc; slot_idx = rc;
slot = &hisi_hba->slot_info[slot_idx]; slot = &hisi_hba->slot_info[slot_idx];
spin_lock_irqsave(&dq->lock, flags); spin_lock(&dq->lock);
wr_q_index = dq->wr_point; wr_q_index = dq->wr_point;
dq->wr_point = (dq->wr_point + 1) % HISI_SAS_QUEUE_SLOTS; dq->wr_point = (dq->wr_point + 1) % HISI_SAS_QUEUE_SLOTS;
list_add_tail(&slot->delivery, &dq->list); list_add_tail(&slot->delivery, &dq->list);
spin_unlock_irqrestore(&dq->lock, flags); spin_unlock(&dq->lock);
spin_lock_irqsave(&sas_dev->lock, flags); spin_lock(&sas_dev->lock);
list_add_tail(&slot->entry, &sas_dev->list); list_add_tail(&slot->entry, &sas_dev->list);
spin_unlock_irqrestore(&sas_dev->lock, flags); spin_unlock(&sas_dev->lock);
dlvry_queue = dq->id; dlvry_queue = dq->id;
dlvry_queue_slot = wr_q_index; dlvry_queue_slot = wr_q_index;
@ -2001,9 +1995,9 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id,
spin_unlock_irqrestore(&task->task_state_lock, flags); spin_unlock_irqrestore(&task->task_state_lock, flags);
WRITE_ONCE(slot->ready, 1); WRITE_ONCE(slot->ready, 1);
/* send abort command to the chip */ /* send abort command to the chip */
spin_lock_irqsave(&dq->lock, flags); spin_lock(&dq->lock);
hisi_hba->hw->start_delivery(dq); hisi_hba->hw->start_delivery(dq);
spin_unlock_irqrestore(&dq->lock, flags); spin_unlock(&dq->lock);
return 0; return 0;

12
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
View File

@ -773,7 +773,6 @@ slot_index_alloc_quirk_v2_hw(struct hisi_hba *hisi_hba,
struct hisi_sas_device *sas_dev = device->lldd_dev; struct hisi_sas_device *sas_dev = device->lldd_dev;
int sata_idx = sas_dev->sata_idx; int sata_idx = sas_dev->sata_idx;
int start, end; int start, end;
unsigned long flags;
if (!sata_dev) { if (!sata_dev) {
/* /*
@ -797,12 +796,12 @@ slot_index_alloc_quirk_v2_hw(struct hisi_hba *hisi_hba,
end = 64 * (sata_idx + 2); end = 64 * (sata_idx + 2);
} }
spin_lock_irqsave(&hisi_hba->lock, flags); spin_lock(&hisi_hba->lock);
while (1) { while (1) {
start = find_next_zero_bit(bitmap, start = find_next_zero_bit(bitmap,
hisi_hba->slot_index_count, start); hisi_hba->slot_index_count, start);
if (start >= end) { if (start >= end) {
spin_unlock_irqrestore(&hisi_hba->lock, flags); spin_unlock(&hisi_hba->lock);
return -SAS_QUEUE_FULL; return -SAS_QUEUE_FULL;
} }
/* /*
@ -814,7 +813,7 @@ slot_index_alloc_quirk_v2_hw(struct hisi_hba *hisi_hba,
} }
set_bit(start, bitmap); set_bit(start, bitmap);
spin_unlock_irqrestore(&hisi_hba->lock, flags); spin_unlock(&hisi_hba->lock);
return start; return start;
} }
@ -843,9 +842,8 @@ hisi_sas_device *alloc_dev_quirk_v2_hw(struct domain_device *device)
struct hisi_sas_device *sas_dev = NULL; struct hisi_sas_device *sas_dev = NULL;
int i, sata_dev = dev_is_sata(device); int i, sata_dev = dev_is_sata(device);
int sata_idx = -1; int sata_idx = -1;
unsigned long flags;
spin_lock_irqsave(&hisi_hba->lock, flags); spin_lock(&hisi_hba->lock);
if (sata_dev) if (sata_dev)
if (!sata_index_alloc_v2_hw(hisi_hba, &sata_idx)) if (!sata_index_alloc_v2_hw(hisi_hba, &sata_idx))
@ -876,7 +874,7 @@ hisi_sas_device *alloc_dev_quirk_v2_hw(struct domain_device *device)
} }
out: out:
spin_unlock_irqrestore(&hisi_hba->lock, flags); spin_unlock(&hisi_hba->lock);
return sas_dev; return sas_dev;
} }