From nobody Mon Feb 9 16:34:53 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=1593460774; cv=none; d=zohomail.com; s=zohoarc; b=DteCAVFNFn1RG/z1Y05PtOFWwFrOXutlLYtv0KX0282tG72bTf5m7txCl0ucIgTjxJtt6nW/2KZiKyU1sDnwWsaB4HIQR26XkauYt5I3v/06jri9RoaRNIUp3r0wyaWMaoaDEYjzNndoLs1zovDwSx43gW7na96BxFPQMlnU8ww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593460774; 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=hfV05WW0vTwvKX5PDI0BpoMTBKDJksTWl6sZsPjOjVg=; b=AjfoJmc+Eu+iWEAqmw9BYrFFdRzbWQ/5HFzXVdzEC1l55BKlRV4/Cx0zll1wyBuCZtKYN43xJZFhLzMNGRc1gODlNofksbhwZtkETp8YKUajIsU6n1Vk6T2+TfIyMjArwM93A5ZalgmZ5xpUWd4XGE8ThwfW5uyOVqeFjG70zR0= 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 1593460774955837.1701859501334; Mon, 29 Jun 2020 12:59:34 -0700 (PDT) Received: from localhost ([::1]:40022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpzwD-0006O4-Nf for importer@patchew.org; Mon, 29 Jun 2020 15:59:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpznr-0007Ub-To; Mon, 29 Jun 2020 15:50:55 -0400 Received: from charlie.dont.surf ([128.199.63.193]:46224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpznp-000608-L6; Mon, 29 Jun 2020 15:50:55 -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 2CB11BF7EC; Mon, 29 Jun 2020 19:50:30 +0000 (UTC) From: Klaus Jensen To: qemu-block@nongnu.org Subject: [PATCH 17/17] hw/block/nvme: use preallocated qsg/iov in nvme_dma_prp Date: Mon, 29 Jun 2020 21:50:17 +0200 Message-Id: <20200629195017.1217056-18-its@irrelevant.dk> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200629195017.1217056-1-its@irrelevant.dk> References: <20200629195017.1217056-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/06/29 14:26:53 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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 , Klaus Jensen , qemu-devel@nongnu.org, Max Reitz , Klaus Jensen , Keith Busch , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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 ec08841f74b6..fa0f8e802d9b 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -350,45 +350,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