From nobody Thu Dec 18 13:29:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1662101218; cv=none; d=zohomail.com; s=zohoarc; b=JDdAtbSGrqXuZPwJbpJLl79Z5/4ys9RqfvM8oWVnULF/n+WAe4+abIb4gbasXEsqprm16s8UGZRo5f26TI3yMrRCvGvmLZNdp3+DxnNHHqPgRwrJ1k2WSmxtOIrauKfS33kQySDgS24QUwHhezocazTCf1KNA4QAF22B0pOd7AM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662101218; h=Content-Type: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=Oq3pgxHYD1TAQ56GSAAjvNLpVaC+gsB3rAkBvL0ynnY=; b=L2iaP8SGTMpQplEDCwMiDH5GhTroR5P8vIZtyi3/fMuMQ+eqnuMPm1+1hAwBtCx2/3eP03ynVgD3pblmt7kObB6sv27aTEeDLpebWeeFtRk1mw3EsI3uSN8wyjU/BMgPQlvyINmZGIm3mh2L+2D/1n8jpG9b6gmXoI5JpnMtJiA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662101218854695.2717240022237; Thu, 1 Sep 2022 23:46:58 -0700 (PDT) Received: from localhost ([::1]:52294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oU0S9-0001d2-0n for importer@patchew.org; Fri, 02 Sep 2022 02:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oU0NM-00077i-DA for qemu-devel@nongnu.org; Fri, 02 Sep 2022 02:42:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:52402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oU0NH-0004l8-TB for qemu-devel@nongnu.org; Fri, 02 Sep 2022 02:41:58 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-491-LEDBWOV8O62QK4-m0Qk8Cw-1; Fri, 02 Sep 2022 02:41:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E2AC800124; Fri, 2 Sep 2022 06:41:51 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-152.pek2.redhat.com [10.72.12.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1D8B1415137; Fri, 2 Sep 2022 06:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662100915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oq3pgxHYD1TAQ56GSAAjvNLpVaC+gsB3rAkBvL0ynnY=; b=bk8Jgkve2meQPke23ubkMUQZGdzzl+DL+ZcdrQ3ii6il4MoxoTSdVH+AtPVk9DpDo77J8K VvHmYNqK5jPsg0atCZaf3dFnrxVoPOxrzSnZ1N4jJvjDXiAPfIht1Urj4iDPNYi3L7FZnu toleiW1VbHMRzwMkECohBAhRRzpRwuk= X-MC-Unique: LEDBWOV8O62QK4-m0Qk8Cw-1 From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Lei Yang , Jason Wang Subject: [PULL 02/21] vdpa: do not save failed dma maps in SVQ iova tree Date: Fri, 2 Sep 2022 14:41:19 +0800 Message-Id: <20220902064138.56468-3-jasowang@redhat.com> In-Reply-To: <20220902064138.56468-1-jasowang@redhat.com> References: <20220902064138.56468-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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=170.10.129.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662101220178100001 From: Eugenio P=C3=A9rez If a map fails for whatever reason, it must not be saved in the tree. Otherwise, qemu will try to unmap it in cleanup, leaving to more errors. Fixes: 34e3c94eda ("vdpa: Add custom IOTLB translations to SVQ") Reported-by: Lei Yang Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Signed-off-by: Jason Wang --- hw/virtio/vhost-vdpa.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 983d369..7e28d2f 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -176,6 +176,7 @@ static void vhost_vdpa_listener_commit(MemoryListener *= listener) static void vhost_vdpa_listener_region_add(MemoryListener *listener, MemoryRegionSection *section) { + DMAMap mem_region =3D {}; struct vhost_vdpa *v =3D container_of(listener, struct vhost_vdpa, lis= tener); hwaddr iova; Int128 llend, llsize; @@ -212,13 +213,13 @@ static void vhost_vdpa_listener_region_add(MemoryList= ener *listener, =20 llsize =3D int128_sub(llend, int128_make64(iova)); if (v->shadow_vqs_enabled) { - DMAMap mem_region =3D { - .translated_addr =3D (hwaddr)(uintptr_t)vaddr, - .size =3D int128_get64(llsize) - 1, - .perm =3D IOMMU_ACCESS_FLAG(true, section->readonly), - }; + int r; =20 - int r =3D vhost_iova_tree_map_alloc(v->iova_tree, &mem_region); + mem_region.translated_addr =3D (hwaddr)(uintptr_t)vaddr, + mem_region.size =3D int128_get64(llsize) - 1, + mem_region.perm =3D IOMMU_ACCESS_FLAG(true, section->readonly), + + r =3D vhost_iova_tree_map_alloc(v->iova_tree, &mem_region); if (unlikely(r !=3D IOVA_OK)) { error_report("Can't allocate a mapping (%d)", r); goto fail; @@ -232,11 +233,16 @@ static void vhost_vdpa_listener_region_add(MemoryList= ener *listener, vaddr, section->readonly); if (ret) { error_report("vhost vdpa map fail!"); - goto fail; + goto fail_map; } =20 return; =20 +fail_map: + if (v->shadow_vqs_enabled) { + vhost_iova_tree_remove(v->iova_tree, &mem_region); + } + fail: /* * On the initfn path, store the first error in the container so we --=20 2.7.4