From: John Garry <john.garry@huawei.com>
To: <martin.petersen@oracle.com>, <jejb@linux.vnet.ibm.com>
Cc: <linux-scsi@vger.kernel.org>, <linuxarm@huawei.com>,
<linux-kernel@vger.kernel.org>, <john.garry2@mail.dcu.ie>,
John Garry <john.garry@huawei.com>
Subject: [PATCH 10/11] hisi_sas: use atomic64_t for hisi_sas_device.running_req
Date: Mon, 7 Nov 2016 20:48:39 +0800 [thread overview]
Message-ID: <1478522920-108145-11-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1478522920-108145-1-git-send-email-john.garry@huawei.com>
Sometimes the value of hisi_sas_device.running_req
would go negative unless we have the check for
running_req >= 0 before trying to decrement.
This is because using running_req is not thread-safe.
As such, the value for running_req may be actually incorrect,
so use atomic64_t instead.
Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
---
drivers/scsi/hisi_sas/hisi_sas.h | 2 +-
drivers/scsi/hisi_sas/hisi_sas_main.c | 9 +++++----
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 ++--
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index bf59fab..8b5ecc6 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -111,7 +111,7 @@ struct hisi_sas_device {
struct domain_device *sas_device;
u64 attached_phy;
u64 device_id;
- u64 running_req;
+ atomic64_t running_req;
u8 dev_status;
};
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 504cbcf..18e2194 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -162,8 +162,8 @@ static void hisi_sas_slot_abort(struct work_struct *work)
hisi_sas_slot_task_free(hisi_hba, task, abort_slot);
if (task->task_done)
task->task_done(task);
- if (sas_dev && sas_dev->running_req)
- sas_dev->running_req--;
+ if (sas_dev)
+ atomic64_dec(&sas_dev->running_req);
}
static int hisi_sas_task_prep(struct sas_task *task, struct hisi_hba *hisi_hba,
@@ -303,7 +303,7 @@ static int hisi_sas_task_prep(struct sas_task *task, struct hisi_hba *hisi_hba,
hisi_hba->slot_prep = slot;
- sas_dev->running_req++;
+ atomic64_inc(&sas_dev->running_req);
++(*pass);
return 0;
@@ -1027,7 +1027,8 @@ static int hisi_sas_query_task(struct sas_task *task)
hisi_hba->slot_prep = slot;
- sas_dev->running_req++;
+ atomic64_inc(&sas_dev->running_req);
+
/* send abort command to our chip */
hisi_hba->hw->start_delivery(hisi_hba);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index bbc5760..05177fc 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1366,8 +1366,8 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
}
out:
- if (sas_dev && sas_dev->running_req)
- sas_dev->running_req--;
+ if (sas_dev)
+ atomic64_dec(&sas_dev->running_req);
hisi_sas_slot_task_free(hisi_hba, task, slot);
sts = ts->stat;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index cda3baf..e88113a 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -1728,8 +1728,8 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
}
out:
- if (sas_dev && sas_dev->running_req)
- sas_dev->running_req--;
+ if (sas_dev)
+ atomic64_dec(&sas_dev->running_req);
hisi_sas_slot_task_free(hisi_hba, task, slot);
sts = ts->stat;
--
1.9.1
next prev parent reply other threads:[~2016-11-07 12:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 12:48 [PATCH 00/11] hisi_sas: some fixes, improvements, and new features John Garry
2016-11-07 12:48 ` [PATCH 01/11] hisi_sas: add v2 hw support for ECC and AXI bus fatal error John Garry
2016-11-16 1:47 ` Zhangfei Gao
2016-11-23 8:59 ` John Garry
2016-11-23 9:13 ` Zhangfei Gao
2016-11-07 12:48 ` [PATCH 02/11] hisi_sas: alloc queue id of slot according to device id John Garry
2016-11-16 1:41 ` Zhangfei Gao
2016-11-16 10:02 ` John Garry
2016-11-07 12:48 ` [PATCH 03/11] hisi_sas: only process broadcast change in phy_bcast_v2_hw() John Garry
2016-11-16 1:47 ` Zhangfei Gao
2016-11-07 12:48 ` [PATCH 04/11] hisi_sas: fix port form bug in hisi_sas_port_notify_formed() John Garry
2016-11-16 1:43 ` Zhangfei Gao
2016-11-07 12:48 ` [PATCH 05/11] hisi_sas: replace WARN_ON() with dev_warn() for internal abort John Garry
2016-11-23 8:57 ` Zhangfei Gao
2016-11-07 12:48 ` [PATCH 06/11] hisi_sas: modify return value of hisi_sas_query_task() John Garry
2016-11-16 1:50 ` Zhangfei Gao
2016-11-07 12:48 ` [PATCH 07/11] hisi_sas: delete repeated configuration in free_device_v2_hw() John Garry
2016-11-16 1:43 ` Zhangfei Gao
2016-11-07 12:48 ` [PATCH 08/11] hisi_sas: modify some values in get_ata_protocol() John Garry
2016-11-16 1:44 ` Zhangfei Gao
2016-11-07 12:48 ` [PATCH 09/11] hisi_sas: check SATA FIS when directly attaching SATA device John Garry
2016-11-16 1:49 ` Zhangfei Gao
2016-11-07 12:48 ` John Garry [this message]
2016-11-16 1:44 ` [PATCH 10/11] hisi_sas: use atomic64_t for hisi_sas_device.running_req Zhangfei Gao
2016-11-07 12:48 ` [PATCH 11/11] hisi_sas: add PHY set linkrate support for v1 and v2 hw John Garry
2016-11-16 1:48 ` Zhangfei Gao
2016-11-14 23:49 ` [PATCH 00/11] hisi_sas: some fixes, improvements, and new features Martin K. Petersen
2016-11-22 16:41 ` John Garry
2016-11-22 22:01 ` Martin K. Petersen
2016-11-25 11:40 ` John Garry
2016-11-25 14:55 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478522920-108145-11-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=john.garry2@mail.dcu.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®