From nobody Wed Nov 19 04:32:54 2025 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=1614684108; cv=none; d=zohomail.com; s=zohoarc; b=lQABjyL7iSezorvzlMUacSQbA4qTBTE0yZIfoE0VoglvNkJbV9puyxwzd498SNTjlz3pyzdcIOZRNjPBGAA06pYMK9/6Y9+J2iUm8AdqBgeQqa9SQwKuLnwcsDNRjycK0tM2SgW8TQSGam82wuoRoPAjDpDutS7mhgk1OTKVYyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614684108; 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=eriUzmsaVkfozek47QFSs22AoXxj4Tuh5gCifVLfnq4=; b=fuM9TZDmSgxf2jFzoiww8UpCUCy0Brbk51EZH8gGNPPD9lbc+V+mf92vKCEkc8ZWFwQlcaTiUbPdmGy4u2CVaVlCRCF9GNYEw37S5F0reC7z5hTjUrxTDNU/j8tNYA5SpwNFDfcicIwTE8VGicJv4UHXwUSN+FfTbt+5sj7xYEc= 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 1614684108081234.65687005582504; Tue, 2 Mar 2021 03:21:48 -0800 (PST) Received: from localhost ([::1]:46486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH362-0005fK-Jb for importer@patchew.org; Tue, 02 Mar 2021 06:21:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vS-0006Yz-6J; Tue, 02 Mar 2021 06:10:50 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:47365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vP-0007Hy-HF; Tue, 02 Mar 2021 06:10:49 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D17CE5C0181; Tue, 2 Mar 2021 06:10:45 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 02 Mar 2021 06:10:45 -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 B474A1080054; Tue, 2 Mar 2021 06:10:44 -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=eriUzmsaVkfoz ek47QFSs22AoXxj4Tuh5gCifVLfnq4=; b=vt4MlVCaJWr3jvjZsuld6TO/CWDo/ ZeU+YaYgqAoNfZNy8pzQj+IvaAP4x5ZyHi13okF6e82eCx0QU1zZWqXbleDQsVqi suHC4MYJ30vXU0DG5JYMsmBuQuRe7Mqdm9sSzE4gOvfjLS753FAHPNEW3T4x3BoB yeSi7Y0EFODmAWOUsUKQXtExS3bj4o7uOa38Q/hXvop5ihKQJBAl1PV3+iD9HKUU KphYrHVkHUSZ/ZRPbsji292O3gf1cog1MJH7/hjHQEGTnPz7JS2Xx/MeK9Se38+w qYP2pL2YQLuUPHeWfN7+dTuI3c0boYytNe5n2dExtKjizs/wWCw538Xlg== 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=eriUzmsaVkfozek47QFSs22AoXxj4Tuh5gCifVLfnq4=; b=thr9qg8H lxAwsL85qM2hDnnb+eIfxwcq3h/u2tHOEzVJmQz+160lDrQyI5xkIOMyb/7/nU/i 2M/4PW5km3i1VT0n0D+SONuSfm1dxeq6oaCFYRQQjudWq1jGTjMHIUHj7lwpXXsj f7F4+14prbVtTPG6sGbh/RpBLmvd+e6YV5EgalO4lKHRKcbrXLCqTqa30tVm9Tzx 9EsmLZxzvz/HC4kRuwjZO0073qW05ri8cqPBBKJlT9hhukb15+MlWLFi47lcSvQh ob7JpHCe4nbD09PV9Jf8lxw9OR/NpTV3st9QxHZkiEbLrYD0kMrxK6wBKgsru/f/ qWqHMumV8u16IA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddttddgvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH RFC 1/4] hw/block/nvme: convert dsm to aiocb Date: Tue, 2 Mar 2021 12:10:37 +0100 Message-Id: <20210302111040.289244-2-its@irrelevant.dk> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302111040.289244-1-its@irrelevant.dk> References: <20210302111040.289244-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.27; envelope-from=its@irrelevant.dk; helo=out3-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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Klaus Jensen , Stefan Hajnoczi , Keith Busch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Convert dataset management from ad-hoc multi aio tracking to use standard QEMU AIOCB processing. Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 187 ++++++++++++++++++++++++++++-------------- hw/block/trace-events | 2 +- 2 files changed, 125 insertions(+), 64 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 54c87c8f5fe3..8830d72b959f 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1494,23 +1494,16 @@ static void nvme_aio_flush_cb(void *opaque, int ret) nvme_enqueue_req_completion(nvme_cq(req), req); } =20 -static void nvme_aio_discard_cb(void *opaque, int ret) +static void nvme_misc_cb(void *opaque, int ret) { NvmeRequest *req =3D opaque; - uintptr_t *discards =3D (uintptr_t *)&req->opaque; =20 - trace_pci_nvme_aio_discard_cb(nvme_cid(req)); + trace_pci_nvme_misc_cb(nvme_cid(req)); =20 if (ret) { nvme_aio_err(req, ret); } =20 - (*discards)--; - - if (*discards) { - return; - } - nvme_enqueue_req_completion(nvme_cq(req), req); } =20 @@ -1736,78 +1729,146 @@ out: nvme_enqueue_req_completion(nvme_cq(req), req); } =20 +typedef struct NvmeDSMAIOCB { + BlockAIOCB common; + BlockAIOCB *aiocb; + NvmeRequest *req; + QEMUBH *bh; + int ret; + + NvmeDsmRange *range; + int nr; + struct { + int64_t offset; + size_t len; + int idx; + } curr; +} NvmeDSMAIOCB; + +static void nvme_dsm_cancel(BlockAIOCB *aiocb) +{ + NvmeDSMAIOCB *iocb =3D container_of(aiocb, NvmeDSMAIOCB, common); + + /* break loop */ + iocb->curr.len =3D 0; + iocb->curr.idx =3D iocb->nr; + + iocb->ret =3D -ECANCELED; + + if (iocb->aiocb) { + blk_aio_cancel_async(iocb->aiocb); + iocb->aiocb =3D NULL; + } +} + +static const AIOCBInfo nvme_dsm_aiocb_info =3D { + .aiocb_size =3D sizeof(NvmeDSMAIOCB), + .cancel_async =3D nvme_dsm_cancel, +}; + +static void nvme_dsm_bh(void *opaque) +{ + NvmeDSMAIOCB *iocb =3D opaque; + + iocb->common.cb(iocb->common.opaque, iocb->ret); + + qemu_bh_delete(iocb->bh); + iocb->bh =3D NULL; + qemu_aio_unref(iocb); +} + +static void nvme_dsm_aio_cb(void *opaque, int ret) +{ + NvmeDSMAIOCB *iocb =3D opaque; + NvmeRequest *req =3D iocb->req; + NvmeCtrl *n =3D nvme_ctrl(req); + NvmeNamespace *ns =3D req->ns; + NvmeDsmRange *range; + uint64_t slba; + uint32_t nlb; + size_t bytes; + + if (ret < 0) { + iocb->ret =3D ret; + goto done; + } + + if (iocb->curr.len =3D=3D 0) { +next: + if (iocb->curr.idx =3D=3D iocb->nr) { + goto done; + } + + range =3D &iocb->range[iocb->curr.idx++]; + slba =3D le64_to_cpu(range->slba); + nlb =3D le32_to_cpu(range->nlb); + + trace_pci_nvme_dsm_deallocate(nvme_cid(req), nvme_nsid(ns), slba, + nlb); + + if (nlb > n->dmrsl) { + trace_pci_nvme_dsm_single_range_limit_exceeded(nlb, n->dmrsl); + } + + if (nvme_check_bounds(ns, slba, nlb)) { + trace_pci_nvme_err_invalid_lba_range(slba, nlb, + ns->id_ns.nsze); + goto next; + } + + iocb->curr.offset =3D nvme_l2b(ns, slba); + iocb->curr.len =3D nvme_l2b(ns, nlb); + } + + bytes =3D MIN(BDRV_REQUEST_MAX_BYTES, iocb->curr.len); + + iocb->aiocb =3D blk_aio_pdiscard(ns->blkconf.blk, iocb->curr.offset, b= ytes, + nvme_dsm_aio_cb, iocb); + + iocb->curr.offset +=3D bytes; + iocb->curr.len -=3D bytes; + + return; + +done: + iocb->aiocb =3D NULL; + if (iocb->bh) { + qemu_bh_schedule(iocb->bh); + } +} + static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest *req) { NvmeNamespace *ns =3D req->ns; NvmeDsmCmd *dsm =3D (NvmeDsmCmd *) &req->cmd; - uint32_t attr =3D le32_to_cpu(dsm->attributes); uint32_t nr =3D (le32_to_cpu(dsm->nr) & 0xff) + 1; - uint16_t status =3D NVME_SUCCESS; =20 trace_pci_nvme_dsm(nvme_cid(req), nvme_nsid(ns), nr, attr); =20 if (attr & NVME_DSMGMT_AD) { - int64_t offset; - size_t len; - NvmeDsmRange range[nr]; - uintptr_t *discards =3D (uintptr_t *)&req->opaque; + NvmeDSMAIOCB *iocb =3D blk_aio_get(&nvme_dsm_aiocb_info, ns->blkco= nf.blk, + nvme_misc_cb, req); =20 - status =3D nvme_dma(n, (uint8_t *)range, sizeof(range), + iocb->req =3D req; + iocb->bh =3D qemu_bh_new(nvme_dsm_bh, iocb); + iocb->ret =3D 0; + iocb->range =3D g_new(NvmeDsmRange, nr); + iocb->nr =3D nr; + iocb->curr.len =3D 0; + iocb->curr.idx =3D 0; + + status =3D nvme_dma(n, (uint8_t *)iocb->range, sizeof(NvmeDsmRange= ) * nr, DMA_DIRECTION_TO_DEVICE, req); if (status) { return status; } =20 - /* - * AIO callbacks may be called immediately, so initialize discards= to 1 - * to make sure the the callback does not complete the request bef= ore - * all discards have been issued. - */ - *discards =3D 1; + nvme_dsm_aio_cb(iocb, 0); + req->aiocb =3D &iocb->common; =20 - for (int i =3D 0; i < nr; i++) { - uint64_t slba =3D le64_to_cpu(range[i].slba); - uint32_t nlb =3D le32_to_cpu(range[i].nlb); - - if (nvme_check_bounds(ns, slba, nlb)) { - trace_pci_nvme_err_invalid_lba_range(slba, nlb, - ns->id_ns.nsze); - continue; - } - - trace_pci_nvme_dsm_deallocate(nvme_cid(req), nvme_nsid(ns), sl= ba, - nlb); - - if (nlb > n->dmrsl) { - trace_pci_nvme_dsm_single_range_limit_exceeded(nlb, n->dmr= sl); - } - - offset =3D nvme_l2b(ns, slba); - len =3D nvme_l2b(ns, nlb); - - while (len) { - size_t bytes =3D MIN(BDRV_REQUEST_MAX_BYTES, len); - - (*discards)++; - - blk_aio_pdiscard(ns->blkconf.blk, offset, bytes, - nvme_aio_discard_cb, req); - - offset +=3D bytes; - len -=3D bytes; - } - } - - /* account for the 1-initialization */ - (*discards)--; - - if (*discards) { - status =3D NVME_NO_COMPLETE; - } else { - status =3D req->status; - } + return NVME_NO_COMPLETE; } =20 return status; diff --git a/hw/block/trace-events b/hw/block/trace-events index 8deeacc8c35c..0e5bddbdd48b 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -54,7 +54,7 @@ pci_nvme_dsm_deallocate(uint16_t cid, uint32_t nsid, uint= 64_t slba, uint32_t nlb pci_nvme_dsm_single_range_limit_exceeded(uint32_t nlb, uint32_t dmrsl) "nl= b %"PRIu32" dmrsl %"PRIu32"" pci_nvme_compare(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb)= "cid %"PRIu16" nsid %"PRIu32" slba 0x%"PRIx64" nlb %"PRIu32"" pci_nvme_compare_cb(uint16_t cid) "cid %"PRIu16"" -pci_nvme_aio_discard_cb(uint16_t cid) "cid %"PRIu16"" +pci_nvme_misc_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_aio_copy_in_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_aio_zone_reset_cb(uint16_t cid, uint64_t zslba) "cid %"PRIu16" zs= lba 0x%"PRIx64"" pci_nvme_aio_flush_cb(uint16_t cid, const char *blkname) "cid %"PRIu16" bl= k '%s'" --=20 2.30.1 From nobody Wed Nov 19 04:32:54 2025 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=1614683917; cv=none; d=zohomail.com; s=zohoarc; b=K50kyIgbs8yh55WcfoYrA0onE2ut6J717A/YkjX8lESaguT7ygmAcyYQS/SlMPuLpOUfWGdm+CUCCHd5fUszsA6rTD2YymafOUknGV/o9c3j/mE3XSQftZJ0vBzHiM+KxCK2V+0bHltMvOJnIoeDy08LSjpZTnujWLVCBq7RD68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614683917; 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=SOEL7gSsOCXohVk5SSqfd5NkSNYvgtjmltmkeqWrdew=; b=nTDL5EkHlWxZK5rtJ/OqxKmOEpxF9ZxedaBPohCL8mvMFDeUiaCvrYhFWaea8XW9IwvFNCb7TDT53iK+Csd6NiYad24N+OrOKKDgPaiyl1VOqoGd+Z1SBnqYXvmqYpjZYa2A4H79bMG98TjAaddI73jrEyi+IWzgayWTrGFzTNE= 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 1614683917093536.8347381951326; Tue, 2 Mar 2021 03:18:37 -0800 (PST) Received: from localhost ([::1]:39308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH32w-0002Tq-2F for importer@patchew.org; Tue, 02 Mar 2021 06:18:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vS-0006a5-Ol; Tue, 02 Mar 2021 06:10:50 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vQ-0007IE-03; Tue, 02 Mar 2021 06:10:50 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2DDDC5C018B; Tue, 2 Mar 2021 06:10:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 02 Mar 2021 06:10:47 -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 F1EB01080054; Tue, 2 Mar 2021 06:10:45 -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=SOEL7gSsOCXoh Vk5SSqfd5NkSNYvgtjmltmkeqWrdew=; b=U/VtL3ZGuJNcLA/1ekbSBpgwaziEe 4CIuiB11MP4+xPN/BoHOrQwsLVuZjdsJ+A87TxDg3uF1hWarz45T9trZ+rD8xBjL tufHHeqG2V8a1wSGJ2tw7pxeX9xXKrlg5+07dfHGSaRH1nogej6fAyjuVjBOh48J 9dQ+QNSWH2S849HfymgWAff3LpCX31ZN48RXezMZzTwRhIEpO3SdxTODDnTB2v9r nfrxXNzbBkNR5z/rYI6++02XJC5CRXbEftJbt0b5SXCCzRNWtnGxztg7pxVzBDNW pzsvDAcW7SXJb7hBANRzbLvNJm3A3BhURoLmTCjNwQ3SJ1lY8E2hWrY7A== 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=SOEL7gSsOCXohVk5SSqfd5NkSNYvgtjmltmkeqWrdew=; b=hkqJV9wk Kewt3dcYzzL8+TaK6lsQbOwW/zRu+Vo/5d4W98pCxqtBNL2A2z9yKeH8BIeFtHSx wQTgY77jcoKzeD0sR84WDhITv7eAdbbwT0/ijKNKJhqLiTSEJ57FJGjiSrFz74pt RM3DuAeTrZNUj0xDowBSvkBw2NHEhsw9vSZpeG1DjhblEJVRtEcKeksA7LZbKt2q 5+SOQG7YzIEiInpyn0HI/Pc+zArAw5fKiSeRUP+jBm/HmF+gUAg4HbcXhRE8Idsf /QddMXZcAJVSXJEyQb6i0ZP7lQMymQm0yJ2qoVGSiGwiK20VlFBg/ZmPXoUfdG2X TGsAqQLAs1u0pg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddttddgvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedune curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH RFC 2/4] hw/block/nvme: convert copy to aiocb Date: Tue, 2 Mar 2021 12:10:38 +0100 Message-Id: <20210302111040.289244-3-its@irrelevant.dk> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302111040.289244-1-its@irrelevant.dk> References: <20210302111040.289244-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.27; envelope-from=its@irrelevant.dk; helo=out3-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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Klaus Jensen , Stefan Hajnoczi , Keith Busch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Convert copy from ad-hoc multi aio tracking to use standard QEMU AIOCB processing. Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 382 +++++++++++++++++++++++++----------------------- 1 file changed, 199 insertions(+), 183 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 8830d72b959f..48a1abe52787 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1554,136 +1554,6 @@ static void nvme_aio_zone_reset_cb(void *opaque, in= t ret) nvme_enqueue_req_completion(nvme_cq(req), req); } =20 -struct nvme_copy_ctx { - int copies; - uint8_t *bounce; - uint32_t nlb; -}; - -struct nvme_copy_in_ctx { - NvmeRequest *req; - QEMUIOVector iov; -}; - -static void nvme_copy_cb(void *opaque, int ret) -{ - NvmeRequest *req =3D opaque; - NvmeNamespace *ns =3D req->ns; - struct nvme_copy_ctx *ctx =3D req->opaque; - - trace_pci_nvme_copy_cb(nvme_cid(req)); - - if (ns->params.zoned) { - NvmeCopyCmd *copy =3D (NvmeCopyCmd *)&req->cmd; - uint64_t sdlba =3D le64_to_cpu(copy->sdlba); - NvmeZone *zone =3D nvme_get_zone_by_slba(ns, sdlba); - - __nvme_advance_zone_wp(ns, zone, ctx->nlb); - } - - if (!ret) { - block_acct_done(blk_get_stats(ns->blkconf.blk), &req->acct); - } else { - block_acct_failed(blk_get_stats(ns->blkconf.blk), &req->acct); - nvme_aio_err(req, ret); - } - - g_free(ctx->bounce); - g_free(ctx); - - nvme_enqueue_req_completion(nvme_cq(req), req); -} - -static void nvme_copy_in_complete(NvmeRequest *req) -{ - NvmeNamespace *ns =3D req->ns; - NvmeCopyCmd *copy =3D (NvmeCopyCmd *)&req->cmd; - struct nvme_copy_ctx *ctx =3D req->opaque; - uint64_t sdlba =3D le64_to_cpu(copy->sdlba); - uint16_t status; - - trace_pci_nvme_copy_in_complete(nvme_cid(req)); - - block_acct_done(blk_get_stats(ns->blkconf.blk), &req->acct); - - status =3D nvme_check_bounds(ns, sdlba, ctx->nlb); - if (status) { - trace_pci_nvme_err_invalid_lba_range(sdlba, ctx->nlb, ns->id_ns.ns= ze); - goto invalid; - } - - if (ns->params.zoned) { - NvmeZone *zone =3D nvme_get_zone_by_slba(ns, sdlba); - - status =3D nvme_check_zone_write(ns, zone, sdlba, ctx->nlb); - if (status) { - goto invalid; - } - - status =3D nvme_zrm_auto(ns, zone); - if (status) { - goto invalid; - } - - zone->w_ptr +=3D ctx->nlb; - } - - qemu_iovec_init(&req->iov, 1); - qemu_iovec_add(&req->iov, ctx->bounce, nvme_l2b(ns, ctx->nlb)); - - block_acct_start(blk_get_stats(ns->blkconf.blk), &req->acct, 0, - BLOCK_ACCT_WRITE); - - req->aiocb =3D blk_aio_pwritev(ns->blkconf.blk, nvme_l2b(ns, sdlba), - &req->iov, 0, nvme_copy_cb, req); - - return; - -invalid: - req->status =3D status; - - g_free(ctx->bounce); - g_free(ctx); - - nvme_enqueue_req_completion(nvme_cq(req), req); -} - -static void nvme_aio_copy_in_cb(void *opaque, int ret) -{ - struct nvme_copy_in_ctx *in_ctx =3D opaque; - NvmeRequest *req =3D in_ctx->req; - NvmeNamespace *ns =3D req->ns; - struct nvme_copy_ctx *ctx =3D req->opaque; - - qemu_iovec_destroy(&in_ctx->iov); - g_free(in_ctx); - - trace_pci_nvme_aio_copy_in_cb(nvme_cid(req)); - - if (ret) { - nvme_aio_err(req, ret); - } - - ctx->copies--; - - if (ctx->copies) { - return; - } - - if (req->status) { - block_acct_failed(blk_get_stats(ns->blkconf.blk), &req->acct); - - g_free(ctx->bounce); - g_free(ctx); - - nvme_enqueue_req_completion(nvme_cq(req), req); - - return; - } - - nvme_copy_in_complete(req); -} - struct nvme_compare_ctx { QEMUIOVector iov; uint8_t *bounce; @@ -1874,18 +1744,184 @@ static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest = *req) return status; } =20 +typedef struct NvmeCopyAIOCB { + BlockAIOCB common; + BlockAIOCB *aiocb; + NvmeRequest *req; + QEMUBH *bh; + int ret; + + NvmeCopySourceRange *range; + int nr; + uint32_t nlb; + uint8_t *bounce; + bool done; + struct { + int idx; + uint8_t *p; + } copy_in; +} NvmeCopyAIOCB; + +static void nvme_copy_cancel(BlockAIOCB *aiocb) +{ + NvmeCopyAIOCB *iocb =3D container_of(aiocb, NvmeCopyAIOCB, common); + + iocb->ret =3D -ECANCELED; + iocb->copy_in.idx =3D iocb->nr; + iocb->done =3D true; + + if (iocb->aiocb) { + blk_aio_cancel_async(iocb->aiocb); + iocb->aiocb =3D NULL; + } +} + +static const AIOCBInfo nvme_copy_aiocb_info =3D { + .aiocb_size =3D sizeof(NvmeCopyAIOCB), + .cancel_async =3D nvme_copy_cancel, +}; + +static void nvme_copy_bh(void *opaque) +{ + NvmeCopyAIOCB *iocb =3D opaque; + NvmeRequest *req =3D iocb->req; + NvmeNamespace *ns =3D req->ns; + + if (ns->params.zoned) { + NvmeCopyCmd *copy =3D (NvmeCopyCmd *)&req->cmd; + uint64_t sdlba =3D le64_to_cpu(copy->sdlba); + NvmeZone *zone =3D nvme_get_zone_by_slba(ns, sdlba); + + __nvme_advance_zone_wp(ns, zone, iocb->nlb); + } + + if (iocb->ret < 0) { + block_acct_failed(blk_get_stats(ns->blkconf.blk), &req->acct); + } else { + block_acct_done(blk_get_stats(ns->blkconf.blk), &req->acct); + } + + + iocb->common.cb(iocb->common.opaque, iocb->ret); + + qemu_bh_delete(iocb->bh); + iocb->bh =3D NULL; + + g_free(iocb->bounce); + + qemu_aio_unref(iocb); +} + +static void nvme_copy_aio_cb(void *opaque, int ret); + +static uint16_t nvme_copy_in_complete(NvmeCopyAIOCB *iocb) +{ + NvmeRequest *req =3D iocb->req; + NvmeNamespace *ns =3D req->ns; + NvmeCopyCmd *copy =3D (NvmeCopyCmd *)&req->cmd; + uint64_t sdlba =3D le64_to_cpu(copy->sdlba); + uint16_t status; + + block_acct_done(blk_get_stats(ns->blkconf.blk), &req->acct); + + status =3D nvme_check_bounds(ns, sdlba, iocb->nlb); + if (status) { + trace_pci_nvme_err_invalid_lba_range(sdlba, iocb->nlb, ns->id_ns.n= sze); + return status; + } + + if (ns->params.zoned) { + NvmeZone *zone =3D nvme_get_zone_by_slba(ns, sdlba); + + status =3D nvme_check_zone_write(ns, zone, sdlba, iocb->nlb); + if (status) { + return status; + } + + status =3D nvme_zrm_auto(ns, zone); + if (status) { + return status; + } + + zone->w_ptr +=3D iocb->nlb; + } + + iocb->done =3D true; + + qemu_iovec_reset(&req->iov); + qemu_iovec_add(&req->iov, iocb->bounce, nvme_l2b(ns, iocb->nlb)); + + block_acct_start(blk_get_stats(ns->blkconf.blk), &req->acct, 0, + BLOCK_ACCT_WRITE); + + iocb->aiocb =3D blk_aio_pwritev(ns->blkconf.blk, nvme_l2b(ns, sdlba), + &req->iov, 0, nvme_copy_aio_cb, iocb); + + return NVME_SUCCESS; +} + +static void nvme_copy_aio_cb(void *opaque, int ret) +{ + NvmeCopyAIOCB *iocb =3D opaque; + NvmeRequest *req =3D iocb->req; + NvmeNamespace *ns =3D req->ns; + NvmeCopySourceRange *range; + uint64_t slba; + uint32_t nlb; + size_t bytes; + uint16_t status; + + if (ret < 0) { + iocb->ret =3D ret; + goto done; + } + + if (iocb->copy_in.idx =3D=3D iocb->nr) { + if (iocb->done) { + goto done; + } + + status =3D nvme_copy_in_complete(iocb); + if (status) { + req->status =3D status; + goto done; + } + + return; + } + + range =3D &iocb->range[iocb->copy_in.idx++]; + slba =3D le64_to_cpu(range->slba); + nlb =3D le32_to_cpu(range->nlb); + bytes =3D nvme_l2b(ns, nlb); + + trace_pci_nvme_copy_source_range(slba, nlb); + + qemu_iovec_reset(&req->iov); + qemu_iovec_add(&req->iov, iocb->copy_in.p, bytes); + iocb->copy_in.p +=3D bytes; + + iocb->aiocb =3D blk_aio_preadv(ns->blkconf.blk, nvme_l2b(ns, slba), + &req->iov, 0, nvme_copy_aio_cb, iocb); + return; + +done: + iocb->aiocb =3D NULL; + if (iocb->bh) { + qemu_bh_schedule(iocb->bh); + } +} + + static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest *req) { NvmeNamespace *ns =3D req->ns; NvmeCopyCmd *copy =3D (NvmeCopyCmd *)&req->cmd; - g_autofree NvmeCopySourceRange *range =3D NULL; - + NvmeCopyAIOCB *iocb =3D blk_aio_get(&nvme_copy_aiocb_info, ns->blkconf= .blk, + nvme_misc_cb, req); uint16_t nr =3D copy->nr + 1; uint8_t format =3D copy->control[0] & 0xf; uint32_t nlb =3D 0; - - uint8_t *bounce =3D NULL, *bouncep =3D NULL; - struct nvme_copy_ctx *ctx; uint16_t status; int i; =20 @@ -1900,39 +1936,46 @@ static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest = *req) return NVME_CMD_SIZE_LIMIT | NVME_DNR; } =20 - range =3D g_new(NvmeCopySourceRange, nr); + iocb->req =3D req; + iocb->bh =3D qemu_bh_new(nvme_copy_bh, iocb); + iocb->ret =3D 0; + iocb->done =3D false; + iocb->range =3D g_new(NvmeCopySourceRange, nr); + iocb->nr =3D nr; + iocb->copy_in.idx =3D 0; =20 - status =3D nvme_dma(n, (uint8_t *)range, nr * sizeof(NvmeCopySourceRan= ge), + status =3D nvme_dma(n, (uint8_t *)iocb->range, + sizeof(NvmeCopySourceRange) * nr, DMA_DIRECTION_TO_DEVICE, req); if (status) { - return status; + goto invalid; } =20 for (i =3D 0; i < nr; i++) { - uint64_t slba =3D le64_to_cpu(range[i].slba); - uint32_t _nlb =3D le16_to_cpu(range[i].nlb) + 1; + uint64_t slba =3D le64_to_cpu(iocb->range[i].slba); + uint32_t _nlb =3D le16_to_cpu(iocb->range[i].nlb) + 1; =20 if (_nlb > le16_to_cpu(ns->id_ns.mssrl)) { - return NVME_CMD_SIZE_LIMIT | NVME_DNR; + status =3D NVME_CMD_SIZE_LIMIT | NVME_DNR; } =20 status =3D nvme_check_bounds(ns, slba, _nlb); if (status) { trace_pci_nvme_err_invalid_lba_range(slba, _nlb, ns->id_ns.nsz= e); - return status; + goto invalid; } =20 if (NVME_ERR_REC_DULBE(ns->features.err_rec)) { status =3D nvme_check_dulbe(ns, slba, _nlb); if (status) { - return status; + goto invalid; } } =20 if (ns->params.zoned) { status =3D nvme_check_zone_read(ns, slba, _nlb); if (status) { - return status; + goto invalid; } } =20 @@ -1940,53 +1983,26 @@ static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest = *req) } =20 if (nlb > le32_to_cpu(ns->id_ns.mcl)) { - return NVME_CMD_SIZE_LIMIT | NVME_DNR; + status =3D NVME_CMD_SIZE_LIMIT | NVME_DNR; + goto invalid; } =20 - bounce =3D bouncep =3D g_malloc(nvme_l2b(ns, nlb)); + iocb->nlb =3D nlb; + iocb->bounce =3D g_malloc(nvme_l2b(ns, nlb)); + iocb->copy_in.p =3D iocb->bounce; + + qemu_iovec_init(&req->iov, 1); =20 block_acct_start(blk_get_stats(ns->blkconf.blk), &req->acct, 0, BLOCK_ACCT_READ); =20 - ctx =3D g_new(struct nvme_copy_ctx, 1); - - ctx->bounce =3D bounce; - ctx->nlb =3D nlb; - ctx->copies =3D 1; - - req->opaque =3D ctx; - - for (i =3D 0; i < nr; i++) { - uint64_t slba =3D le64_to_cpu(range[i].slba); - uint32_t nlb =3D le16_to_cpu(range[i].nlb) + 1; - - size_t len =3D nvme_l2b(ns, nlb); - int64_t offset =3D nvme_l2b(ns, slba); - - trace_pci_nvme_copy_source_range(slba, nlb); - - struct nvme_copy_in_ctx *in_ctx =3D g_new(struct nvme_copy_in_ctx,= 1); - in_ctx->req =3D req; - - qemu_iovec_init(&in_ctx->iov, 1); - qemu_iovec_add(&in_ctx->iov, bouncep, len); - - ctx->copies++; - - blk_aio_preadv(ns->blkconf.blk, offset, &in_ctx->iov, 0, - nvme_aio_copy_in_cb, in_ctx); - - bouncep +=3D len; - } - - /* account for the 1-initialization */ - ctx->copies--; - - if (!ctx->copies) { - nvme_copy_in_complete(req); - } + nvme_copy_aio_cb(iocb, 0); + req->aiocb =3D &iocb->common; =20 return NVME_NO_COMPLETE; + +invalid: + return status; } =20 static uint16_t nvme_compare(NvmeCtrl *n, NvmeRequest *req) --=20 2.30.1 From nobody Wed Nov 19 04:32:54 2025 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=1614683728; cv=none; d=zohomail.com; s=zohoarc; b=PlGjVrjA/5V56opehGz+X68CR7kk06uvgG5fK5tya71Xz50lKIYyLsdieoWLXsQcZ0FKSom/bRikn7WgSsNVlJ7d2HC5C5ePEdw9GuQOKgNFObF4/zTQFTMNHWtmk87SvW6HX3xOqWPMnefFGr/nrXLp/9wlMKPnoKyFIVNCQqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614683728; 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=PNZmbtZdEl/mFrCUEeQ2F7hb4v6l/Eu6Q3cp/qGLdZ0=; b=Ick5c/RU9RBi2ONozYrZqY3+b0khfqK0RCZ5xYZJTn5vk7v+W+UZBRuniKdCOIsb7A1glWF+hGt8kN10Nri9GFU4Xi/IrOWbhjYneiQgF0DzZeMHCbduQMENOWKYPOx1UBHAcAkwFYauCKTuc0O2+ZRiXMKA3qfHA88frIi/7Pg= 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 1614683728830119.47081805427251; Tue, 2 Mar 2021 03:15:28 -0800 (PST) Received: from localhost ([::1]:36986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH2zu-0001Kx-NZ for importer@patchew.org; Tue, 02 Mar 2021 06:15:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vS-0006aY-WD; Tue, 02 Mar 2021 06:10:51 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vR-0007Ib-67; Tue, 02 Mar 2021 06:10:50 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 672C55C015B; Tue, 2 Mar 2021 06:10:48 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 02 Mar 2021 06:10:48 -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 3A37F1080054; Tue, 2 Mar 2021 06:10:47 -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=PNZmbtZdEl/mF rCUEeQ2F7hb4v6l/Eu6Q3cp/qGLdZ0=; b=rcjP5MCz/2oq/1K4CT8sBzhAs5f4r FseT+AzKiZ5CLcWAIrSSn5uflSx07UeS3G4j4uME0v+EbfG3MflNlY0m8GVMYvq6 VK7x2NrvLfiZMWuQkOv7D7Q+tpe5KOrckdk+LO+jS2tX60caKpUW9mv7IakfIse8 bW8GUhHpEYywrqxzOIpm7d/HiQ2mTUMBFXP/8/G/EwgnfmfJQ2pBzYZE8en/rBC9 BMFMRn1S8aYd+V9gj628NWGYT0mYiMVYtHWqxlNmKUsN8APgkbqt5E3l/PannceE gu61rw9l8C3FaZTTkceIajCzcCRuqeK0vCAf8hJ/St3A0yu4UM3SjCQZQ== 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=PNZmbtZdEl/mFrCUEeQ2F7hb4v6l/Eu6Q3cp/qGLdZ0=; b=LOtzC93H sMzI5ZilyWEqtFmqOivEH+XCfhSRb1bdjR07oyrL1N2xBWT5Wrxykw5pYfn6SBqe es6SD6FTMLl/uWc5Upao7vJhSXtemluCjV6/EjRRXHD9FvXm8FK9wryK+0uxlfda 2I5BLJ0k64C+K83/TjMOb3aHMVRJ1O8fNl2GflJl/6vhGGACGFSF/2l/oJNSRUgE UYJRntlQc7vv4SqbSmCBTXdf16/UXZUVQrNpL06tzYw9cXW1jf38y4BQyeyI1Lpc VszM4uD5qVBHAKcnB/STc6MJE5Uv8HzUqP+dmaAqCEGcnbYZLUQtALxtdH8h+MMj cJXx6SVnvmPfXg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddttddgvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedune curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH RFC 3/4] hw/block/nvme: convert flush to aiocb Date: Tue, 2 Mar 2021 12:10:39 +0100 Message-Id: <20210302111040.289244-4-its@irrelevant.dk> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302111040.289244-1-its@irrelevant.dk> References: <20210302111040.289244-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.27; envelope-from=its@irrelevant.dk; helo=out3-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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Klaus Jensen , Stefan Hajnoczi , Keith Busch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Convert flush from ad-hoc multi aio tracking to use standard QEMU AIOCB processing. Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 143 +++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 69 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 48a1abe52787..773b41527c79 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1459,41 +1459,6 @@ static void nvme_rw_cb(void *opaque, int ret) nvme_enqueue_req_completion(nvme_cq(req), req); } =20 -struct nvme_aio_flush_ctx { - NvmeRequest *req; - NvmeNamespace *ns; - BlockAcctCookie acct; -}; - -static void nvme_aio_flush_cb(void *opaque, int ret) -{ - struct nvme_aio_flush_ctx *ctx =3D opaque; - NvmeRequest *req =3D ctx->req; - uintptr_t *num_flushes =3D (uintptr_t *)&req->opaque; - - BlockBackend *blk =3D ctx->ns->blkconf.blk; - BlockAcctCookie *acct =3D &ctx->acct; - BlockAcctStats *stats =3D blk_get_stats(blk); - - trace_pci_nvme_aio_flush_cb(nvme_cid(req), blk_name(blk)); - - if (!ret) { - block_acct_done(stats, acct); - } else { - block_acct_failed(stats, acct); - nvme_aio_err(req, ret); - } - - (*num_flushes)--; - g_free(ctx); - - if (*num_flushes) { - return; - } - - nvme_enqueue_req_completion(nvme_cq(req), req); -} - static void nvme_misc_cb(void *opaque, int ret) { NvmeRequest *req =3D opaque; @@ -2055,13 +2020,74 @@ static uint16_t nvme_compare(NvmeCtrl *n, NvmeReque= st *req) return NVME_NO_COMPLETE; } =20 +typedef struct NvmeFlushAIOCB { + BlockAIOCB common; + BlockAIOCB *aiocb; + NvmeRequest *req; + QEMUBH *bh; + int ret; + + int nsid; +} NvmeFlushAIOCB; + +static void nvme_flush_cancel(BlockAIOCB *acb) +{ + NvmeFlushAIOCB *iocb =3D container_of(acb, NvmeFlushAIOCB, common); + NvmeCtrl *n =3D nvme_ctrl(iocb->req); + + iocb->nsid =3D n->num_namespaces + 1; + iocb->ret =3D -ECANCELED; + + if (iocb->aiocb) { + blk_aio_cancel_async(iocb->aiocb); + iocb->aiocb =3D NULL; + } +} + +static const AIOCBInfo nvme_flush_aiocb_info =3D { + .aiocb_size =3D sizeof(NvmeFlushAIOCB), + .cancel_async =3D nvme_flush_cancel, +}; + +static void nvme_flush_bh(void *opaque) +{ + NvmeFlushAIOCB *iocb =3D opaque; + + iocb->common.cb(iocb->common.opaque, iocb->ret); + qemu_bh_delete(iocb->bh); + iocb->bh =3D NULL; + qemu_aio_unref(iocb); +} + +static void nvme_flush_aio_cb(void *opaque, int ret) +{ + NvmeFlushAIOCB *iocb =3D opaque; + NvmeRequest *req =3D iocb->req; + NvmeCtrl *n =3D nvme_ctrl(req); + + if (ret < 0) { + iocb->ret =3D ret; + goto done; + } + + while (iocb->nsid <=3D n->num_namespaces) { + NvmeNamespace *ns =3D nvme_ns(n, iocb->nsid++); + if (ns) { + iocb->aiocb =3D blk_aio_flush(ns->blkconf.blk, nvme_flush_aio_= cb, + iocb); + return; + } + } + +done: + iocb->aiocb =3D NULL; + qemu_bh_schedule(iocb->bh); +} + static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req) { + NvmeFlushAIOCB *iocb; uint32_t nsid =3D le32_to_cpu(req->cmd.nsid); - uintptr_t *num_flushes =3D (uintptr_t *)&req->opaque; - uint16_t status; - struct nvme_aio_flush_ctx *ctx; - NvmeNamespace *ns; =20 trace_pci_nvme_flush(nvme_cid(req), nsid); =20 @@ -2071,42 +2097,21 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest= *req) return NVME_INVALID_FIELD | NVME_DNR; } =20 - block_acct_start(blk_get_stats(req->ns->blkconf.blk), &req->acct, = 0, - BLOCK_ACCT_FLUSH); - req->aiocb =3D blk_aio_flush(req->ns->blkconf.blk, nvme_rw_cb, req= ); + req->aiocb =3D blk_aio_flush(req->ns->blkconf.blk, nvme_misc_cb, r= eq); return NVME_NO_COMPLETE; } =20 - /* 1-initialize; see comment in nvme_dsm */ - *num_flushes =3D 1; + iocb =3D qemu_aio_get(&nvme_flush_aiocb_info, NULL, nvme_misc_cb, req); =20 - for (int i =3D 1; i <=3D n->num_namespaces; i++) { - ns =3D nvme_ns(n, i); - if (!ns) { - continue; - } + iocb->req =3D req; + iocb->bh =3D qemu_bh_new(nvme_flush_bh, iocb); + iocb->ret =3D 0; + iocb->nsid =3D 1; =20 - ctx =3D g_new(struct nvme_aio_flush_ctx, 1); - ctx->req =3D req; - ctx->ns =3D ns; + nvme_flush_aio_cb(iocb, 0); + req->aiocb =3D &iocb->common; =20 - (*num_flushes)++; - - block_acct_start(blk_get_stats(ns->blkconf.blk), &ctx->acct, 0, - BLOCK_ACCT_FLUSH); - blk_aio_flush(ns->blkconf.blk, nvme_aio_flush_cb, ctx); - } - - /* account for the 1-initialization */ - (*num_flushes)--; - - if (*num_flushes) { - status =3D NVME_NO_COMPLETE; - } else { - status =3D req->status; - } - - return status; + return NVME_NO_COMPLETE; } =20 static uint16_t nvme_read(NvmeCtrl *n, NvmeRequest *req) --=20 2.30.1 From nobody Wed Nov 19 04:32:54 2025 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=1614684248; cv=none; d=zohomail.com; s=zohoarc; b=QZ2cKIzWuEP27CgqEMkvWBxpvr0HSeTAx6Abu+Bupm6Yt1O4ULMJkdasf2NhndVUXJenZMM2CJm4xAOXAL0dgtCAMWQQu9Z5WEeWfuzTmSpLcVQpzEFcz7yI+ns6y9lB891Hm6DEHO4O21f7iKEgvvU+1ASR+9wZpJwkTgzGmzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614684248; 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=MOwPSj56kJY4ys0jgX8/bepqCln2LFFecpGG7QyJacw=; b=VlZsJPk05QxCJTcaUKER4c6dPM9VRULvuREk5wpKlS+xBhs8GhC6wGyOyrU5YVorWUVl7drIQwGqSgTn0qSU9KCtmMJHEJwux7tqwhan+ElWnshnLXhanZrNbm5UPbQmNJvq+aKpBwZFGzmPNoz594Rr1hGStxU3+o2pUTmizV0= 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 1614684248374347.4297702253617; Tue, 2 Mar 2021 03:24:08 -0800 (PST) Received: from localhost ([::1]:52998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH38J-0008WB-1V for importer@patchew.org; Tue, 02 Mar 2021 06:24:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vU-0006de-GK; Tue, 02 Mar 2021 06:10:52 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:51181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2vS-0007In-D6; Tue, 02 Mar 2021 06:10:52 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A127B5C0176; Tue, 2 Mar 2021 06:10:49 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 02 Mar 2021 06:10:49 -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 78A1C1080054; Tue, 2 Mar 2021 06:10:48 -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=MOwPSj56kJY4y s0jgX8/bepqCln2LFFecpGG7QyJacw=; b=miO3ik6RtQIY+cKHMNBzZ+D8ldLvG VBQ0my2U8mDGmXJHviS/4hw4fIEugVxfKzzPujA6EljKuucO75+I6T1S2Z3b5Mv+ olhGwvtJ0EovDKFj405AarXehFgQIpYOXl9YC7bBSFlV2v7CE0TK25W8Lk7VIIwm DotlXi/FNuwlM984vSo5Eta1qrj/20pgxUxdZTe1YNnYqHmM1/cnQyiZZvZ1MOEQ K0ALD8j8AJgGkI4vBtWHQeNibhj/U+n/YP8WmFijUjXCnRz5fCsz/OABsReCM77S GkCzQBhpAzWAHc1kL0rERzzNB0fcBdDX7ldp/hIiuPz8jDZ4/03gPHiQQ== 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=MOwPSj56kJY4ys0jgX8/bepqCln2LFFecpGG7QyJacw=; b=TuqzpyzV q/MEfCMK0mwUOgBydEUHh0fVWDH3ARbunV0XBPYF7GjlFpjEJDCP7M5WROB6E9PO GhAIq6+nKTTBSaoiUvXWCxBzYwQfcvuu8v4AcAK1auyuUv+FfPXws20jVZKihUzK HLHCDa5SCYI3OPkZntwtYJDeBwNwtFInIPnZ1/vBOkMt3CSCSbFZhasL6ohBJAhX zUJ7xB0m4y6Dq6HnWW3OA6IIKjcHivbh19RiqBU7UMvKetrlKbyo593+HrKAJOv3 LEc9fhnTw9gYNwNp9kSSWe+qPMycWQcJYLZoNPckCuQ1XvcXxZCj3zymAT3J31HU sKtfYmhIU9vJKw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddttddgvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedune curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH RFC 4/4] hw/block/nvme: convert zone reset to aiocb Date: Tue, 2 Mar 2021 12:10:40 +0100 Message-Id: <20210302111040.289244-5-its@irrelevant.dk> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302111040.289244-1-its@irrelevant.dk> References: <20210302111040.289244-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.27; envelope-from=its@irrelevant.dk; helo=out3-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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Klaus Jensen , Stefan Hajnoczi , Keith Busch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Convert zone reset from ad-hoc multi aio tracking to use standard QEMU AIOCB processing. Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 233 +++++++++++++++++++++++++++++------------------- 1 file changed, 139 insertions(+), 94 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 773b41527c79..0d067f186ed7 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1325,6 +1325,29 @@ static uint16_t nvme_zrm_close(NvmeNamespace *ns, Nv= meZone *zone) } } =20 +static uint16_t nvme_zrm_reset(NvmeNamespace *ns, NvmeZone *zone) +{ + switch (nvme_get_zone_state(zone)) { + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_aor_dec_open(ns); + /* fallthrough */ + case NVME_ZONE_STATE_CLOSED: + nvme_aor_dec_active(ns); + /* fallthrough */ + case NVME_ZONE_STATE_FULL: + zone->w_ptr =3D zone->d.zslba; + zone->d.wp =3D zone->w_ptr; + nvme_assign_zone_state(ns, zone, NVME_ZONE_STATE_EMPTY); + /* fallthrough */ + case NVME_ZONE_STATE_EMPTY: + return NVME_SUCCESS; + + default: + return NVME_ZONE_INVAL_TRANSITION; + } +} + static void nvme_zrm_auto_transition_zone(NvmeNamespace *ns) { NvmeZone *zone; @@ -1472,53 +1495,6 @@ static void nvme_misc_cb(void *opaque, int ret) nvme_enqueue_req_completion(nvme_cq(req), req); } =20 -struct nvme_zone_reset_ctx { - NvmeRequest *req; - NvmeZone *zone; -}; - -static void nvme_aio_zone_reset_cb(void *opaque, int ret) -{ - struct nvme_zone_reset_ctx *ctx =3D opaque; - NvmeRequest *req =3D ctx->req; - NvmeNamespace *ns =3D req->ns; - NvmeZone *zone =3D ctx->zone; - uintptr_t *resets =3D (uintptr_t *)&req->opaque; - - g_free(ctx); - - trace_pci_nvme_aio_zone_reset_cb(nvme_cid(req), zone->d.zslba); - - if (!ret) { - switch (nvme_get_zone_state(zone)) { - case NVME_ZONE_STATE_EXPLICITLY_OPEN: - case NVME_ZONE_STATE_IMPLICITLY_OPEN: - nvme_aor_dec_open(ns); - /* fall through */ - case NVME_ZONE_STATE_CLOSED: - nvme_aor_dec_active(ns); - /* fall through */ - case NVME_ZONE_STATE_FULL: - zone->w_ptr =3D zone->d.zslba; - zone->d.wp =3D zone->w_ptr; - nvme_assign_zone_state(ns, zone, NVME_ZONE_STATE_EMPTY); - /* fall through */ - default: - break; - } - } else { - nvme_aio_err(req, ret); - } - - (*resets)--; - - if (*resets) { - return; - } - - nvme_enqueue_req_completion(nvme_cq(req), req); -} - struct nvme_compare_ctx { QEMUIOVector iov; uint8_t *bounce; @@ -2336,41 +2312,6 @@ static uint16_t nvme_finish_zone(NvmeNamespace *ns, = NvmeZone *zone, return nvme_zrm_finish(ns, zone); } =20 -static uint16_t nvme_reset_zone(NvmeNamespace *ns, NvmeZone *zone, - NvmeZoneState state, NvmeRequest *req) -{ - uintptr_t *resets =3D (uintptr_t *)&req->opaque; - struct nvme_zone_reset_ctx *ctx; - - switch (state) { - case NVME_ZONE_STATE_EMPTY: - return NVME_SUCCESS; - case NVME_ZONE_STATE_EXPLICITLY_OPEN: - case NVME_ZONE_STATE_IMPLICITLY_OPEN: - case NVME_ZONE_STATE_CLOSED: - case NVME_ZONE_STATE_FULL: - break; - default: - return NVME_ZONE_INVAL_TRANSITION; - } - - /* - * The zone reset aio callback needs to know the zone that is being re= set - * in order to transition the zone on completion. - */ - ctx =3D g_new(struct nvme_zone_reset_ctx, 1); - ctx->req =3D req; - ctx->zone =3D zone; - - (*resets)++; - - blk_aio_pwrite_zeroes(ns->blkconf.blk, nvme_l2b(ns, zone->d.zslba), - nvme_l2b(ns, ns->zone_size), BDRV_REQ_MAY_UNMAP, - nvme_aio_zone_reset_cb, ctx); - - return NVME_NO_COMPLETE; -} - static uint16_t nvme_offline_zone(NvmeNamespace *ns, NvmeZone *zone, NvmeZoneState state, NvmeRequest *req) { @@ -2499,12 +2440,115 @@ out: return status; } =20 +typedef struct NvmeZoneResetAIOCB { + BlockAIOCB common; + BlockAIOCB *aiocb; + NvmeRequest *req; + QEMUBH *bh; + int ret; + + bool all; + + struct { + int idx; + NvmeZone *zone; + } curr; +} NvmeZoneResetAIOCB; + +static void nvme_zone_reset_cancel(BlockAIOCB *aiocb) +{ + NvmeZoneResetAIOCB *iocb =3D container_of(aiocb, NvmeZoneResetAIOCB, c= ommon); + NvmeRequest *req =3D iocb->req; + NvmeNamespace *ns =3D req->ns; + + iocb->curr.idx =3D ns->num_zones; + + iocb->ret =3D -ECANCELED; + + if (iocb->aiocb) { + blk_aio_cancel_async(iocb->aiocb); + iocb->aiocb =3D NULL; + } +} + +static const AIOCBInfo nvme_zone_reset_aiocb_info =3D { + .aiocb_size =3D sizeof(NvmeZoneResetAIOCB), + .cancel_async =3D nvme_zone_reset_cancel, +}; + +static void nvme_zone_reset_bh(void *opaque) +{ + NvmeZoneResetAIOCB *iocb =3D opaque; + + iocb->common.cb(iocb->common.opaque, iocb->ret); + + qemu_bh_delete(iocb->bh); + iocb->bh =3D NULL; + qemu_aio_unref(iocb); +} + +static void nvme_zone_reset_aio_cb(void *opaque, int ret) +{ + NvmeZoneResetAIOCB *iocb =3D opaque; + NvmeRequest *req =3D iocb->req; + NvmeNamespace *ns =3D req->ns; + + if (ret < 0) { + iocb->ret =3D ret; + goto done; + } + + if (iocb->curr.zone) { + nvme_zrm_reset(ns, iocb->curr.zone); + + if (!iocb->all) { + goto done; + } + } + + while (iocb->curr.idx < ns->num_zones) { + NvmeZone *zone =3D &ns->zone_array[iocb->curr.idx++]; + + switch (nvme_get_zone_state(zone)) { + case NVME_ZONE_STATE_EMPTY: + if (!iocb->all) { + goto done; + } + + continue; + + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + case NVME_ZONE_STATE_CLOSED: + case NVME_ZONE_STATE_FULL: + iocb->curr.zone =3D zone; + break; + + default: + continue; + } + + iocb->aiocb =3D blk_aio_pwrite_zeroes(ns->blkconf.blk, + nvme_l2b(ns, zone->d.zslba), + nvme_l2b(ns, ns->zone_size), + BDRV_REQ_MAY_UNMAP, + nvme_zone_reset_aio_cb, iocb); + return; + } + +done: + iocb->aiocb =3D NULL; + if (iocb->bh) { + qemu_bh_schedule(iocb->bh); + } +} + static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, NvmeRequest *req) { NvmeCmd *cmd =3D (NvmeCmd *)&req->cmd; NvmeNamespace *ns =3D req->ns; NvmeZone *zone; - uintptr_t *resets; + NvmeZoneResetAIOCB *iocb; uint8_t *zd_ext; uint32_t dw13 =3D le32_to_cpu(cmd->cdw13); uint64_t slba =3D 0; @@ -2515,7 +2559,7 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, Nvme= Request *req) enum NvmeZoneProcessingMask proc_mask =3D NVME_PROC_CURRENT_ZONE; =20 action =3D dw13 & 0xff; - all =3D dw13 & 0x100; + all =3D !!(dw13 & 0x100); =20 req->status =3D NVME_SUCCESS; =20 @@ -2559,21 +2603,22 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, Nv= meRequest *req) break; =20 case NVME_ZONE_ACTION_RESET: - resets =3D (uintptr_t *)&req->opaque; - - if (all) { - proc_mask =3D NVME_PROC_OPENED_ZONES | NVME_PROC_CLOSED_ZONES | - NVME_PROC_FULL_ZONES; - } trace_pci_nvme_reset_zone(slba, zone_idx, all); =20 - *resets =3D 1; + iocb =3D blk_aio_get(&nvme_zone_reset_aiocb_info, ns->blkconf.blk, + nvme_misc_cb, req); =20 - status =3D nvme_do_zone_op(ns, zone, proc_mask, nvme_reset_zone, r= eq); + iocb->req =3D req; + iocb->bh =3D qemu_bh_new(nvme_zone_reset_bh, iocb); + iocb->ret =3D 0; + iocb->all =3D all; + iocb->curr.idx =3D zone_idx; + iocb->curr.zone =3D NULL; =20 - (*resets)--; + nvme_zone_reset_aio_cb(iocb, 0); + req->aiocb =3D &iocb->common; =20 - return *resets ? NVME_NO_COMPLETE : req->status; + return NVME_NO_COMPLETE; =20 case NVME_ZONE_ACTION_OFFLINE: if (all) { --=20 2.30.1