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=1595245693; cv=none; d=zohomail.com; s=zohoarc; b=Bb4QZ8D8KFWJANNZQ/bX6fxcsGOjFAnDil57bGpl0W7muAtBTEkPIyszeVnAibOmfNFlyk0a19LG00q806eD7mSwN/nCgjqooi6Et5CGId7JVSOvew83R12DEkKxZGcRfcdZHIcKh3zGJmUCeHTFchfqzd2QiXtSTn4z8vmLhak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595245693; 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=ZsQeDVyzfdd9rE4vS2fKUef/bKRlrxqZqu9YKfu44fc=; b=CY1U47VlJVWfMar1USwsFw6svjaX+pPuFQdz6yLgp04tkzWaNXRGM8Tklb/bBpL2D/3R27+/Pob/NUh4+jkYb6iv0U7BrmGHRLMRC0qnhjjWHcKIqdCGLFvlVDQ8IJwz/n/ZTJXWgK53YnLktvakZ5CQLv7nneJ2lqKVYnQdooc= 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 1595245693595144.554130999486; Mon, 20 Jul 2020 04:48:13 -0700 (PDT) Received: from localhost ([::1]:50536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxUHE-0005FU-CO for importer@patchew.org; Mon, 20 Jul 2020 07:48:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxU7m-00085T-Gw; Mon, 20 Jul 2020 07:38:26 -0400 Received: from charlie.dont.surf ([128.199.63.193]:46924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxU7k-0005Br-AI; 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 44AF6BF84E; Mon, 20 Jul 2020 11:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=irrelevant.dk; s=default; t=1595245082; bh=dCGKH1NnyTyFTCLf6rhm40KuiTdjn+/POy9IhSQZWnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vze2og370lnnueJJPkjTwD21LPyXTkJSP7fEW9qwabHUQhT2NjoRP2tNKovvt5jVK ZmgQCOxOitIFnXt6bfTlkywbX6ROsA/PqF08d985RPiOzfFFQyCj5AE7JibJfMEIw2 Ycjn2nwTj55v+n3CljDe4cRcArj3dVNBf67xj7FwmSitcKwBUMuTJClvl5AwFEQlj6 4ulPZXXdWrrQK7sNTaxGAksuVoI4VMrHZvD9TdZhtEjoXKt4HqXsBuJgnNusm5RzRb 1k8maAH/tXBMM5QHBmwasdVmjoKzBus/iumBwRyEbqLVXUuhcdzqn9dooT6CPQTvod cX6hmrz/ZmW9w== From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH 14/16] hw/block/nvme: consolidate qsg/iov clearing Date: Mon, 20 Jul 2020 13:37:46 +0200 Message-Id: <20200720113748.322965-15-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 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 Always destroy the request qsg/iov at the end of request use. Signed-off-by: Klaus Jensen Reviewed-by: Maxim Levitsky Reviewed-by: Minwoo Im --- hw/block/nvme.c | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 54cd20f1ce22..b53afdeb3fb6 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -213,6 +213,14 @@ static void nvme_req_clear(NvmeRequest *req) { req->ns =3D NULL; memset(&req->cqe, 0x0, sizeof(req->cqe)); + + if (req->qsg.sg) { + qemu_sglist_destroy(&req->qsg); + } + + if (req->iov.iov) { + qemu_iovec_destroy(&req->iov); + } } =20 static uint16_t nvme_map_addr_cmb(NvmeCtrl *n, QEMUIOVector *iov, hwaddr a= ddr, @@ -297,15 +305,14 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList = *qsg, QEMUIOVector *iov, =20 status =3D nvme_map_addr(n, qsg, iov, prp1, trans_len); if (status) { - goto unmap; + return status; } =20 len -=3D trans_len; if (len) { if (unlikely(!prp2)) { trace_pci_nvme_err_invalid_prp2_missing(); - status =3D NVME_INVALID_FIELD | NVME_DNR; - goto unmap; + return NVME_INVALID_FIELD | NVME_DNR; } =20 if (len > n->page_size) { @@ -326,13 +333,11 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList = *qsg, QEMUIOVector *iov, if (i =3D=3D n->max_prp_ents - 1 && len > n->page_size) { if (unlikely(!prp_ent || prp_ent & (n->page_size - 1))= ) { trace_pci_nvme_err_invalid_prplist_ent(prp_ent); - status =3D NVME_INVALID_FIELD | NVME_DNR; - goto unmap; + return NVME_INVALID_FIELD | NVME_DNR; } =20 if (prp_list_in_cmb !=3D nvme_addr_is_cmb(n, prp_ent))= { - status =3D NVME_INVALID_USE_OF_CMB | NVME_DNR; - goto unmap; + return NVME_INVALID_USE_OF_CMB | NVME_DNR; } =20 i =3D 0; @@ -345,14 +350,13 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList = *qsg, QEMUIOVector *iov, =20 if (unlikely(!prp_ent || prp_ent & (n->page_size - 1))) { trace_pci_nvme_err_invalid_prplist_ent(prp_ent); - status =3D NVME_INVALID_FIELD | NVME_DNR; - goto unmap; + return NVME_INVALID_FIELD | NVME_DNR; } =20 trans_len =3D MIN(len, n->page_size); status =3D nvme_map_addr(n, qsg, iov, prp_ent, trans_len); if (status) { - goto unmap; + return status; } =20 len -=3D trans_len; @@ -361,27 +365,16 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList = *qsg, QEMUIOVector *iov, } else { if (unlikely(prp2 & (n->page_size - 1))) { trace_pci_nvme_err_invalid_prp2_align(prp2); - status =3D NVME_INVALID_FIELD | NVME_DNR; - goto unmap; + return NVME_INVALID_FIELD | NVME_DNR; } status =3D nvme_map_addr(n, qsg, iov, prp2, len); if (status) { - goto unmap; + return status; } } } + return NVME_SUCCESS; - -unmap: - if (iov && iov->iov) { - qemu_iovec_destroy(iov); - } - - if (qsg && qsg->sg) { - qemu_sglist_destroy(qsg); - } - - return status; } =20 static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, @@ -601,13 +594,6 @@ static void nvme_rw_cb(void *opaque, int ret) req->status =3D NVME_INTERNAL_DEV_ERROR; } =20 - if (req->qsg.nalloc) { - qemu_sglist_destroy(&req->qsg); - } - if (req->iov.nalloc) { - qemu_iovec_destroy(&req->iov); - } - nvme_enqueue_req_completion(cq, req); } =20 --=20 2.27.0