From nobody Sun Feb 8 22:05:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614691963; cv=none; d=zohomail.com; s=zohoarc; b=l0Ff2Vgg5/FMGWbrlinXoQ6pWWKbXemSDc9YYD/u3tozTmoYCB8tIHGouXGBnmQGAVsBET8G/u1feVbjOCXkBCFMxVUtb0S7KjJyPsNf4csmAmeeUxdf/5MlTBav9cK/Pu4h0Uk1ri30sGeiN33fTFbCGet9/Qlf6kRCXY3BTTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614691963; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DKsJrXoeEiw6FlpAO/7urDILp0a+3n8O+3ieiz7ziQg=; b=En7O8u9c/B1J2nGKvEYgsg/nor1XVkQgawpGTYn5EZRaj+/gElfDa4UUptoFNIa+NfadB9MPksf3/01YXKxLBRjLD2b3xU1+tEaT1H2AnSw0ntKCF2IUNRXJVCrcCsS0ZF5EKREUNKuEINn74IcBwI+ow4jnZur7KfSt2vTSaAI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614691963087654.8957012387875; Tue, 2 Mar 2021 05:32:43 -0800 (PST) Received: from localhost ([::1]:42184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH58j-0007Bc-Qm for importer@patchew.org; Tue, 02 Mar 2021 08:32:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH52p-0001eS-G5; Tue, 02 Mar 2021 08:26:35 -0500 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:35348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lH52j-0001b4-VT; Tue, 02 Mar 2021 08:26:35 -0500 Received: by mail-pg1-x52c.google.com with SMTP id t25so13822368pga.2; Tue, 02 Mar 2021 05:26:29 -0800 (PST) Received: from localhost.localdomain ([211.108.35.36]) by smtp.gmail.com with ESMTPSA id u7sm20166956pfh.150.2021.03.02.05.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 05:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DKsJrXoeEiw6FlpAO/7urDILp0a+3n8O+3ieiz7ziQg=; b=AskehVtGOiCevdmdV0zKBGp+huL+bagbSot97ae1a1OehycCP5S8e7YmFEjIhKY+cU FCiphdGmAOjplLMghoD2F/rIFU19/vJwbhm3L/JNt6Oyk6I7ovrOx/Audg37TKFOa/ZJ aVZCUvMoOUxipfNP2wjVyIR+Itp6jRuH6/uBTg4DDKq9JeSB78UpzIqsXpZSaalgk6Yz RHK/Nb85+9AXiyg/o4FGWVibbeaXeb2AvtninDLqp0EkJf3J36/xeXrVaPFkpuOuhNVJ x6/joUIWAYiJb7XvZVFTxDWKvI2GivGnhYAsPZ0YEJbV2nJBIxSdXtSuuDjefdybbb1r IVJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DKsJrXoeEiw6FlpAO/7urDILp0a+3n8O+3ieiz7ziQg=; b=rG0NNqt1DtQoUhBBY9NCwrmzaZFHnuODFCc4k+9K73+uKHfidf/GiKEdHzWNGih71W 7FwEK5VukInOtuHgWQwIHix1f1HYWqqiBLgKwimDzyDazM3eUSEwXLvq0WIhIwxIZUHU XwIWrAHCkap55J7fxV8hf2HabwBOE6sZq1GEV8A+0WLf7lDBfZafVLbRFgkOM12AD0mc hdNOO1oW60FebKANk/shpuWgdgYCUnensH3jgmfkM7Gr1Qlp+fjI3eST7pgqGvswrGDw 0VHxWAD/Y6pig4UIZFllOLrXNgEX1gCT3Nv/OdE2RTFynA44Ku5QOBWlQdiBMCrRkwjQ a0jA== X-Gm-Message-State: AOAM533W4fH2FsoV+jtVtMlzfdQWtwLtxz2G0exhA3buC4ZtEOLw7+3C LhCw75kACebcv74StKYT98o3SPeq2Lvo5A== X-Google-Smtp-Source: ABdhPJwwcTM82JYZsI16XdSb9eDtQwAu7X6BbeEe+rgg0IIzj+P6f9If0ev9zXmcDd8R216mvcgl8Q== X-Received: by 2002:a63:ce18:: with SMTP id y24mr2354669pgf.246.1614691588000; Tue, 02 Mar 2021 05:26:28 -0800 (PST) From: Minwoo Im To: qemu-devel@nongnu.org, qemu-block@nongnu.org Subject: [PATCH V4 1/8] hw/block/nvme: support namespace detach Date: Tue, 2 Mar 2021 22:26:10 +0900 Message-Id: <20210302132617.18495-2-minwoo.im.dev@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210302132617.18495-1-minwoo.im.dev@gmail.com> References: <20210302132617.18495-1-minwoo.im.dev@gmail.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::52c; envelope-from=minwoo.im.dev@gmail.com; helo=mail-pg1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Klaus Jensen , Max Reitz , Klaus Jensen , Minwoo Im , Keith Busch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Given that now we have nvme-subsys device supported, we can manage namespace allocated, but not attached: detached. This patch introduced a parameter for nvme-ns device named 'detached'. This parameter indicates whether the given namespace device is detached from a entire NVMe subsystem('subsys' given case, shared namespace) or a controller('bus' given case, private namespace). - Allocated namespace 1) Shared ns in the subsystem 'subsys0': -device nvme-ns,id=3Dns1,drive=3Dblknvme0,nsid=3D1,subsys=3Dsubsys0,de= tached=3Dtrue 2) Private ns for the controller 'nvme0' of the subsystem 'subsys0': -device nvme-subsys,id=3Dsubsys0 -device nvme,serial=3Dfoo,id=3Dnvme0,subsys=3Dsubsys0 -device nvme-ns,id=3Dns1,drive=3Dblknvme0,nsid=3D1,bus=3Dnvme0,detache= d=3Dtrue 3) (Invalid case) Controller 'nvme0' has no subsystem to manage ns: -device nvme,serial=3Dfoo,id=3Dnvme0 -device nvme-ns,id=3Dns1,drive=3Dblknvme0,nsid=3D1,bus=3Dnvme0,detache= d=3Dtrue Signed-off-by: Minwoo Im Tested-by: Klaus Jensen Reviewed-by: Klaus Jensen --- hw/block/nvme-ns.c | 1 + hw/block/nvme-ns.h | 1 + hw/block/nvme-subsys.h | 1 + hw/block/nvme.c | 41 +++++++++++++++++++++++++++++++++++++++-- hw/block/nvme.h | 22 ++++++++++++++++++++++ 5 files changed, 64 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index 0e8760020483..eda6a0c003a4 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -399,6 +399,7 @@ static Property nvme_ns_props[] =3D { DEFINE_BLOCK_PROPERTIES(NvmeNamespace, blkconf), DEFINE_PROP_LINK("subsys", NvmeNamespace, subsys, TYPE_NVME_SUBSYS, NvmeSubsystem *), + DEFINE_PROP_BOOL("detached", NvmeNamespace, params.detached, false), DEFINE_PROP_UINT32("nsid", NvmeNamespace, params.nsid, 0), DEFINE_PROP_UUID("uuid", NvmeNamespace, params.uuid), DEFINE_PROP_UINT16("mssrl", NvmeNamespace, params.mssrl, 128), diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h index 7af6884862b5..b0c00e115d81 100644 --- a/hw/block/nvme-ns.h +++ b/hw/block/nvme-ns.h @@ -26,6 +26,7 @@ typedef struct NvmeZone { } NvmeZone; =20 typedef struct NvmeNamespaceParams { + bool detached; uint32_t nsid; QemuUUID uuid; =20 diff --git a/hw/block/nvme-subsys.h b/hw/block/nvme-subsys.h index ccf6a71398d3..890d118117dc 100644 --- a/hw/block/nvme-subsys.h +++ b/hw/block/nvme-subsys.h @@ -23,6 +23,7 @@ typedef struct NvmeSubsystem { uint8_t subnqn[256]; =20 NvmeCtrl *ctrls[NVME_SUBSYS_MAX_CTRLS]; + /* Allocated namespaces for this subsystem */ NvmeNamespace *namespaces[NVME_SUBSYS_MAX_NAMESPACES]; } NvmeSubsystem; =20 diff --git a/hw/block/nvme.c b/hw/block/nvme.c index edd0b85c10ce..f6aeae081840 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -23,7 +23,7 @@ * max_ioqpairs=3D, \ * aerl=3D, aer_max_queued=3D, \ * mdts=3D,zoned.append_size_limit=3D, \ - * subsys=3D \ + * subsys=3D,detached=3D * -device nvme-ns,drive=3D,bus=3D,nsid=3D,\ * zoned=3D, \ * subsys=3D @@ -82,6 +82,13 @@ * controllers in the subsystem. Otherwise, `bus` must be given to attach * this namespace to a specified single controller as a non-shared names= pace. * + * - `detached` + * Not to attach the namespace device to controllers in the NVMe subsyst= em + * during boot-up. If not given, namespaces are all attahced to all + * controllers in the subsystem by default. + * It's mutual exclusive with 'bus' parameter. It's only valid in case + * `subsys` is provided. + * * Setting `zoned` to true selects Zoned Command Set at the namespace. * In this case, the following namespace properties are available to confi= gure * zoned operation: @@ -4613,6 +4620,20 @@ static void nvme_init_state(NvmeCtrl *n) n->aer_reqs =3D g_new0(NvmeRequest *, n->params.aerl + 1); } =20 +static int nvme_attach_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **e= rrp) +{ + if (nvme_ns_is_attached(n, ns)) { + error_setg(errp, + "namespace %d is already attached to controller %d", + nvme_nsid(ns), n->cntlid); + return -1; + } + + nvme_ns_attach(n, ns); + + return 0; +} + int nvme_register_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) { uint32_t nsid =3D nvme_nsid(ns); @@ -4644,7 +4665,23 @@ int nvme_register_namespace(NvmeCtrl *n, NvmeNamespa= ce *ns, Error **errp) =20 trace_pci_nvme_register_namespace(nsid); =20 - n->namespaces[nsid - 1] =3D ns; + /* + * If subsys is not given, namespae is always attached to the controll= er + * because there's no subsystem to manage namespace allocation. + */ + if (!n->subsys) { + if (ns->params.detached) { + error_setg(errp, + "detached needs nvme-subsys specified nvme or nvme-= ns"); + return -1; + } + + return nvme_attach_namespace(n, ns, errp); + } else { + if (!ns->params.detached) { + return nvme_attach_namespace(n, ns, errp); + } + } =20 return 0; } diff --git a/hw/block/nvme.h b/hw/block/nvme.h index f45ace0cff5b..51b8739b4d1e 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -174,6 +174,10 @@ typedef struct NvmeCtrl { NvmeSubsystem *subsys; =20 NvmeNamespace namespace; + /* + * Attached namespaces to this controller. If subsys is not given, all + * namespaces in this list will always be attached. + */ NvmeNamespace *namespaces[NVME_MAX_NAMESPACES]; NvmeSQueue **sq; NvmeCQueue **cq; @@ -192,6 +196,24 @@ static inline NvmeNamespace *nvme_ns(NvmeCtrl *n, uint= 32_t nsid) return n->namespaces[nsid - 1]; } =20 +static inline bool nvme_ns_is_attached(NvmeCtrl *n, NvmeNamespace *ns) +{ + int nsid; + + for (nsid =3D 1; nsid <=3D n->num_namespaces; nsid++) { + if (nvme_ns(n, nsid) =3D=3D ns) { + return true; + } + } + + return false; +} + +static inline void nvme_ns_attach(NvmeCtrl *n, NvmeNamespace *ns) +{ + n->namespaces[nvme_nsid(ns) - 1] =3D ns; +} + static inline NvmeCQueue *nvme_cq(NvmeRequest *req) { NvmeSQueue *sq =3D req->sq; --=20 2.27.0