From: Klaus Jensen <its@irrelevant.dk>
To: Dmitry Fomichev <dmitry.fomichev@wdc.com>
Cc: "Fam Zheng" <fam@euphon.net>, "Kevin Wolf" <kwolf@redhat.com>,
"Damien Le Moal" <damien.lemoal@wdc.com>,
qemu-block@nongnu.org, "Niklas Cassel" <niklas.cassel@wdc.com>,
"Klaus Jensen" <k.jensen@samsung.com>,
qemu-devel@nongnu.org, "Maxim Levitsky" <mlevitsk@redhat.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Keith Busch" <kbusch@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Matias Bjorling" <matias.bjorling@wdc.com>
Subject: Re: [PATCH v5 05/14] hw/block/nvme: Add support for Namespace Types
Date: Fri, 2 Oct 2020 00:15:20 +0200 [thread overview]
Message-ID: <20201001221520.GA841624@apples.localdomain> (raw)
In-Reply-To: <20200928023528.15260-6-dmitry.fomichev@wdc.com>
[-- Attachment #1: Type: text/plain, Size: 3654 bytes --]
On Sep 28 11:35, Dmitry Fomichev wrote:
> From: Niklas Cassel <niklas.cassel@wdc.com>
>
> Namespace Types introduce a new command set, "I/O Command Sets",
> that allows the host to retrieve the command sets associated with
> a namespace. Introduce support for the command set and enable
> detection for the NVM Command Set.
>
> The new workflows for identify commands rely heavily on zero-filled
> identify structs. E.g., certain CNS commands are defined to return
> a zero-filled identify struct when an inactive namespace NSID
> is supplied.
>
> Add a helper function in order to avoid code duplication when
> reporting zero-filled identify structures.
>
> Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
> Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
> ---
> hw/block/nvme-ns.c | 3 +
> hw/block/nvme.c | 210 +++++++++++++++++++++++++++++++++++++--------
> 2 files changed, 175 insertions(+), 38 deletions(-)
>
> diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
> index bbd7879492..31b7f986c3 100644
> --- a/hw/block/nvme-ns.c
> +++ b/hw/block/nvme-ns.c
The following looks like a rebase gone wrong.
There are some redundant checks and wrong return values.
> static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req)
> {
> NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
> + NvmeNamespace *ns;
> uint32_t nsid = le32_to_cpu(c->nsid);
> - uint8_t list[NVME_IDENTIFY_DATA_SIZE];
> -
> - struct data {
> - struct {
> - NvmeIdNsDescr hdr;
> - uint8_t v[16];
> - } uuid;
> - };
> -
> - struct data *ns_descrs = (struct data *)list;
> + NvmeIdNsDescr *desc;
> + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {};
> + static const int data_len = sizeof(list);
> + void *list_ptr = list;
Oh maaan, please do not replace my nicely cleaned up code with pointer
arithmetics :(
>
> trace_pci_nvme_identify_ns_descr_list(nsid);
>
> - if (!nvme_nsid_valid(n, nsid) || nsid == NVME_NSID_BROADCAST) {
> - return NVME_INVALID_NSID | NVME_DNR;
> - }
> -
This removal looks wrong.
> if (unlikely(!nvme_ns(n, nsid))) {
> return NVME_INVALID_FIELD | NVME_DNR;
> }
>
> - memset(list, 0x0, sizeof(list));
> + ns = nvme_ns(n, nsid);
> + if (unlikely(!ns)) {
> + return nvme_rpt_empty_id_struct(n, req);
> + }
>
And this doesnt look like it belongs (its checked just a few lines
before, and it returns an error status as it should).
> /*
> * Because the NGUID and EUI64 fields are 0 in the Identify Namespace data
> @@ -1597,12 +1667,31 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req)
> * Namespace Identification Descriptor. Add a very basic Namespace UUID
> * here.
> */
> - ns_descrs->uuid.hdr.nidt = NVME_NIDT_UUID;
> - ns_descrs->uuid.hdr.nidl = NVME_NIDL_UUID;
> - stl_be_p(&ns_descrs->uuid.v, nsid);
> + desc = list_ptr;
> + desc->nidt = NVME_NIDT_UUID;
> + desc->nidl = NVME_NIDL_UUID;
> + list_ptr += sizeof(*desc);
> + memcpy(list_ptr, ns->params.uuid.data, NVME_NIDL_UUID);
> + list_ptr += NVME_NIDL_UUID;
>
> - return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE,
> - DMA_DIRECTION_FROM_DEVICE, req);
> + desc = list_ptr;
> + desc->nidt = NVME_NIDT_CSI;
> + desc->nidl = NVME_NIDL_CSI;
> + list_ptr += sizeof(*desc);
> + *(uint8_t *)list_ptr = NVME_CSI_NVM;
> +
> + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, req);
> +}
> +
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-01 22:20 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 2:35 [PATCH v5 00/14] hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 01/14] hw/block/nvme: Report actual LBA data shift in LBAF Dmitry Fomichev
2020-09-28 8:51 ` Klaus Jensen
2020-09-28 2:35 ` [PATCH v5 02/14] hw/block/nvme: Add Commands Supported and Effects log Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 03/14] hw/block/nvme: Introduce the Namespace Types definitions Dmitry Fomichev
2020-09-30 8:08 ` Klaus Jensen
2020-09-30 15:21 ` Keith Busch
2020-09-28 2:35 ` [PATCH v5 04/14] hw/block/nvme: Define trace events related to NS Types Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 05/14] hw/block/nvme: Add support for Namespace Types Dmitry Fomichev
2020-09-30 8:15 ` Klaus Jensen
2020-09-30 12:47 ` Niklas Cassel
2020-10-01 11:22 ` Niklas Cassel
2020-10-01 15:29 ` Keith Busch
2020-10-01 15:50 ` Niklas Cassel
2020-10-01 15:59 ` Keith Busch
2020-10-01 16:23 ` Niklas Cassel
2020-10-01 17:08 ` Keith Busch
2020-10-01 22:15 ` Klaus Jensen [this message]
2020-10-01 22:30 ` Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 06/14] hw/block/nvme: Add support for active/inactive namespaces Dmitry Fomichev
2020-09-30 13:50 ` Niklas Cassel
2020-10-04 23:54 ` Dmitry Fomichev
2020-10-05 11:26 ` Niklas Cassel
2020-09-28 2:35 ` [PATCH v5 07/14] hw/block/nvme: Make Zoned NS Command Set definitions Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 08/14] hw/block/nvme: Define Zoned NS Command Set trace events Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 09/14] hw/block/nvme: Support Zoned Namespace Command Set Dmitry Fomichev
2020-09-28 6:44 ` Klaus Jensen
2020-09-28 10:42 ` Klaus Jensen
2020-09-30 5:20 ` Klaus Jensen
2020-10-05 0:53 ` Dmitry Fomichev
2020-09-30 5:59 ` Klaus Jensen
2020-10-04 23:48 ` Dmitry Fomichev
2020-09-30 14:50 ` Niklas Cassel
2020-09-30 18:23 ` Klaus Jensen
2020-10-04 23:57 ` Dmitry Fomichev
2020-10-05 11:41 ` Niklas Cassel
2020-10-05 23:08 ` Dmitry Fomichev
2020-09-30 15:12 ` Niklas Cassel
2020-09-28 2:35 ` [PATCH v5 10/14] hw/block/nvme: Introduce max active and open zone limits Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 11/14] hw/block/nvme: Support Zone Descriptor Extensions Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 12/14] hw/block/nvme: Add injection of Offline/Read-Only zones Dmitry Fomichev
2020-09-28 2:35 ` [PATCH v5 13/14] hw/block/nvme: Use zone metadata file for persistence Dmitry Fomichev
2020-09-28 7:51 ` Klaus Jensen
2020-09-29 15:43 ` Dmitry Fomichev
2020-09-29 16:46 ` Klaus Jensen
2020-09-28 2:35 ` [PATCH v5 14/14] hw/block/nvme: Document zoned parameters in usage text Dmitry Fomichev
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=20201001221520.GA841624@apples.localdomain \
--to=its@irrelevant.dk \
--cc=alistair.francis@wdc.com \
--cc=damien.lemoal@wdc.com \
--cc=dmitry.fomichev@wdc.com \
--cc=fam@euphon.net \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=matias.bjorling@wdc.com \
--cc=mlevitsk@redhat.com \
--cc=niklas.cassel@wdc.com \
--cc=philmd@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).