From nobody Tue Nov 26 05:41:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1710184359; cv=none; d=zohomail.com; s=zohoarc; b=bjpJrO+ZoePdELCaxCB+EAjR7o5qltkiMoDx0+VBI7CpS9TmG0MwLs42b71E4wyPPFGDGkeevgFlKghIt6CXkmTllGy/tiTO2KOaqdIYG5O0En+PSfMj0Mv/2NihCtjilaEnf8x99F5dOlrETZuLU7invpRxD5XSq7crMg7QC4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710184359; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CL070b4BGR4o23FsAxR9eeclFDLoEOJMatO1Gas4ulo=; b=KoHZe7jS6v9xW/GBHggV2RtHiOK6BXy5Iz5chEiaffy4tb4H+vm4tr169w68JEK7ktAvi3w0yuWde976NlezGphHC/9tCvduSoD4zk5s3qxo2n9dXIxY6Rt3nHO30mCarRmvSomHxSqJOaWsuXaCLgVtUkmVx1wJ0V5hB3jkOiA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17101843597341000.7209569941645; Mon, 11 Mar 2024 12:12:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjl3k-0001pR-Dv; Mon, 11 Mar 2024 15:11:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjl3i-0001p7-G6; Mon, 11 Mar 2024 15:11:38 -0400 Received: from wfout6-smtp.messagingengine.com ([64.147.123.149]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjl3g-0000FH-3Q; Mon, 11 Mar 2024 15:11:38 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.west.internal (Postfix) with ESMTP id 2DA641C000BB; Mon, 11 Mar 2024 15:11:33 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 11 Mar 2024 15:11:34 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 11 Mar 2024 15:11:29 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1710184292; x= 1710270692; bh=CL070b4BGR4o23FsAxR9eeclFDLoEOJMatO1Gas4ulo=; b=L rOYtRDgATYoryK87GewGCbJxyPb0zjQmJmYUrIMMv7RmD/rsZlC6c95NeJz67nqH VjDhURglxY43E5jRiOijKBWTN1tpMp57UpG8F3aZJJsbeCRqUktu+dqLk4DW+uqU xk5I5BG4iGzDpHAzBAc7M5yYWHloR8M6K1ouMQVel4UsqL3ReMACqF16YK2psiIk 1eNtb4yakBabDOQ6j/sInIQ4lRlaHlAG1L8cD7YZzXX1mou3WFPqbLdbeDpWRtZw xgWenr0/vxiNseROKX2FzyO3AQ4cDudfaSy+WunV7HVr9ETKKyUmk1NyF4VxfLVe Oon3pd9JQqBBMVKnyfYJw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1710184292; x= 1710270692; bh=CL070b4BGR4o23FsAxR9eeclFDLoEOJMatO1Gas4ulo=; b=I T8K3i7cBCLxylVS03mqOmUbFtZdn8LcY5iesm5MbRgCCmA2Bg0ZV2tO5+z6ymFMI dZA2DjhI8alm7aeINRuv//l6vK2G4mzg6a0XE8eHOSGTrOEdEdJXuHMwvv3ro8H2 iVvghrkDhOKWHR/XkLEtrU222NfWX6VQzZ7bH0iVJt7uC+6UWhcVKQlochWFn0ia FN2xTsmQK/iJjUKJ5aZ2GiJWxlyq+8eZxACBD3dbjruC83tX1/GTuFnVZHcWKYG4 DTI+7HPkFADETlwBtrAhnhtth9S97omnkRGrXgl1WCUaXYhhsxryBiJx94G1D4l8 gUst9V+2y0XWQMNLmZxXQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrjedugdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepteeffeffieelheeuvedtieejfeduleejheeigfegtdefhedtuedvgfffgeej jeeknecuffhomhgrihhnpehnghhuihgurdgurghtrgenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Feedback-ID: idc91472f:Fastmail From: Klaus Jensen To: Peter Maydell , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Klaus Jensen , Jesper Devantier , Yanan Wang , Marcel Apfelbaum , Eduardo Habkost , Keith Busch , Roque Arcudia Hernandez , Nabih Estefan , Klaus Jensen Subject: [PULL 4/6] hw/nvme: Add NVMe NGUID property Date: Mon, 11 Mar 2024 20:11:10 +0100 Message-ID: <20240311191105.35224-12-its@irrelevant.dk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311191105.35224-8-its@irrelevant.dk> References: <20240311191105.35224-8-its@irrelevant.dk> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=11228; i=k.jensen@samsung.com; h=from:subject; bh=if9pvYLcwRx1YNXtDGaMFbOULNcR5Y8rsNcfNn8aV94=; b=owJ4nAFtAZL+kA0DAAoBTeGvMW1PDekByyZiAGXvV0oP5IoqhCHIv52aJdfZsMKfcA7xShrcc Q3tAN/V597n5okBMwQAAQoAHRYhBFIoM6p14tzmokdmwE3hrzFtTw3pBQJl71dKAAoJEE3hrzFt Tw3pOJsH/3zL6s0vtNEUQPpeNHhYfYN6i+fxMzbzs3mdQEvpAeGUh5X1A/ei6h1g+gNpij5QY+S cRi4Lq/hXqmILtJun8gZ/Rw/xeUETLFyGqEXjhfBTy9eCcbmbB28x4/bFfMAPOj4F9X1rPC0yHN kO2daR0UUAjwV9JbJnlzKZbl2cOgDBIS7esIQ71YhFmN8LFso4gV3ugVzh2lZ76CiI/9FRiSAlY iFZL0QMaxHtfPJfn7lNeW8YybH72BM6qevvdZ0GwkRGfsO/N+iNZOa6CBTYA3uCUfVd/dW2RWj4 oi6cnnqhRwbxzbhea0V63McTQ0eM2Va/avfVtUbkng9+qmjFhNecVa3P X-Developer-Key: i=k.jensen@samsung.com; a=openpgp; fpr=DDCA4D9C9EF931CC3468427263D56FC5E55DA838 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=64.147.123.149; envelope-from=its@irrelevant.dk; helo=wfout6-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @irrelevant.dk) X-ZM-MESSAGEID: 1710184361189100005 Content-Type: text/plain; charset="utf-8" From: Roque Arcudia Hernandez This patch adds a way to specify an NGUID for a given NVMe Namespace using a string of hexadecimal digits with an optional '-' separator to group bytes.= For instance: -device nvme-ns,nguid=3D"e9accd3b83904e13167cf0593437f57d" If provided, the NGUID will be part of the Namespace Identification Descrip= tor list and the Identify Namespace data. Signed-off-by: Roque Arcudia Hernandez Signed-off-by: Nabih Estefan Reviewed-by: Klaus Jensen Signed-off-by: Klaus Jensen --- docs/system/devices/nvme.rst | 7 ++ hw/nvme/ctrl.c | 12 +++ hw/nvme/meson.build | 2 +- hw/nvme/nguid.c | 187 +++++++++++++++++++++++++++++++++++ hw/nvme/ns.c | 2 + hw/nvme/nvme.h | 26 +++-- 6 files changed, 229 insertions(+), 7 deletions(-) create mode 100644 hw/nvme/nguid.c diff --git a/docs/system/devices/nvme.rst b/docs/system/devices/nvme.rst index 4ea957baed10..d2b1ca96455f 100644 --- a/docs/system/devices/nvme.rst +++ b/docs/system/devices/nvme.rst @@ -81,6 +81,13 @@ There are a number of parameters available: Set the UUID of the namespace. This will be reported as a "Namespace UUI= D" descriptor in the Namespace Identification Descriptor List. =20 +``nguid`` + Set the NGUID of the namespace. This will be reported as a "Namespace Gl= obally + Unique Identifier" descriptor in the Namespace Identification Descriptor= List. + It is specified as a string of hexadecimal digits containing exactly 16 = bytes + or "auto" for a random value. An optional '-' separator could be used to= group + bytes. If not specified the NGUID will remain all zeros. + ``eui64`` Set the EUI-64 of the namespace. This will be reported as a "IEEE Extend= ed Unique Identifier" descriptor in the Namespace Identification Descriptor= List. diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index abc0387f2ca8..6c5a2b875da8 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -5640,6 +5640,10 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl= *n, NvmeRequest *req) NvmeIdNsDescr hdr; uint8_t v[NVME_NIDL_UUID]; } QEMU_PACKED uuid =3D {}; + struct { + NvmeIdNsDescr hdr; + uint8_t v[NVME_NIDL_NGUID]; + } QEMU_PACKED nguid =3D {}; struct { NvmeIdNsDescr hdr; uint64_t v; @@ -5668,6 +5672,14 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl= *n, NvmeRequest *req) pos +=3D sizeof(uuid); } =20 + if (!nvme_nguid_is_null(&ns->params.nguid)) { + nguid.hdr.nidt =3D NVME_NIDT_NGUID; + nguid.hdr.nidl =3D NVME_NIDL_NGUID; + memcpy(nguid.v, ns->params.nguid.data, NVME_NIDL_NGUID); + memcpy(pos, &nguid, sizeof(nguid)); + pos +=3D sizeof(nguid); + } + if (ns->params.eui64) { eui64.hdr.nidt =3D NVME_NIDT_EUI64; eui64.hdr.nidl =3D NVME_NIDL_EUI64; diff --git a/hw/nvme/meson.build b/hw/nvme/meson.build index 1a6a2ca2f307..7d5caa53c280 100644 --- a/hw/nvme/meson.build +++ b/hw/nvme/meson.build @@ -1 +1 @@ -system_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('ctrl.c', 'dif.c', '= ns.c', 'subsys.c')) +system_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('ctrl.c', 'dif.c', '= ns.c', 'subsys.c', 'nguid.c')) \ No newline at end of file diff --git a/hw/nvme/nguid.c b/hw/nvme/nguid.c new file mode 100644 index 000000000000..829832bd9f41 --- /dev/null +++ b/hw/nvme/nguid.c @@ -0,0 +1,187 @@ +/* + * QEMU NVMe NGUID functions + * + * Copyright 2024 Google LLC + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WIT= HOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include "qemu/osdep.h" +#include "qapi/visitor.h" +#include "qemu/ctype.h" +#include "nvme.h" + +#define NGUID_SEPARATOR '-' + +#define NGUID_VALUE_AUTO "auto" + +#define NGUID_FMT \ + "%02hhx%02hhx%02hhx%02hhx" \ + "%02hhx%02hhx%02hhx%02hhx" \ + "%02hhx%02hhx%02hhx%02hhx" \ + "%02hhx%02hhx%02hhx%02hhx" + +#define NGUID_STR_LEN (2 * NGUID_LEN + 1) + +bool nvme_nguid_is_null(const NvmeNGUID *nguid) +{ + static NvmeNGUID null_nguid; + return memcmp(nguid, &null_nguid, sizeof(NvmeNGUID)) =3D=3D 0; +} + +static void nvme_nguid_generate(NvmeNGUID *out) +{ + int i; + uint32_t x; + + QEMU_BUILD_BUG_ON((NGUID_LEN % sizeof(x)) !=3D 0); + + for (i =3D 0; i < NGUID_LEN; i +=3D sizeof(x)) { + x =3D g_random_int(); + memcpy(&out->data[i], &x, sizeof(x)); + } +} + +/* + * The Linux Kernel typically prints the NGUID of an NVMe namespace using = the + * same format as the UUID. For instance: + * + * $ cat /sys/class/block/nvme0n1/nguid + * e9accd3b-8390-4e13-167c-f0593437f57d + * + * When there is no UUID but there is NGUID the Kernel will print the NGUI= D as + * wwid and it won't use the UUID format: + * + * $ cat /sys/class/block/nvme0n1/wwid + * eui.e9accd3b83904e13167cf0593437f57d + * + * The NGUID has different fields compared to the UUID, so the grouping us= ed in + * the UUID format has no relation with the 3 fields of the NGUID. + * + * This implementation won't expect a strict format as the UUID one and in= stead + * it will admit any string of hexadecimal digits. Byte groups could be cr= eated + * using the '-' separator. The number of bytes needs to be exactly 16 and= the + * separator '-' has to be exactly in a byte boundary. The following are + * examples of accepted formats for the NGUID string: + * + * nguid=3D"e9accd3b-8390-4e13-167c-f0593437f57d" + * nguid=3D"e9accd3b83904e13167cf0593437f57d" + * nguid=3D"FEDCBA9876543210-ABCDEF-0123456789" + */ +static bool nvme_nguid_is_valid(const char *str) +{ + int i; + int digit_count =3D 0; + + for (i =3D 0; i < strlen(str); i++) { + const char c =3D str[i]; + if (qemu_isxdigit(c)) { + digit_count++; + continue; + } + if (c =3D=3D NGUID_SEPARATOR) { + /* + * We need to make sure the separator is in a byte boundary, t= he + * string does not start with the separator and they are not b= ack to + * back "--". + */ + if ((i > 0) && (str[i - 1] !=3D NGUID_SEPARATOR) && + (digit_count % 2) =3D=3D 0) { + continue; + } + } + return false; + } + /* + * The string should have the correct byte length and not finish with = the + * separator + */ + return (digit_count =3D=3D (2 * NGUID_LEN)) && (str[i - 1] !=3D NGUID_= SEPARATOR); +} + +static int nvme_nguid_parse(const char *str, NvmeNGUID *nguid) +{ + uint8_t *id =3D &nguid->data[0]; + int ret =3D 0; + int i; + const char *ptr =3D str; + + if (!nvme_nguid_is_valid(str)) { + return -1; + } + + for (i =3D 0; i < NGUID_LEN; i++) { + ret =3D sscanf(ptr, "%02hhx", &id[i]); + if (ret !=3D 1) { + return -1; + } + ptr +=3D 2; + if (*ptr =3D=3D NGUID_SEPARATOR) { + ptr++; + } + } + + return 0; +} + +/* + * When converted back to string this implementation will use a raw hex nu= mber + * with no separators, for instance: + * + * "e9accd3b83904e13167cf0593437f57d" + */ +static void nvme_nguid_stringify(const NvmeNGUID *nguid, char *out) +{ + const uint8_t *id =3D &nguid->data[0]; + snprintf(out, NGUID_STR_LEN, NGUID_FMT, + id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7], + id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]); +} + +static void get_nguid(Object *obj, Visitor *v, const char *name, void *opa= que, + Error **errp) +{ + Property *prop =3D opaque; + NvmeNGUID *nguid =3D object_field_prop_ptr(obj, prop); + char buffer[NGUID_STR_LEN]; + char *p =3D buffer; + + nvme_nguid_stringify(nguid, buffer); + + visit_type_str(v, name, &p, errp); +} + +static void set_nguid(Object *obj, Visitor *v, const char *name, void *opa= que, + Error **errp) +{ + Property *prop =3D opaque; + NvmeNGUID *nguid =3D object_field_prop_ptr(obj, prop); + char *str; + + if (!visit_type_str(v, name, &str, errp)) { + return; + } + + if (!strcmp(str, NGUID_VALUE_AUTO)) { + nvme_nguid_generate(nguid); + } else if (nvme_nguid_parse(str, nguid) < 0) { + error_set_from_qdev_prop_error(errp, EINVAL, obj, name, str); + } + g_free(str); +} + +const PropertyInfo qdev_prop_nguid =3D { + .name =3D "str", + .description =3D + "NGUID or \"" NGUID_VALUE_AUTO "\" for random value", + .get =3D get_nguid, + .set =3D set_nguid, +}; diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c index 0eabcf5cf500..ea8db175dbd1 100644 --- a/hw/nvme/ns.c +++ b/hw/nvme/ns.c @@ -89,6 +89,7 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp) id_ns->mcl =3D cpu_to_le32(ns->params.mcl); id_ns->msrc =3D ns->params.msrc; id_ns->eui64 =3D cpu_to_be64(ns->params.eui64); + memcpy(&id_ns->nguid, &ns->params.nguid.data, sizeof(id_ns->nguid)); =20 ds =3D 31 - clz32(ns->blkconf.logical_block_size); ms =3D ns->params.ms; @@ -797,6 +798,7 @@ static Property nvme_ns_props[] =3D { DEFINE_PROP_BOOL("shared", NvmeNamespace, params.shared, true), DEFINE_PROP_UINT32("nsid", NvmeNamespace, params.nsid, 0), DEFINE_PROP_UUID_NODEFAULT("uuid", NvmeNamespace, params.uuid), + DEFINE_PROP_NGUID_NODEFAULT("nguid", NvmeNamespace, params.nguid), DEFINE_PROP_UINT64("eui64", NvmeNamespace, params.eui64, 0), DEFINE_PROP_UINT16("ms", NvmeNamespace, params.ms, 0), DEFINE_PROP_UINT8("mset", NvmeNamespace, params.mset, 0), diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index 5f2ae7b28b9c..392c02942682 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -171,13 +171,27 @@ static const uint8_t nvme_fdp_evf_shifts[FDP_EVT_MAX]= =3D { [FDP_EVT_RUH_IMPLICIT_RU_CHANGE] =3D 33, }; =20 +#define NGUID_LEN 16 + +typedef struct { + uint8_t data[NGUID_LEN]; +} NvmeNGUID; + +bool nvme_nguid_is_null(const NvmeNGUID *nguid); + +extern const PropertyInfo qdev_prop_nguid; + +#define DEFINE_PROP_NGUID_NODEFAULT(_name, _state, _field) \ + DEFINE_PROP(_name, _state, _field, qdev_prop_nguid, NvmeNGUID) + typedef struct NvmeNamespaceParams { - bool detached; - bool shared; - uint32_t nsid; - QemuUUID uuid; - uint64_t eui64; - bool eui64_default; + bool detached; + bool shared; + uint32_t nsid; + QemuUUID uuid; + NvmeNGUID nguid; + uint64_t eui64; + bool eui64_default; =20 uint16_t ms; uint8_t mset; --=20 2.44.0