From: Hannes Reinecke <hare@suse.de>
To: Bart Van Assche <bvanassche@acm.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org,
Balsundar P <balsundar.p@microsemi.com>,
Adaptec OEM Raid Solutions <aacraid@microsemi.com>
Subject: Re: [PATCH 8/9] aacraid: use scsi_host_busy_iter() in get_num_of_incomplete_fibs()
Date: Tue, 19 Nov 2019 08:06:37 +0100 [thread overview]
Message-ID: <f9f0ee84-10fd-33ac-81bb-e57b35973304@suse.de> (raw)
In-Reply-To: <bcf68366-cb44-b846-1348-d646555f98ba@acm.org>
On 11/19/19 12:06 AM, Bart Van Assche wrote:
> On 11/18/19 1:22 AM, Hannes Reinecke wrote:
>> Use the scsi midlayer helper to traverse the number of outstanding
>> commands. This also eliminates the last usage for the cmd_list
>> functionality so we can drop it.
>>
>> Cc: Balsundar P <balsundar.p@microsemi.com>
>> Cc: Adaptec OEM Raid Solutions <aacraid@microsemi.com>
>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>> ---
>> drivers/scsi/aacraid/linit.c | 81
>> ++++++++++++++++++++++----------------------
>> 1 file changed, 41 insertions(+), 40 deletions(-)
>>
>> diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
>> index ee6bc2f9b80a..db96482c4fdc 100644
>> --- a/drivers/scsi/aacraid/linit.c
>> +++ b/drivers/scsi/aacraid/linit.c
>> @@ -622,54 +622,56 @@ static int aac_ioctl(struct scsi_device *sdev,
>> unsigned int cmd,
>> return aac_do_ioctl(dev, cmd, arg);
>> }
>> -static int get_num_of_incomplete_fibs(struct aac_dev *aac)
>> +struct fib_count_data {
>> + int mlcnt;
>> + int llcnt;
>> + int ehcnt;
>> + int fwcnt;
>> + int krlcnt;
>> +};
>> +
>> +static bool fib_count_iter(struct scsi_cmnd *scmnd, void *data, bool
>> reserved)
>> {
>> + struct fib_count_data *fib_count = data;
>> - unsigned long flags;
>> - struct scsi_device *sdev = NULL;
>> + switch (scmnd->SCp.phase) {
>> + case AAC_OWNER_FIRMWARE:
>> + fib_count->fwcnt++;
>> + break;
>> + case AAC_OWNER_ERROR_HANDLER:
>> + fib_count->ehcnt++;
>> + break;
>> + case AAC_OWNER_LOWLEVEL:
>> + fib_count->llcnt++;
>> + break;
>> + case AAC_OWNER_MIDLEVEL:
>> + fib_count->mlcnt++;
>> + break;
>> + default:
>> + fib_count->krlcnt++;
>> + break;
>> + }
>> + return true;
>> +}
>> +
>> +/* Called during SCSI EH, so we don't need to block requests */
>> +static int get_num_of_incomplete_fibs(struct aac_dev *aac)
>> +{
>> struct Scsi_Host *shost = aac->scsi_host_ptr;
>> - struct scsi_cmnd *scmnd = NULL;
>> struct device *ctrl_dev;
>> + struct fib_count_data fcnt = { };
>> - int mlcnt = 0;
>> - int llcnt = 0;
>> - int ehcnt = 0;
>> - int fwcnt = 0;
>> - int krlcnt = 0;
>> -
>> - __shost_for_each_device(sdev, shost) {
>> - spin_lock_irqsave(&sdev->list_lock, flags);
>> - list_for_each_entry(scmnd, &sdev->cmd_list, list) {
>> - switch (scmnd->SCp.phase) {
>> - case AAC_OWNER_FIRMWARE:
>> - fwcnt++;
>> - break;
>> - case AAC_OWNER_ERROR_HANDLER:
>> - ehcnt++;
>> - break;
>> - case AAC_OWNER_LOWLEVEL:
>> - llcnt++;
>> - break;
>> - case AAC_OWNER_MIDLEVEL:
>> - mlcnt++;
>> - break;
>> - default:
>> - krlcnt++;
>> - break;
>> - }
>> - }
>> - spin_unlock_irqrestore(&sdev->list_lock, flags);
>> - }
>> + scsi_host_busy_iter(shost, fib_count_iter, &fcnt);
>> ctrl_dev = &aac->pdev->dev;
>> - dev_info(ctrl_dev, "outstanding cmd: midlevel-%d\n", mlcnt);
>> - dev_info(ctrl_dev, "outstanding cmd: lowlevel-%d\n", llcnt);
>> - dev_info(ctrl_dev, "outstanding cmd: error handler-%d\n", ehcnt);
>> - dev_info(ctrl_dev, "outstanding cmd: firmware-%d\n", fwcnt);
>> - dev_info(ctrl_dev, "outstanding cmd: kernel-%d\n", krlcnt);
>> + dev_info(ctrl_dev, "outstanding cmd: midlevel-%d\n", fcnt.mlcnt);
>> + dev_info(ctrl_dev, "outstanding cmd: lowlevel-%d\n", fcnt.llcnt);
>> + dev_info(ctrl_dev, "outstanding cmd: error handler-%d\n",
>> fcnt.ehcnt);
>> + dev_info(ctrl_dev, "outstanding cmd: firmware-%d\n", fcnt.fwcnt);
>> + dev_info(ctrl_dev, "outstanding cmd: kernel-%d\n", fcnt.krlcnt);
>> - return mlcnt + llcnt + ehcnt + fwcnt;
>> + return fcnt.mlcnt + fcnt.llcnt + fcnt.ehcnt + fcnt.fwcnt;
>> }
>> static int aac_eh_abort(struct scsi_cmnd* cmd)
>> @@ -1675,7 +1677,6 @@ static int aac_probe_one(struct pci_dev *pdev,
>> const struct pci_device_id *id)
>> shost->irq = pdev->irq;
>> shost->unique_id = unique_id;
>> shost->max_cmd_len = 16;
>> - shost->use_cmd_list = 1;
>> if (aac_cfg_major == AAC_CHARDEV_NEEDS_REINIT)
>> aac_init_char();
>
> Same comment here: could scsi_device_quiesce() and scsi_device_resume()
> have been used instead?
>
We don't need to.
This function is called during SCSI EH when the host is quiesced anyway.
That's what I tried to imply with the added comment on top.
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@suse.de +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 247165 (AG München), GF: Felix Imendörffer
next prev parent reply other threads:[~2019-11-19 7:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 9:21 [PATCHv4 0/9] scsi: remove legacy cmd_list implementation Hannes Reinecke
2019-11-18 9:22 ` [PATCH 1/9] dpt_i2o: rename adpt_i2o_to_scsi() to adpt_i2o_scsi_complete() Hannes Reinecke
2019-11-18 22:54 ` Bart Van Assche
2019-11-18 9:22 ` [PATCH 2/9] scsi: add scsi_host_flush_commands() helper Hannes Reinecke
2019-11-18 22:57 ` Bart Van Assche
2019-11-19 6:52 ` Hannes Reinecke
2019-11-18 9:22 ` [PATCH 3/9] dpt_i2o: use scsi_host_flush_commands() to abort outstanding commands Hannes Reinecke
2019-11-18 22:58 ` Bart Van Assche
2019-11-18 9:22 ` [PATCH 4/9] aacraid: Do not wait for outstanding write commands on synchronize_cache Hannes Reinecke
2019-11-18 9:22 ` [PATCH 5/9] aacraid: use midlayer helper to terminate outstanding commands Hannes Reinecke
2019-11-18 23:00 ` Bart Van Assche
2019-11-18 9:22 ` [PATCH 6/9] scsi: add scsi_host_busy_iter() Hannes Reinecke
2019-11-18 9:22 ` [PATCH 7/9] aacraid: use scsi_host_busy_iter() in aac_wait_for_io_completion() Hannes Reinecke
2019-11-18 23:05 ` Bart Van Assche
2019-11-19 7:05 ` Hannes Reinecke
2019-11-18 9:22 ` [PATCH 8/9] aacraid: use scsi_host_busy_iter() in get_num_of_incomplete_fibs() Hannes Reinecke
2019-11-18 23:06 ` Bart Van Assche
2019-11-19 7:06 ` Hannes Reinecke [this message]
2019-11-18 9:22 ` [PATCH 9/9] scsi: Remove cmd_list functionality 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=f9f0ee84-10fd-33ac-81bb-e57b35973304@suse.de \
--to=hare@suse.de \
--cc=aacraid@microsemi.com \
--cc=balsundar.p@microsemi.com \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.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