From nobody Sat Nov 15 15:29:41 2025 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=irrelevant.dk ARC-Seal: i=1; a=rsa-sha256; t=1596060526; cv=none; d=zohomail.com; s=zohoarc; b=K6XyIdXIsdqjkcG/5MFts1EoQl0ImbWn2H0VIeKhHDxxdSawa+LEqsCfDAlUGnDiWE/tdOYdW/LDmhHTcuWUcupUPe4mVM+KJUoijOFbLwOVeUpqF8W9vCjDbkBh7yttRsOQpcGCHOUG0Pl6iMpsHFmZjqOCKlgQbzwITa0y790= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596060526; 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=UilnyG0WcDorNw+WiRb4JVRaZMn/NzCSbfFCyko7q8o=; b=mqdDFl16hCXYw1gbD0HnA1qEGoS5NvUhcUWl4zpFN9heedC/T2PxpRwiYq6vwt60sduIgBYYDjycf7zXI4S14pWKNfyBLrTuL2VCD7M48OYuw9RkD+YfgvH8mRebsVHUVv1hMFyGPgCV/EKgo12LCnKIeA0+2iuXc6dEzwxenNo= 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 1596060526046574.3271655464039; Wed, 29 Jul 2020 15:08:46 -0700 (PDT) Received: from localhost ([::1]:45970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uFg-0000dR-Lr for importer@patchew.org; Wed, 29 Jul 2020 18:08:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uDp-0006pb-QJ; Wed, 29 Jul 2020 18:06:49 -0400 Received: from charlie.dont.surf ([128.199.63.193]:34652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uDl-0008Uo-LN; Wed, 29 Jul 2020 18:06:49 -0400 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by charlie.dont.surf (Postfix) with ESMTPSA id B38D8BFB1B; Wed, 29 Jul 2020 22:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=irrelevant.dk; s=default; t=1596060404; bh=gaSXug6OTT5lsGtaZf6tpFvYStUuN+R0OklGaDtBDtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rgPI/R2It/AZpZ5VlpIhA2IGY86IwErbfdWz7a2ZkUoqy5UJKZTN8DglE/uFxFSMg CQXzKQ2hH7bBH4++KlcN1SfZdE9Z/mQOS/CxZFgNt8cHadIyiBRgmA3/Pxt6an9swI TjxJDoOwq6v3JmfpLu0WZkDatcZt9mGBzR9ZsZH6ahlkqfXQBwQ4HN0gYojG1nCIY4 YF6YylvsVbZYnpdkxE6UrucQ4LEWZazrLrjlTspbiO+2NztCmV2jhhDzbZOT0C98pu HWQl3k/eGv+CdaElXMwPh5CMRjDotbvIMRiGzaUvnfuViiea5Om1mwWfGBxK1epAZU 655Kn9t7+UaQA== From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v2 03/16] hw/block/nvme: replace dma_acct with blk_acct equivalent Date: Thu, 30 Jul 2020 00:06:25 +0200 Message-Id: <20200729220638.344477-4-its@irrelevant.dk> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200729220638.344477-1-its@irrelevant.dk> References: <20200729220638.344477-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=128.199.63.193; envelope-from=its@irrelevant.dk; helo=charlie.dont.surf X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 14:23:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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 , Maxim Levitsky , Klaus Jensen , Andrzej Jakowski , Minwoo Im , Keith Busch , Max Reitz 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" From: Klaus Jensen The QSG isn't always initialized, so accounting could be wrong. Issue a call to blk_acct_start instead with the size taken from the QSG or IOV depending on the kind of I/O. Signed-off-by: Klaus Jensen Reviewed-by: Maxim Levitsky Reviewed-by: Minwoo Im --- hw/block/nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 0422d4397d76..d60b19e1840f 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -622,9 +622,10 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns= , NvmeCmd *cmd, return NVME_INVALID_FIELD | NVME_DNR; } =20 - dma_acct_start(n->conf.blk, &req->acct, &req->qsg, acct); if (req->qsg.nsg > 0) { req->has_sg =3D true; + block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->qsg.= size, + acct); req->aiocb =3D is_write ? dma_blk_write(n->conf.blk, &req->qsg, data_offset, BDRV_SECTOR= _SIZE, nvme_rw_cb, req) : @@ -632,6 +633,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns,= NvmeCmd *cmd, nvme_rw_cb, req); } else { req->has_sg =3D false; + block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->iov.= size, + acct); req->aiocb =3D is_write ? blk_aio_pwritev(n->conf.blk, data_offset, &req->iov, 0, nvme_r= w_cb, req) : --=20 2.27.0