From nobody Sat Nov 15 15:29:47 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=1595245839; cv=none; d=zohomail.com; s=zohoarc; b=U2GGtl+kAI76FQ76AQePOETlI5AlcyPEz5PuFH9JjTd6oZYk4MxUPZFBr7a3Y4olZgFoZGNpUfL987dpQyj6ryw89PWLgxJRnltti4ZKNHdKCBgw3o9Mg/a1Ar8hnxyqjSOohZbAdXIpjdTfeN0Adj+OLojBemmOgqQSYf7Q2+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595245839; 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=N6NM5eUHH3feAtObAIL5V08IRdGJpIluEARUTjuWT/4=; b=S/PzLEo0sOK8Hyf0F8G6S0VwXEeHz8wFISgVPDpjpiKIDaknDyDpdOZIJ4xb+C2wkjUxim/+c1EDB+Q1xBOseAotzjqsxQJ2LD2BngLtuSo5VW2Ck4kvKb7m5IJL2LmqeZQ+SJpbA7xjjID8pr8RttSCzvVM/0Xb0OqPqA1IDUs= 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 1595245839485632.2696420415419; Mon, 20 Jul 2020 04:50:39 -0700 (PDT) Received: from localhost ([::1]:57686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxUJa-0008Aj-78 for importer@patchew.org; Mon, 20 Jul 2020 07:50:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxU7n-000875-8e; Mon, 20 Jul 2020 07:38:27 -0400 Received: from charlie.dont.surf ([128.199.63.193]:46936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxU7l-0005CE-ET; Mon, 20 Jul 2020 07:38:26 -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 496D7BFB31; Mon, 20 Jul 2020 11:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=irrelevant.dk; s=default; t=1595245083; bh=wHaa8HyTfJxh0YQo3rTdxLUJaJBvexX6EfS6uOQItgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJUqqUjztaDMw8tZK7sq4mRQiwQodMhrHixD2p4udzsUSpzzW0ep691OwW55czvft B5KhyTW+ynVoBwk6aFei+fjlVmbEgUY+3aRvmkwuwVBFqjE/OQR3aJp4YB7gKGf6pA uRE4n2Lbzx68YKxBqK/1L2l4mlSN5pzfgRJUue1mbrL6aaRRu+jAqR2fyjp3iyx4zT gERoa/THa+8dm4P606v9jQYwr8DHNwkW0Em53/NeShXaGVuqvj6Ad1A3xXwM/w1/SN w9bEAdM0GuK6YRqf6zQINYSXXngiUG/TC24Mo2YrlOHDn6jt/QhjmLPQIlF3frt+Ui Xg9eatrw2NPbQ== From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH 16/16] hw/block/nvme: use preallocated qsg/iov in nvme_dma_prp Date: Mon, 20 Jul 2020 13:37:48 +0200 Message-Id: <20200720113748.322965-17-its@irrelevant.dk> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720113748.322965-1-its@irrelevant.dk> References: <20200720113748.322965-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/20 07:37:55 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: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Klaus Jensen , Maxim Levitsky 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 Since clean up of the request qsg/iov is now always done post-use, there is no need to use a stack-allocated qsg/iov in nvme_dma_prp. Signed-off-by: Klaus Jensen Acked-by: Keith Busch Reviewed-by: Maxim Levitsky --- hw/block/nvme.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 0b3dceccc89b..b6da5a9f3fc6 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -381,45 +381,39 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *pt= r, uint32_t len, uint64_t prp1, uint64_t prp2, DMADirection di= r, NvmeRequest *req) { - QEMUSGList qsg; - QEMUIOVector iov; uint16_t status =3D NVME_SUCCESS; =20 - status =3D nvme_map_prp(n, &qsg, &iov, prp1, prp2, len, req); + status =3D nvme_map_prp(n, &req->qsg, &req->iov, prp1, prp2, len, req); if (status) { return status; } =20 - if (qsg.nsg > 0) { + if (req->qsg.nsg > 0) { uint64_t residual; =20 if (dir =3D=3D DMA_DIRECTION_TO_DEVICE) { - residual =3D dma_buf_write(ptr, len, &qsg); + residual =3D dma_buf_write(ptr, len, &req->qsg); } else { - residual =3D dma_buf_read(ptr, len, &qsg); + residual =3D dma_buf_read(ptr, len, &req->qsg); } =20 if (unlikely(residual)) { trace_pci_nvme_err_invalid_dma(); status =3D NVME_INVALID_FIELD | NVME_DNR; } - - qemu_sglist_destroy(&qsg); } else { size_t bytes; =20 if (dir =3D=3D DMA_DIRECTION_TO_DEVICE) { - bytes =3D qemu_iovec_to_buf(&iov, 0, ptr, len); + bytes =3D qemu_iovec_to_buf(&req->iov, 0, ptr, len); } else { - bytes =3D qemu_iovec_from_buf(&iov, 0, ptr, len); + bytes =3D qemu_iovec_from_buf(&req->iov, 0, ptr, len); } =20 if (unlikely(bytes !=3D len)) { trace_pci_nvme_err_invalid_dma(); status =3D NVME_INVALID_FIELD | NVME_DNR; } - - qemu_iovec_destroy(&iov); } =20 return status; --=20 2.27.0