From: Kashyap Desai <kashyap.desai@broadcom.com>
To: John Garry <john.garry@huawei.com>, linux-scsi@vger.kernel.org
Cc: Sumit Saxena <sumit.saxena@broadcom.com>,
Chandrakanth Patil <chandrakanth.patil@broadcom.com>,
linux-block@vger.kernel.org
Subject: RE: [PATCH v1 1/3] add io_uring with IOPOLL support in scsi layer
Date: Mon, 30 Nov 2020 13:11:53 +0530 [thread overview]
Message-ID: <ba2f9cb923dc61e523e4ae41db615f9b@mail.gmail.com> (raw)
In-Reply-To: <0531d781-38ed-0098-d5b8-727a3e143dde@huawei.com>
[-- Attachment #1: Type: text/plain, Size: 3929 bytes --]
> > diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index
> > 72b12102f777..5a3c383a2bb3 100644
> > --- a/drivers/scsi/scsi_lib.c
> > +++ b/drivers/scsi/scsi_lib.c
> > @@ -1766,6 +1766,19 @@ static void scsi_mq_exit_request(struct
> blk_mq_tag_set *set, struct request *rq,
> > cmd->sense_buffer);
> > }
> >
> > +
> > +static int scsi_mq_poll(struct blk_mq_hw_ctx *hctx) {
> > + struct request_queue *q = hctx->queue;
> > + struct scsi_device *sdev = q->queuedata;
> > + struct Scsi_Host *shost = sdev->host;
>
> could we separately set hctx->driver_data = shost or similar for a quicker
> lookup? I don't see hctx->driver_data set for SCSI currently.
> Going through the scsi_device looks strange - I know that it is done in
> scsi_commit_rqs.
John - I have included your comments. Below is add-on patch which handles
all your comment except one.
Below is just compiled (not tested patch). Please let me know if you like to
handle "scsi_init_hctx" in this patch or shall we do it as a separate patch
(out of this patch series.) ?
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1769,9 +1769,7 @@ static void scsi_mq_exit_request(struct blk_mq_tag_set
*set, struct request *rq,
static int scsi_mq_poll(struct blk_mq_hw_ctx *hctx)
{
- struct request_queue *q = hctx->queue;
- struct scsi_device *sdev = q->queuedata;
- struct Scsi_Host *shost = sdev->host;
+ struct Scsi_Host *shost = hctx->driver_data;
if (shost->hostt->mq_poll)
return shost->hostt->mq_poll(shost, hctx->queue_num);
@@ -1779,6 +1777,14 @@ static int scsi_mq_poll(struct blk_mq_hw_ctx *hctx)
return 0;
}
+static int scsi_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
+ unsigned int hctx_idx)
+{
+ struct Scsi_Host *shost = data;
+ hctx->driver_data = shost;
+ return 0;
+}
+
static int scsi_map_queues(struct blk_mq_tag_set *set)
{
struct Scsi_Host *shost = container_of(set, struct Scsi_Host,
tag_set);
@@ -1846,6 +1852,7 @@ static const struct blk_mq_ops scsi_mq_ops_no_commit =
{
.cleanup_rq = scsi_cleanup_rq,
.busy = scsi_mq_lld_busy,
.map_queues = scsi_map_queues,
+ .init_hctx = scsi_init_hctx,
.poll = scsi_mq_poll,
};
@@ -1875,6 +1882,7 @@ static const struct blk_mq_ops scsi_mq_ops = {
.cleanup_rq = scsi_cleanup_rq,
.busy = scsi_mq_lld_busy,
.map_queues = scsi_map_queues,
+ .init_hctx = scsi_init_hctx,
.poll = scsi_mq_poll,
};
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 5844374a85b1..cc30df96f5f7 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -9,8 +9,8 @@
#include <linux/types.h>
#include <linux/timer.h>
#include <linux/scatterlist.h>
-#include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
#include <scsi/scsi_request.h>
struct Scsi_Host;
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 905ee6b00c55..a0cda0f66b84 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -274,7 +274,7 @@ struct scsi_host_template {
* SCSI interface of blk_poll - poll for IO completions.
* Possible interface only if scsi LLD expose multiple h/w queues.
*
- * Return values: Number of completed entries found.
+ * Return value: Number of completed entries found.
*
* Status: OPTIONAL
*/
>
> > +
> > + if (shost->hostt->mq_poll)
>
> to avoid this check, could we reject if .mq_poll is not set and
> HCTX_TYPE_POLL is?
Is this urgent or shall we improve later ? I am not able to figure out how
you want to manage this ? Can you explain little bit ?
Kashyap
>
> > + return shost->hostt->mq_poll(shost, hctx->queue_num);
> > +
> > + return 0;
> > +}
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4169 bytes --]
next prev parent reply other threads:[~2020-11-30 7:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 13:36 [PATCH v1 1/3] add io_uring with IOPOLL support in scsi layer Kashyap Desai
2020-11-13 11:51 ` John Garry
2020-11-30 7:41 ` Kashyap Desai [this message]
2020-12-01 9:49 ` John Garry
2020-11-20 7:16 ` 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=ba2f9cb923dc61e523e4ae41db615f9b@mail.gmail.com \
--to=kashyap.desai@broadcom.com \
--cc=chandrakanth.patil@broadcom.com \
--cc=john.garry@huawei.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=sumit.saxena@broadcom.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).