From: Maxim Levitsky <mlevitsk@redhat.com>
To: Klaus Birkelund Jensen <its@irrelevant.dk>
Cc: Kevin Wolf <kwolf@redhat.com>,
Beata Michalska <beata.michalska@linaro.org>,
qemu-block@nongnu.org, qemu-devel@nongnu.org,
Max Reitz <mreitz@redhat.com>, Keith Busch <kbusch@kernel.org>,
Javier Gonzalez <javier.gonz@samsung.com>
Subject: Re: [PATCH v6 32/42] nvme: allow multiple aios per command
Date: Tue, 31 Mar 2020 12:10:49 +0300 [thread overview]
Message-ID: <bd3c2be383491f1eb321f4e8b5eb5a7df2fc30eb.camel@redhat.com> (raw)
In-Reply-To: <20200331054647.pvcjrsnz2xbar3zf@apples.localdomain>
On Tue, 2020-03-31 at 07:47 +0200, Klaus Birkelund Jensen wrote:
> On Mar 25 12:57, Maxim Levitsky wrote:
> > On Mon, 2020-03-16 at 07:29 -0700, Klaus Jensen wrote:
> > > From: Klaus Jensen <k.jensen@samsung.com>
> > >
> > > This refactors how the device issues asynchronous block backend
> > > requests. The NvmeRequest now holds a queue of NvmeAIOs that are
> > > associated with the command. This allows multiple aios to be issued for
> > > a command. Only when all requests have been completed will the device
> > > post a completion queue entry.
> > >
> > > Because the device is currently guaranteed to only issue a single aio
> > > request per command, the benefit is not immediately obvious. But this
> > > functionality is required to support metadata, the dataset management
> > > command and other features.
> > >
> > > Signed-off-by: Klaus Jensen <klaus.jensen@cnexlabs.com>
> > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
> > > Acked-by: Keith Busch <kbusch@kernel.org>
> > > ---
> > > hw/block/nvme.c | 377 +++++++++++++++++++++++++++++++-----------
> > > hw/block/nvme.h | 129 +++++++++++++--
> > > hw/block/trace-events | 6 +
> > > 3 files changed, 407 insertions(+), 105 deletions(-)
> > >
> > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> > > index 0d2b5b45b0c5..817384e3b1a9 100644
> > > --- a/hw/block/nvme.c
> > > +++ b/hw/block/nvme.c
> > > @@ -373,6 +374,99 @@ static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg,
> > > return nvme_map_prp(n, qsg, iov, prp1, prp2, len, req);
> > > }
> > >
> > > +static void nvme_aio_destroy(NvmeAIO *aio)
> > > +{
> > > + g_free(aio);
> > > +}
> > > +
> > > +static inline void nvme_req_register_aio(NvmeRequest *req, NvmeAIO *aio,
> >
> > I guess I'll call this nvme_req_add_aio,
> > or nvme_add_aio_to_reg.
> > Thoughts?
> > Also you can leave this as is, but add a comment on top explaining this
> >
>
> nvme_req_add_aio it is :) And comment added.
Thanks a lot!
>
> > > + NvmeAIOOp opc)
> > > +{
> > > + aio->opc = opc;
> > > +
> > > + trace_nvme_dev_req_register_aio(nvme_cid(req), aio, blk_name(aio->blk),
> > > + aio->offset, aio->len,
> > > + nvme_aio_opc_str(aio), req);
> > > +
> > > + if (req) {
> > > + QTAILQ_INSERT_TAIL(&req->aio_tailq, aio, tailq_entry);
> > > + }
> > > +}
> > > +
> > > +static void nvme_submit_aio(NvmeAIO *aio)
> >
> > OK, this name makes sense
> > Also please add a comment on top.
>
> Done.
Thanks!
>
> > > @@ -505,9 +600,11 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,
> > > return NVME_SUCCESS;
> > > }
> > >
> > > -static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, NvmeNamespace *ns,
> > > - uint16_t ctrl, NvmeRequest *req)
> > > +static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, uint16_t ctrl,
> > > + NvmeRequest *req)
> > > {
> > > + NvmeNamespace *ns = req->ns;
> > > +
> >
> > This should go to the patch that added nvme_check_prinfo
> >
>
> Probably killing that patch.
Yea, I also agree on that. Once we properly support metadata,
then we can add all the checks for its correctness.
>
> > > @@ -516,10 +613,10 @@ static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, NvmeNamespace *ns,
> > > return NVME_SUCCESS;
> > > }
> > >
> > > -static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns,
> > > - uint64_t slba, uint32_t nlb,
> > > - NvmeRequest *req)
> > > +static inline uint16_t nvme_check_bounds(NvmeCtrl *n, uint64_t slba,
> > > + uint32_t nlb, NvmeRequest *req)
> > > {
> > > + NvmeNamespace *ns = req->ns;
> > > uint64_t nsze = le64_to_cpu(ns->id_ns.nsze);
> >
> > This should go to the patch that added nvme_check_bounds as well
> >
>
> We can't really, because the NvmeRequest does not hold a reference to
> the namespace as a struct member at that point. This is also an issue
> with the nvme_check_prinfo function above.
I see it now. The changes to NvmeRequest together with this are a good candidate
to split from this patch to get this patch to size that is easy to review.
>
> > >
> > > if (unlikely(UINT64_MAX - slba < nlb || slba + nlb > nsze)) {
> > > @@ -530,55 +627,154 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns,
> > > return NVME_SUCCESS;
> > > }
> > >
> > > -static void nvme_rw_cb(void *opaque, int ret)
> > > +static uint16_t nvme_check_rw(NvmeCtrl *n, NvmeRequest *req)
> > > +{
> > > + NvmeNamespace *ns = req->ns;
> > > + NvmeRwCmd *rw = (NvmeRwCmd *) &req->cmd;
> > > + uint16_t ctrl = le16_to_cpu(rw->control);
> > > + size_t len = req->nlb << nvme_ns_lbads(ns);
> > > + uint16_t status;
> > > +
> > > + status = nvme_check_mdts(n, len, req);
> > > + if (status) {
> > > + return status;
> > > + }
> > > +
> > > + status = nvme_check_prinfo(n, ctrl, req);
> > > + if (status) {
> > > + return status;
> > > + }
> > > +
> > > + status = nvme_check_bounds(n, req->slba, req->nlb, req);
> > > + if (status) {
> > > + return status;
> > > + }
> > > +
> > > + return NVME_SUCCESS;
> > > +}
> >
> > Nitpick: I hate to say it but nvme_check_rw should be in a separate patch as well.
> > It will also make diff more readable (when adding a funtion and changing a function
> > at the same time, you get a diff between two unrelated things)
> >
>
> Done, but had to do it as a follow up patch.
I guess it won't help to do this in a followup patch since this won't simplify this
patch. I'll take a look when you publish the next version.
>
> > >
> > > -static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
> > > - NvmeRequest *req)
> > > +static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
> >
> > Very small nitpick about zeros/zeroes: This should move to some refactoring patch to be honest.
> >
>
> Done ;)
>
> >
> > The patch is still too large IMHO to review properly and few things can be split from it.
> > I tried my best to review it but I might have missed something.
> >
>
> Yeah, I know, but thanks for trying!
Thanks to you too.
Best regards,
Maxim Levitsky
>
next prev parent reply other threads:[~2020-03-31 9:11 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 14:28 [PATCH v6 00/42] nvme: support NVMe v1.3d, SGLs and multiple namespaces Klaus Jensen
2020-03-16 14:28 ` [PATCH v6 01/42] nvme: rename trace events to nvme_dev Klaus Jensen
2020-03-25 10:36 ` Maxim Levitsky
2020-03-31 5:38 ` Klaus Birkelund Jensen
2020-03-16 14:28 ` [PATCH v6 02/42] nvme: remove superfluous breaks Klaus Jensen
2020-03-16 14:28 ` [PATCH v6 03/42] nvme: move device parameters to separate struct Klaus Jensen
2020-03-25 10:36 ` Maxim Levitsky
2020-03-16 14:28 ` [PATCH v6 04/42] nvme: bump spec data structures to v1.3 Klaus Jensen
2020-03-25 10:37 ` Maxim Levitsky
2020-03-31 5:38 ` Klaus Birkelund Jensen
2020-03-31 10:43 ` Maxim Levitsky
2020-03-16 14:28 ` [PATCH v6 05/42] nvme: use constant for identify data size Klaus Jensen
2020-03-25 10:37 ` Maxim Levitsky
2020-03-31 5:38 ` Klaus Birkelund Jensen
2020-03-16 14:28 ` [PATCH v6 06/42] nvme: add identify cns values in header Klaus Jensen
2020-03-25 10:37 ` Maxim Levitsky
2020-03-31 5:39 ` Klaus Birkelund Jensen
2020-03-16 14:28 ` [PATCH v6 07/42] nvme: refactor nvme_addr_read Klaus Jensen
2020-03-25 10:38 ` Maxim Levitsky
2020-03-31 5:39 ` Klaus Birkelund Jensen
2020-03-31 10:41 ` Maxim Levitsky
2020-03-31 12:48 ` Klaus Birkelund Jensen
2020-03-31 14:46 ` Maxim Levitsky
2020-03-16 14:28 ` [PATCH v6 08/42] nvme: add support for the abort command Klaus Jensen
2020-03-25 10:38 ` Maxim Levitsky
2020-03-16 14:28 ` [PATCH v6 09/42] nvme: add max_ioqpairs device parameter Klaus Jensen
2020-03-25 10:39 ` Maxim Levitsky
2020-03-31 5:40 ` Klaus Birkelund Jensen
2020-03-31 9:48 ` Maxim Levitsky
2020-03-16 14:28 ` [PATCH v6 10/42] nvme: refactor device realization Klaus Jensen
2020-03-25 10:40 ` Maxim Levitsky
2020-03-31 5:40 ` Klaus Birkelund Jensen
2020-03-16 14:28 ` [PATCH v6 11/42] nvme: add temperature threshold feature Klaus Jensen
2020-03-25 10:40 ` Maxim Levitsky
2020-03-31 5:40 ` Klaus Birkelund Jensen
2020-03-31 9:46 ` Maxim Levitsky
2020-03-16 14:28 ` [PATCH v6 12/42] nvme: add support for the get log page command Klaus Jensen
2020-03-25 10:40 ` Maxim Levitsky
2020-03-31 5:41 ` Klaus Birkelund Jensen
2020-03-31 9:45 ` Maxim Levitsky
2020-03-31 12:49 ` Klaus Birkelund Jensen
2020-03-31 14:47 ` Maxim Levitsky
2020-03-16 14:28 ` [PATCH v6 13/42] nvme: add support for the asynchronous event request command Klaus Jensen
2020-03-25 10:41 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 14/42] nvme: add missing mandatory features Klaus Jensen
2020-03-25 10:41 ` Maxim Levitsky
2020-03-31 5:41 ` Klaus Birkelund Jensen
2020-03-31 9:39 ` Maxim Levitsky
2020-04-08 11:28 ` Klaus Birkelund Jensen
2020-03-16 14:29 ` [PATCH v6 15/42] nvme: additional tracing Klaus Jensen
2020-03-25 10:42 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 16/42] nvme: make sure ncqr and nsqr is valid Klaus Jensen
2020-03-25 10:42 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 17/42] nvme: add log specific field to trace events Klaus Jensen
2020-03-25 10:43 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 18/42] nvme: support identify namespace descriptor list Klaus Jensen
2020-03-25 10:43 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 19/42] nvme: enforce valid queue creation sequence Klaus Jensen
2020-03-25 10:43 ` Maxim Levitsky
2020-03-31 5:41 ` Klaus Birkelund Jensen
2020-03-31 9:31 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 20/42] nvme: provide the mandatory subnqn field Klaus Jensen
2020-03-25 10:43 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 21/42] nvme: bump supported version to v1.3 Klaus Jensen
2020-03-25 10:44 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 22/42] nvme: memset preallocated requests structures Klaus Jensen
2020-03-25 10:44 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 23/42] nvme: add mapping helpers Klaus Jensen
2020-03-25 10:45 ` Maxim Levitsky
2020-03-31 5:44 ` Klaus Birkelund Jensen
2020-03-31 9:30 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 24/42] nvme: remove redundant has_sg member Klaus Jensen
2020-03-25 10:45 ` Maxim Levitsky
2020-03-31 5:44 ` Klaus Birkelund Jensen
2020-03-31 9:25 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 25/42] nvme: refactor dma read/write Klaus Jensen
2020-03-25 10:46 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 26/42] nvme: pass request along for tracing Klaus Jensen
2020-03-25 10:55 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 27/42] nvme: add request mapping helper Klaus Jensen
2020-03-25 10:56 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 28/42] nvme: verify validity of prp lists in the cmb Klaus Jensen
2020-03-25 10:56 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 29/42] nvme: refactor request bounds checking Klaus Jensen
2020-03-25 10:56 ` Maxim Levitsky
2020-03-31 5:44 ` Klaus Birkelund Jensen
2020-03-31 9:23 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 30/42] nvme: add check for mdts Klaus Jensen
2020-03-25 10:57 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 31/42] nvme: add check for prinfo Klaus Jensen
2020-03-25 10:57 ` Maxim Levitsky
2020-03-31 5:45 ` Klaus Birkelund Jensen
2020-03-31 9:17 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 32/42] nvme: allow multiple aios per command Klaus Jensen
2020-03-25 10:57 ` Maxim Levitsky
2020-03-31 5:47 ` Klaus Birkelund Jensen
2020-03-31 9:10 ` Maxim Levitsky [this message]
2020-04-08 15:02 ` Klaus Birkelund Jensen
2020-03-16 14:29 ` [PATCH v6 33/42] nvme: use preallocated qsg/iov in nvme_dma_prp Klaus Jensen
2020-03-25 10:58 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 34/42] pci: pass along the return value of dma_memory_rw Klaus Jensen
2020-03-16 14:29 ` [PATCH v6 35/42] nvme: handle dma errors Klaus Jensen
2020-03-25 10:58 ` Maxim Levitsky
2020-03-31 5:47 ` Klaus Birkelund Jensen
2020-03-16 14:29 ` [PATCH v6 36/42] nvme: add support for scatter gather lists Klaus Jensen
2020-03-25 10:58 ` Maxim Levitsky
2020-03-31 5:48 ` Klaus Birkelund Jensen
2020-03-31 8:51 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 37/42] nvme: refactor identify active namespace id list Klaus Jensen
2020-03-25 10:58 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 38/42] nvme: support multiple namespaces Klaus Jensen
2020-03-25 10:59 ` Maxim Levitsky
2020-03-31 5:48 ` Klaus Birkelund Jensen
2020-03-31 8:47 ` Maxim Levitsky
2020-03-16 14:29 ` [PATCH v6 39/42] pci: allocate pci id for nvme Klaus Jensen
2020-03-16 14:29 ` [PATCH v6 40/42] nvme: change controller pci id Klaus Jensen
2020-03-16 14:29 ` [PATCH v6 41/42] nvme: remove redundant NvmeCmd pointer parameter Klaus Jensen
2020-03-16 14:29 ` [PATCH v6 42/42] nvme: make lba data size configurable Klaus Jensen
2020-03-25 10:59 ` Maxim Levitsky
2020-03-16 19:30 ` [PATCH v6 00/42] nvme: support NVMe v1.3d, SGLs and multiple namespaces no-reply
2020-03-25 10:35 ` Maxim Levitsky
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=bd3c2be383491f1eb321f4e8b5eb5a7df2fc30eb.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=beata.michalska@linaro.org \
--cc=its@irrelevant.dk \
--cc=javier.gonz@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).