linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
	linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
	Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
	Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
	Max Gurtovoy <maxg@mellanox.com>,
	Stephen Bates <sbates@raithlin.com>,
	Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v8 13/13] nvmet-passthru: support block accounting
Date: Wed, 28 Aug 2019 15:54:29 -0600	[thread overview]
Message-ID: <20190828215429.4572-14-logang@deltatee.com> (raw)
In-Reply-To: <20190828215429.4572-1-logang@deltatee.com>

Support block disk accounting by setting the RQF_IO_STAT flag
and gendisk in the request.

After this change, IO counts will be reflected correctly in
/proc/diskstats for drives being used by passthru.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
 drivers/nvme/target/io-cmd-passthru.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/nvme/target/io-cmd-passthru.c b/drivers/nvme/target/io-cmd-passthru.c
index 7557927a3451..63f12750a80d 100644
--- a/drivers/nvme/target/io-cmd-passthru.c
+++ b/drivers/nvme/target/io-cmd-passthru.c
@@ -410,6 +410,9 @@ static struct request *nvmet_passthru_blk_make_request(struct nvmet_req *req,
 	if (unlikely(IS_ERR(rq)))
 		return rq;
 
+	if (blk_queue_io_stat(q) && cmd->common.opcode != nvme_cmd_flush)
+		rq->rq_flags |= RQF_IO_STAT;
+
 	if (req->sg_cnt) {
 		ret = nvmet_passthru_map_sg(req, rq);
 		if (unlikely(ret)) {
@@ -474,7 +477,7 @@ static void nvmet_passthru_execute_cmd(struct nvmet_req *req)
 
 	rq->end_io_data = req;
 	if (req->sq->qid != 0) {
-		blk_execute_rq_nowait(rq->q, NULL, rq, 0,
+		blk_execute_rq_nowait(rq->q, ns->disk, rq, 0,
 				      nvmet_passthru_req_done);
 	} else {
 		req->p.rq = rq;
-- 
2.20.1


  parent reply	other threads:[~2019-08-28 21:54 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-28 21:54 [PATCH v8 00/13] nvmet: add target passthru commands support Logan Gunthorpe
2019-08-28 21:54 ` [PATCH v8 01/13] nvme-core: introduce nvme_ctrl_get_by_path() Logan Gunthorpe
2019-09-06 23:33   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 02/13] nvme-core: export existing ctrl and ns interfaces Logan Gunthorpe
2019-09-06 23:33   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 03/13] nvmet: add return value to nvmet_add_async_event() Logan Gunthorpe
2019-09-06 23:34   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 04/13] nvmet: make nvmet_copy_ns_identifier() non-static Logan Gunthorpe
2019-09-06 23:34   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 05/13] nvmet-passthru: update KConfig with config passthru option Logan Gunthorpe
2019-09-06 23:35   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 06/13] nvmet-passthru: add passthru code to process commands Logan Gunthorpe
2019-08-28 21:54 ` [PATCH v8 07/13] nvmet-passthru: add enable/disable helpers Logan Gunthorpe
2019-08-28 21:54 ` [PATCH v8 08/13] nvmet-core: don't check the data len for pt-ctrl Logan Gunthorpe
2019-09-06 23:38   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 09/13] nvmet-tcp: don't check data_len in nvmet_tcp_map_data() Logan Gunthorpe
2019-09-06 23:39   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 10/13] nvmet-configfs: introduce passthru configfs interface Logan Gunthorpe
2019-09-06 23:39   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 11/13] block: don't check blk_rq_is_passthrough() in blk_do_io_stat() Logan Gunthorpe
2019-09-06 23:40   ` Sagi Grimberg
2019-08-28 21:54 ` [PATCH v8 12/13] block: call blk_account_io_start() in blk_execute_rq_nowait() Logan Gunthorpe
2019-09-06 23:41   ` Sagi Grimberg
2019-08-28 21:54 ` Logan Gunthorpe [this message]
2019-09-07  0:00   ` [PATCH v8 13/13] nvmet-passthru: support block accounting Sagi Grimberg
2019-09-09 16:06     ` Logan Gunthorpe
2019-09-09 19:26       ` Sagi Grimberg
2019-09-09 19:32         ` Logan Gunthorpe
2019-09-09 23:15           ` Sagi Grimberg
2019-09-11 16:53             ` Logan Gunthorpe

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=20190828215429.4572-14-logang@deltatee.com \
    --to=logang@deltatee.com \
    --cc=Chaitanya.Kulkarni@wdc.com \
    --cc=axboe@fb.com \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.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).