From: Martin Wilck <mwilck@suse.com>
To: Ming Lei <ming.lei@redhat.com>
Cc: Donald Buczek <buczek@molgen.mpg.de>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
James Bottomley <jejb@linux.vnet.ibm.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Don Brace <Don.Brace@microchip.com>,
Kevin Barnett <Kevin.Barnett@microchip.com>,
John Garry <john.garry@huawei.com>,
Paul Menzel <pmenzel@molgen.mpg.de>
Subject: Re: [PATCH] scsi: scsi_host_queue_ready: increase busy count early
Date: Fri, 22 Jan 2021 15:05:48 +0100 [thread overview]
Message-ID: <185aeeb200023f2f38f6c4faa333955719b8b00f.camel@suse.com> (raw)
In-Reply-To: <20210122032340.GB509982@T590>
On Fri, 2021-01-22 at 11:23 +0800, Ming Lei wrote:
> >
> > diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
> > index 2f162603876f..1c452a1c18fd 100644
> > --- a/drivers/scsi/hosts.c
> > +++ b/drivers/scsi/hosts.c
> > @@ -564,6 +564,8 @@ static bool scsi_host_check_in_flight(struct
> > request *rq, void *data,
> > int *count = data;
> > struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq);
> >
> > + /* This pairs with set_bit() in scsi_host_queue_ready() */
> > + smp_mb__before_atomic();
>
> So the above barrier orders atomic_read(&shost->host_blocked) and
> test_bit()?
Yes, I believe the change to SCMD_STATE_INFLIGHT should be visible
before host_blocked is tested. For that, I would need to insert a full
smb_mb() instead of smp_mb_after_atomic() below, though ...
right? Which means that the smp_mb__before_atomic() above could be
removed. The important thing is that if two threads execute
scsi_host_queue_ready() simultaneously, one of them must see the
SCMD_STATE_INFLIGHT bit of the other.
Btw, I realized that calling scsi_host_busy() in
scsi_host_queue_ready() is inefficient, because all we need to know
there is whether the value is > 1; we don't need to iterate through the
entire tag space.
Thanks,
Martin
>
> > if (test_bit(SCMD_STATE_INFLIGHT, &cmd->state))
> > (*count)++;
> >
> > diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> > index b3f14f05340a..0a9a36c349ee 100644
> > --- a/drivers/scsi/scsi_lib.c
> > +++ b/drivers/scsi/scsi_lib.c
> > @@ -1353,8 +1353,12 @@ static inline int
> > scsi_host_queue_ready(struct request_queue *q,
> > if (scsi_host_in_recovery(shost))
> > return 0;
> >
> > + set_bit(SCMD_STATE_INFLIGHT, &cmd->state);
> > + /* This pairs with test_bit() in
> > scsi_host_check_in_flight() */
> > + smp_mb__after_atomic();
> > +
> > if (atomic_read(&shost->host_blocked) > 0) {
> > - if (scsi_host_busy(shost) > 0)
> > + if (scsi_host_busy(shost) > 1)
> > goto starved;
> >
> > /*
> > @@ -1379,8 +1383,6 @@ static inline int
> > scsi_host_queue_ready(struct request_queue *q,
> > spin_unlock_irq(shost->host_lock);
> > }
> >
> > - __set_bit(SCMD_STATE_INFLIGHT, &cmd->state);
> > -
>
> Looks this patch fine.
>
> However, I'd suggest to confirm smartpqi's .can_queue usage first,
> which
> looks one big issue.
>
prev parent reply other threads:[~2021-01-22 14:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 18:45 [PATCH] scsi: scsi_host_queue_ready: increase busy count early mwilck
2021-01-20 20:26 ` John Garry
2021-01-21 12:01 ` Donald Buczek
2021-01-21 12:35 ` John Garry
2021-01-21 12:44 ` Donald Buczek
2021-01-21 13:05 ` John Garry
2021-01-21 23:32 ` Martin Wilck
2021-03-11 16:36 ` Donald Buczek
2021-02-01 22:44 ` Don.Brace
2021-02-02 20:04 ` Don.Brace
2021-02-02 20:48 ` Martin Wilck
2021-02-03 8:49 ` John Garry
2021-02-03 8:58 ` Paul Menzel
2021-02-03 15:30 ` Don.Brace
2021-02-03 15:56 ` Don.Brace
2021-02-03 18:25 ` John Garry
2021-02-03 19:01 ` Don.Brace
2021-02-22 14:23 ` Roger Willcocks
2021-02-23 8:57 ` John Garry
2021-02-23 14:06 ` Roger Willcocks
2021-02-23 16:17 ` John Garry
2021-03-01 14:51 ` Paul Menzel
2021-01-21 9:07 ` Donald Buczek
2021-01-21 10:05 ` Martin Wilck
2021-01-22 0:14 ` Martin Wilck
2021-01-22 3:23 ` Ming Lei
2021-01-22 14:05 ` Martin Wilck [this message]
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=185aeeb200023f2f38f6c4faa333955719b8b00f.camel@suse.com \
--to=mwilck@suse.com \
--cc=Don.Brace@microchip.com \
--cc=Kevin.Barnett@microchip.com \
--cc=buczek@molgen.mpg.de \
--cc=hare@suse.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=john.garry@huawei.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=pmenzel@molgen.mpg.de \
/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).