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>,
	Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
	Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v8 08/13] nvmet-core: don't check the data len for pt-ctrl
Date: Wed, 28 Aug 2019 15:54:24 -0600	[thread overview]
Message-ID: <20190828215429.4572-9-logang@deltatee.com> (raw)
In-Reply-To: <20190828215429.4572-1-logang@deltatee.com>

From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

Right now, data_len is calculated before the transfer len after we
parse the command, With passthru interface we allow VUCs (Vendor-Unique
Commands). In order to make the code simple and compact, instead of
assigning the data len or each VUC in the command parse function
just use the transfer len as it is. This may result in error if expected
data_len != transfer_len.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
[logang@deltatee.com:
   * added definition of VUC to the commit message and comment
   * use nvmet_req_passthru_ctrl() helper seeing we can't dereference
     subsys->passthru_ctrl if CONFIG_NVME_TARGET_PASSTHRU is not set]
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
 drivers/nvme/target/core.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 986b2511d284..f9d46354f9ae 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -942,7 +942,16 @@ EXPORT_SYMBOL_GPL(nvmet_req_uninit);
 
 void nvmet_req_execute(struct nvmet_req *req)
 {
-	if (unlikely(req->data_len != req->transfer_len)) {
+	/*
+	 * data_len is calculated before the transfer len after we parse
+	 * the command, With passthru interface we allow VUC (Vendor-Unique
+	 * Commands)'s. In order to make the code simple and compact,
+	 * instead of assinging the dala len for each VUC in the command
+	 * parse function just use the transfer len as it is. This may
+	 * result in error if expected data_len != transfer_len.
+	 */
+	if (!(req->sq->ctrl && nvmet_req_passthru_ctrl(req)) &&
+	    unlikely(req->data_len != req->transfer_len)) {
 		req->error_loc = offsetof(struct nvme_common_command, dptr);
 		nvmet_req_complete(req, NVME_SC_SGL_INVALID_DATA | NVME_SC_DNR);
 	} else
-- 
2.20.1


  parent reply	other threads:[~2019-08-28 21:55 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 ` Logan Gunthorpe [this message]
2019-09-06 23:38   ` [PATCH v8 08/13] nvmet-core: don't check the data len for pt-ctrl 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 ` [PATCH v8 13/13] nvmet-passthru: support block accounting Logan Gunthorpe
2019-09-07  0:00   ` 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-9-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).