From nobody Wed Nov 19 05:52:27 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