From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
Bart van Assche <bvanassche@acm.org>,
John Garry <john.garry@huawei.com>,
Don Brace <don.brace@microchip.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 16/21] hpsa: use scsi_host_busy_iter() to traverse outstanding commands
Date: Fri, 3 Jul 2020 15:01:17 +0200 [thread overview]
Message-ID: <20200703130122.111448-17-hare@suse.de> (raw)
In-Reply-To: <20200703130122.111448-1-hare@suse.de>
Replace all hand-crafted command iterations with
scsi_host_busy_iter() calls.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/hpsa.c | 117 ++++++++++++++++++++++++++++++----------------------
1 file changed, 67 insertions(+), 50 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a3212d0e0dc2..6f0ef39471ce 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1816,30 +1816,26 @@ static int hpsa_add_device(struct ctlr_info *h, struct hpsa_scsi_dev_t *device)
return rc;
}
-static int hpsa_find_outstanding_commands_for_dev(struct ctlr_info *h,
- struct hpsa_scsi_dev_t *dev)
-{
- int i;
- int count = 0;
-
- for (i = 0; i < h->nr_cmds; i++) {
- struct CommandList *c = h->cmd_pool + i;
- int refcount = atomic_inc_return(&c->refcount);
-
- if (refcount > 1 && hpsa_cmd_dev_match(h, c, dev,
- dev->scsi3addr)) {
- unsigned long flags;
+struct hpsa_command_iter_data {
+ struct ctlr_info *h;
+ struct hpsa_scsi_dev_t *dev;
+ unsigned char *scsi3addr;
+ int count;
+};
- spin_lock_irqsave(&h->lock, flags); /* Implied MB */
- if (!hpsa_is_cmd_idle(c))
- ++count;
- spin_unlock_irqrestore(&h->lock, flags);
- }
+static bool hpsa_find_outstanding_commands_iter(struct scsi_cmnd *sc,
+ void *data, bool reserved)
+{
+ struct hpsa_command_iter_data *iter_data = data;
+ struct ctlr_info *h = iter_data->h;
+ struct hpsa_scsi_dev_t *dev = iter_data->dev;
+ struct CommandList *c = h->cmd_pool + sc->request->tag;
- cmd_free(h, c);
+ if (hpsa_cmd_dev_match(h, c, dev, dev->scsi3addr)) {
+ iter_data->count++;
+ return false;
}
-
- return count;
+ return true;
}
#define NUM_WAIT 20
@@ -1849,13 +1845,20 @@ static void hpsa_wait_for_outstanding_commands_for_dev(struct ctlr_info *h,
int cmds = 0;
int waits = 0;
int num_wait = NUM_WAIT;
+ struct hpsa_command_iter_data iter_data = {
+ .h = h,
+ .dev = device,
+ };
if (device->external)
num_wait = HPSA_EH_PTRAID_TIMEOUT;
while (1) {
- cmds = hpsa_find_outstanding_commands_for_dev(h, device);
- if (cmds == 0)
+ iter_data.count = 0;
+ scsi_host_busy_iter(h->scsi_host,
+ hpsa_find_outstanding_commands_iter,
+ &iter_data);
+ if (iter_data.count == 0)
break;
if (++waits > num_wait)
break;
@@ -8134,27 +8137,34 @@ static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h)
kfree(h); /* init_one 1 */
}
+static bool fail_all_outstanding_cmds_iter(struct scsi_cmnd *sc, void *data,
+ bool reserved)
+{
+ struct hpsa_command_iter_data *iter_data = data;
+ struct ctlr_info *h = iter_data->h;
+ struct CommandList *c = h->cmd_pool + sc->request->tag;
+
+ c->err_info->CommandStatus = CMD_CTLR_LOCKUP;
+ finish_cmd(c);
+ atomic_dec(&h->commands_outstanding);
+ iter_data->count++;
+
+ return true;
+}
+
/* Called when controller lockup detected. */
static void fail_all_outstanding_cmds(struct ctlr_info *h)
{
- int i, refcount;
- struct CommandList *c;
- int failcount = 0;
+ struct hpsa_command_iter_data iter_data = {
+ .h = h,
+ .count = 0,
+ };
flush_workqueue(h->resubmit_wq); /* ensure all cmds are fully built */
- for (i = 0; i < h->nr_cmds; i++) {
- c = h->cmd_pool + i;
- refcount = atomic_inc_return(&c->refcount);
- if (refcount > 1) {
- c->err_info->CommandStatus = CMD_CTLR_LOCKUP;
- finish_cmd(c);
- atomic_dec(&h->commands_outstanding);
- failcount++;
- }
- cmd_free(h, c);
- }
+ scsi_host_busy_iter(h->scsi_host,
+ fail_all_outstanding_cmds_iter, &iter_data);
dev_warn(&h->pdev->dev,
- "failed %d commands in fail_all\n", failcount);
+ "failed %d commands in fail_all\n", iter_data.count);
}
static void set_lockup_detected_for_all_cpus(struct ctlr_info *h, u32 value)
@@ -9454,22 +9464,29 @@ static int is_accelerated_cmd(struct CommandList *c)
return c->cmd_type == CMD_IOACCEL1 || c->cmd_type == CMD_IOACCEL2;
}
+static bool hpsa_drain_accel_commands_iter(struct scsi_cmnd *sc, void *data,
+ bool reserved)
+{
+ struct hpsa_command_iter_data *iter_data = data;
+ struct ctlr_info *h = iter_data->h;
+ struct CommandList *c = h->cmd_pool + sc->request->tag;
+
+ iter_data->count += is_accelerated_cmd(c);
+ return true;
+}
+
static void hpsa_drain_accel_commands(struct ctlr_info *h)
{
- struct CommandList *c = NULL;
- int i, accel_cmds_out;
- int refcount;
+ struct hpsa_command_iter_data iter_data = {
+ .h = h,
+ };
do { /* wait for all outstanding ioaccel commands to drain out */
- accel_cmds_out = 0;
- for (i = 0; i < h->nr_cmds; i++) {
- c = h->cmd_pool + i;
- refcount = atomic_inc_return(&c->refcount);
- if (refcount > 1) /* Command is allocated */
- accel_cmds_out += is_accelerated_cmd(c);
- cmd_free(h, c);
- }
- if (accel_cmds_out <= 0)
+ iter_data.count = 0;
+ scsi_host_busy_iter(h->scsi_host,
+ hpsa_drain_accel_commands_iter,
+ &iter_data);
+ if (iter_data.count <= 0)
break;
msleep(100);
} while (1);
--
2.16.4
next prev parent reply other threads:[~2020-07-03 13:01 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 13:01 [PATCHv6 00/21] scsi: enable reserved commands for LLDDs Hannes Reinecke
2020-07-03 13:01 ` [PATCH 01/21] scsi: drop gdth driver Hannes Reinecke
2020-07-03 13:01 ` [PATCH 02/21] block: add flag for internal commands Hannes Reinecke
2020-07-08 9:27 ` John Garry
2020-07-09 20:02 ` Jens Axboe
2020-07-17 10:32 ` John Garry
2020-07-03 13:01 ` [PATCH 03/21] scsi: add scsi_{get,put}_internal_cmd() helper Hannes Reinecke
2020-07-07 13:54 ` John Garry
2020-11-16 8:56 ` John Garry
2020-11-16 9:03 ` Hannes Reinecke
2020-11-18 12:28 ` John Garry
2020-12-07 10:15 ` John Garry
2020-12-07 15:52 ` Hannes Reinecke
2020-07-03 13:01 ` [PATCH 04/21] fnic: use internal commands Hannes Reinecke
2020-07-03 13:01 ` [PATCH 05/21] fnic: use scsi_host_busy_iter() to traverse commands Hannes Reinecke
2020-07-03 13:01 ` [PATCH 06/21] fnic: check for started requests in fnic_wq_copy_cleanup_handler() Hannes Reinecke
2020-07-03 13:01 ` [PATCH 07/21] scsi: use real inquiry data when initialising devices Hannes Reinecke
2020-07-03 13:01 ` [PATCH 08/21] scsi: Use dummy inquiry data for the host device Hannes Reinecke
2020-07-03 13:01 ` [PATCH 09/21] scsi: revamp host device handling Hannes Reinecke
2020-07-03 13:01 ` [PATCH 10/21] snic: use reserved commands Hannes Reinecke
2020-07-08 11:08 ` John Garry
2020-07-08 11:18 ` Hannes Reinecke
2020-07-03 13:01 ` [PATCH 11/21] snic: use tagset iter for traversing commands Hannes Reinecke
2020-07-03 13:01 ` [PATCH 12/21] snic: check for started requests in snic_hba_reset_cmpl_handler() Hannes Reinecke
2020-07-03 13:01 ` [PATCH 13/21] scsi: implement reserved command handling Hannes Reinecke
2020-07-08 9:39 ` John Garry
2020-07-03 13:01 ` [PATCH 14/21] hpsa: move hpsa_hba_inquiry after scsi_add_host() Hannes Reinecke
2020-07-03 13:01 ` [PATCH 15/21] hpsa: use reserved commands Hannes Reinecke
2020-07-03 13:01 ` Hannes Reinecke [this message]
2020-07-03 13:01 ` [PATCH 17/21] hpsa: drop refcount field from CommandList Hannes Reinecke
2020-07-03 13:01 ` [PATCH 18/21] aacraid: move scsi_add_host() Hannes Reinecke
2020-07-03 13:01 ` [PATCH 19/21] aacraid: store target id in host_scribble Hannes Reinecke
2020-07-03 13:01 ` [PATCH 20/21] aacraid: use scsi_get_internal_cmd() Hannes Reinecke
2020-07-03 13:01 ` [PATCH 21/21] aacraid: use scsi_host_busy_iter() to traverse outstanding commands Hannes Reinecke
2020-10-27 15:27 ` [PATCHv6 00/21] scsi: enable reserved commands for LLDDs John Garry
2020-10-27 15:53 ` Hannes Reinecke
2020-10-27 16:59 ` John Garry
2020-10-27 17:07 ` Hannes Reinecke
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=20200703130122.111448-17-hare@suse.de \
--to=hare@suse.de \
--cc=bvanassche@acm.org \
--cc=don.brace@microchip.com \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=john.garry@huawei.com \
--cc=linux-scsi@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).