From nobody Mon Feb 9 08:11:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1615371291; cv=none; d=zohomail.com; s=zohoarc; b=JdmZ0aOFzv1SZUxGLawAUyzAijVdNCMFajfHWY1iwAhp5AuYdDARvZazmDUj3EDdqnYIWV7YmY+dJ9hARNuizpIpOPcl/aod8e+igfj52nBGovUaKHraVlHIdGhECImr4YmB9NsP8dqxxZXfAyqkqF2+mPG9m+l0R2h6hxwCUWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615371291; 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=syfbKz9cAFbhTNQ47bfqxOFLD21vjTzsbUZ3ny2ztrE=; b=i3Yrs2hg59r1iFbxAhuTF+SUPS6lMJ1uwRj+GtlVA22gh8OVuPN7b4j33D6hJd/J4isB1/DwHrWJZFQHNTVniGiWxGpMTAYA6OVLTJ48c0TmgZWTTqPylNfjMXlXcm4uhkSJ8VTGMfMjFiyFaV3148PWXUgepYuHiGBW0RfH/oI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1615371290939811.2409553970765; Wed, 10 Mar 2021 02:14:50 -0800 (PST) Received: from localhost ([::1]:50408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJvrd-0002Sp-OP for importer@patchew.org; Wed, 10 Mar 2021 05:14:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJvXW-0007Z1-O1; Wed, 10 Mar 2021 04:54:02 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:43857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJvXT-00057F-2c; Wed, 10 Mar 2021 04:54:02 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 4E5B65C00E1; Wed, 10 Mar 2021 04:53:58 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 10 Mar 2021 04:53:58 -0500 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id E6D74240057; Wed, 10 Mar 2021 04:53:56 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=syfbKz9cAFbhT NQ47bfqxOFLD21vjTzsbUZ3ny2ztrE=; b=w5UuuQXxZj2POqgBeGuw44Hasqja/ 4IsdK4Iaqr5MsO9M9OXh8ViBV44bFEvKWvzndDa1ols9zFlD1AhAvRouHQMZwAqU zPlH+9u0jz4xb+ugHRtwTpBo32SfM6sZhx73SoOX1py3LP+HH+OSuldoSEs9MX0u ayNKslJ/Y/JWE18pcauLvryVTT1n4YmYRIkQhtrheXVkSiTqfa280gWwd1ZOhIJP H6wCUiQyWdwbTxiXriAWxPt63vgwRx2unQO89+f5wpsjJ+5di+1Jgv4p7Qk5F4Qy too4zZJCV5fsd5JHHEAVHb+dbgW5ZVFb3A9rOaWUv3l7QaJM116dE1MIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=syfbKz9cAFbhTNQ47bfqxOFLD21vjTzsbUZ3ny2ztrE=; b=by5aBQ2I O91xTsxD7DFnx+j3SOmsI4MvJNVf/YPVuJEySssOfARqlOoqgIOI/A8dOQbSOvrG 37sQzcVPqB+xdH3JxD268jTLNMYyU6MuJkmZ54yeaOLY1dhn0DhBkGjQ544cndJP b+mhMtxZCKyEJqDBMosrLcqpwcYVVurANC+wFBCSnolANWZ6v2dokeMdMbx6cY6D 3LYPIVB2kzu2RzO0HxNVKGPmSLLVe2tM33sOY3A464k5HQPNsE3+EM1gyTuKGb6B xl4AUnLpBCFg1soniex5apFUDZP4DXkpNxnvU+tutk6seXEPgUi4u0YXtfL7LjcI 3uM05pGFriXDeg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddukedgtdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpeegne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v5 05/13] hw/block/nvme: add non-mdts command size limit for verify Date: Wed, 10 Mar 2021 10:53:39 +0100 Message-Id: <20210310095347.682395-6-its@irrelevant.dk> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210310095347.682395-1-its@irrelevant.dk> References: <20210310095347.682395-1-its@irrelevant.dk> 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=66.111.4.29; envelope-from=its@irrelevant.dk; helo=out5-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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Gollu Appalanaidu , Max Reitz , Keith Busch , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Verify is not subject to MDTS, so a single Verify command may result in excessive amounts of allocated memory. Impose a limit on the data size by adding support for TP 4040 ("Non-MDTS Command Size Limits"). Signed-off-by: Klaus Jensen Reviewed-by: Keith Busch --- hw/block/nvme.h | 1 + hw/block/nvme.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/hw/block/nvme.h b/hw/block/nvme.h index e3af0428f802..a87621aa31e4 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -26,6 +26,7 @@ typedef struct NvmeParams { uint8_t aerl; uint32_t aer_max_queued; uint8_t mdts; + uint8_t vsl; bool use_intel_id; uint8_t zasl; bool legacy_cmb; diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 43ef10921a94..70122a607169 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -23,7 +23,8 @@ * [pmrdev=3D,] \ * max_ioqpairs=3D, \ * aerl=3D,aer_max_queued=3D, \ - * mdts=3D,zoned.zasl=3D, \ + * mdts=3D,vsl=3D, \ + * zoned.zasl=3D, \ * subsys=3D * -device nvme-ns,drive=3D,bus=3D,nsid=3D,\ * zoned=3D, \ @@ -78,12 +79,26 @@ * as a power of two (2^n) and is in units of the minimum memory page si= ze * (CAP.MPSMIN). The default value is 7 (i.e. 512 KiB). * + * - `vsl` + * Indicates the maximum data size limit for the Verify command. Like `m= dts`, + * this value is specified as a power of two (2^n) and is in units of the + * minimum memory page size (CAP.MPSMIN). The default value is 7 (i.e. 5= 12 + * KiB). + * * - `zoned.zasl` * Indicates the maximum data transfer size for the Zone Append command.= Like * `mdts`, the value is specified as a power of two (2^n) and is in unit= s of * the minimum memory page size (CAP.MPSMIN). The default value is 0 (i.= e. * defaulting to the value of `mdts`). * + * - `zoned.append_size_limit` + * The maximum I/O size in bytes that is allowed in Zone Append command. + * The default is 128KiB. Since internally this this value is maintained= as + * ZASL =3D log2( / ), some values assig= ned + * to this property may be rounded down and result in a lower maximum ZA + * data size being in effect. By setting this property to 0, users can m= ake + * ZASL to be equal to MDTS. This property only affects zoned namespaces. + * * nvme namespace device parameters * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - `subsys` @@ -2544,6 +2559,10 @@ static uint16_t nvme_verify(NvmeCtrl *n, NvmeRequest= *req) } } =20 + if (len > n->page_size << n->params.vsl) { + return NVME_INVALID_FIELD | NVME_DNR; + } + status =3D nvme_check_bounds(ns, slba, nlb); if (status) { trace_pci_nvme_err_invalid_lba_range(slba, nlb, ns->id_ns.nsze); @@ -4108,12 +4127,14 @@ static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n,= NvmeRequest *req) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; uint8_t id[NVME_IDENTIFY_DATA_SIZE] =3D {}; + NvmeIdCtrlNvm *id_nvm =3D (NvmeIdCtrlNvm *)&id; =20 trace_pci_nvme_identify_ctrl_csi(c->csi); =20 switch (c->csi) { case NVME_CSI_NVM: - ((NvmeIdCtrlNvm *)&id)->dmrsl =3D cpu_to_le32(n->dmrsl); + id_nvm->vsl =3D n->params.vsl; + id_nvm->dmrsl =3D cpu_to_le32(n->dmrsl); break; =20 case NVME_CSI_ZONED: @@ -5656,6 +5677,11 @@ static void nvme_check_constraints(NvmeCtrl *n, Erro= r **errp) "than or equal to mdts (Maximum Data Transfer Size)"); return; } + + if (!n->params.vsl) { + error_setg(errp, "vsl must be non-zero"); + return; + } } =20 static void nvme_init_state(NvmeCtrl *n) @@ -5913,8 +5939,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) id->nn =3D cpu_to_le32(n->num_namespaces); id->oncs =3D cpu_to_le16(NVME_ONCS_WRITE_ZEROES | NVME_ONCS_TIMESTAMP | NVME_ONCS_FEATURES | NVME_ONCS_DSM | - NVME_ONCS_COMPARE | NVME_ONCS_COPY | - NVME_ONCS_VERIFY); + NVME_ONCS_COMPARE | NVME_ONCS_COPY); =20 /* * NOTE: If this device ever supports a command set that does NOT use = 0x0 @@ -6057,6 +6082,7 @@ static Property nvme_props[] =3D { DEFINE_PROP_UINT8("aerl", NvmeCtrl, params.aerl, 3), DEFINE_PROP_UINT32("aer_max_queued", NvmeCtrl, params.aer_max_queued, = 64), DEFINE_PROP_UINT8("mdts", NvmeCtrl, params.mdts, 7), + DEFINE_PROP_UINT8("vsl", NvmeCtrl, params.vsl, 7), DEFINE_PROP_BOOL("use-intel-id", NvmeCtrl, params.use_intel_id, false), DEFINE_PROP_BOOL("legacy-cmb", NvmeCtrl, params.legacy_cmb, false), DEFINE_PROP_UINT8("zoned.zasl", NvmeCtrl, params.zasl, 0), --=20 2.30.1