From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org
Cc: Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
Keith Busch <kbusch@kernel.org>,
Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
Max Gurtovoy <maxg@mellanox.com>,
Stephen Bates <sbates@raithlin.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [RFC PATCH 3/3] nvme: Introduce nvme_execute_passthru_rq_nowait()
Date: Fri, 25 Oct 2019 14:25:35 -0600 [thread overview]
Message-ID: <20191025202535.12036-4-logang@deltatee.com> (raw)
In-Reply-To: <20191025202535.12036-1-logang@deltatee.com>
This function is similar to nvme_execute_passthru_rq() but does
not wait and will call a callback when the request is complete.
The new function can also be called in interrupt context, so if there
are side effects, the request will be executed in a work queue to
avoid sleeping.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
drivers/nvme/host/core.c | 42 ++++++++++++++++++++++++++++++++++++++++
drivers/nvme/host/nvme.h | 7 +++++++
2 files changed, 49 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 2b4f0ea55f8d..6d3cade0e63d 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4211,6 +4211,48 @@ void nvme_sync_queues(struct nvme_ctrl *ctrl)
}
EXPORT_SYMBOL_GPL(nvme_sync_queues);
+#ifdef CONFIG_NVME_TARGET_PASSTHRU
+static void nvme_execute_passthru_rq_work(struct work_struct *w)
+{
+ struct nvme_request *req = container_of(w, struct nvme_request, work);
+ struct request *rq = blk_mq_rq_from_pdu(req);
+ rq_end_io_fn *done = rq->end_io;
+ void *end_io_data = rq->end_io_data;
+
+ nvme_execute_passthru_rq(rq);
+
+ if (done) {
+ rq->end_io_data = end_io_data;
+ done(rq, 0);
+ }
+}
+
+void nvme_execute_passthru_rq_nowait(struct request *rq, rq_end_io_fn *done)
+{
+ struct nvme_command *cmd = nvme_req(rq)->cmd;
+ struct nvme_ctrl *ctrl = nvme_req(rq)->ctrl;
+ struct nvme_ns *ns = rq->q->queuedata;
+ struct gendisk *disk = ns ? ns->disk : NULL;
+ u32 effects;
+
+ /*
+ * This function may be called in interrupt context, so we cannot sleep
+ * but nvme_passthru_[start|end]() may sleep so we need to execute
+ * the command in a work queue.
+ */
+ effects = nvme_command_effects(ctrl, ns, cmd->common.opcode);
+ if (effects) {
+ rq->end_io = done;
+ INIT_WORK(&nvme_req(rq)->work, nvme_execute_passthru_rq_work);
+ queue_work(nvme_wq, &nvme_req(rq)->work);
+ return;
+ }
+
+ blk_execute_rq_nowait(rq->q, disk, rq, 0, done);
+}
+EXPORT_SYMBOL_GPL(nvme_execute_passthru_rq_nowait);
+#endif /* CONFIG_NVME_TARGET_PASSTHRU */
+
/*
* Check we didn't inadvertently grow the command structure sizes:
*/
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 22e8401352c2..9523779de662 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -128,6 +128,9 @@ struct nvme_request {
u8 flags;
u16 status;
struct nvme_ctrl *ctrl;
+#ifdef CONFIG_NVME_TARGET_PASSTHRU
+ struct work_struct work;
+#endif
};
/*
@@ -652,4 +655,8 @@ static inline struct nvme_ns *nvme_get_ns_from_dev(struct device *dev)
return dev_to_disk(dev)->private_data;
}
+#ifdef CONFIG_NVME_TARGET_PASSTHRU
+void nvme_execute_passthru_rq_nowait(struct request *rq, rq_end_io_fn *done);
+#endif /* CONFIG_NVME_TARGET_PASSTHRU */
+
#endif /* _NVME_H */
--
2.20.1
next prev parent reply other threads:[~2019-10-25 20:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 20:25 [RFC PATCH 0/3] Passthru Execute Request Interface Logan Gunthorpe
2019-10-25 20:25 ` [RFC PATCH 1/3] nvme: Move nvme_passthru_[start|end]() calls to common code Logan Gunthorpe
2019-10-25 20:25 ` [RFC PATCH 2/3] nvme: Create helper function to obtain command effects Logan Gunthorpe
2019-10-27 15:05 ` Christoph Hellwig
2019-10-25 20:25 ` Logan Gunthorpe [this message]
2019-10-25 20:41 ` [RFC PATCH 3/3] nvme: Introduce nvme_execute_passthru_rq_nowait() Sagi Grimberg
2019-10-25 21:12 ` Logan Gunthorpe
2019-10-25 21:40 ` Sagi Grimberg
2019-10-25 21:55 ` Logan Gunthorpe
2019-10-27 15:09 ` Christoph Hellwig
2019-10-28 16:58 ` Logan Gunthorpe
2019-10-28 21:04 ` Sagi Grimberg
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=20191025202535.12036-4-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=maxg@mellanox.com \
--cc=sagi@grimberg.me \
--cc=sbates@raithlin.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).