From nobody Sun Feb 8 10:59:17 2026 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=1659628578; cv=none; d=zohomail.com; s=zohoarc; b=e6pLMkO8A+0TvLleZuilsKvD0xNvOI5s/kC1cNONP1S+LerTswQ6ESUEM6wL3d8ly6l5/DvdQRxk7pzL75GnbclBYQ8dgUQx0WI7FQvcPCowdWVb2fC2Ojwnq6VGH6BY9sv1czT/nJcesZObA0GAfEstfiv+lY5vIKBaYGUO8Mc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659628578; 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=zT0SUzZ4QG4veBt5kBkRW9UyYI8sTKomvCG+k/pMwaw=; b=CS1y27oWVAFdPkRI0yQQB/dB6qbrxSD2ma5h/DuayzkcWYAgStdGbPSekGcPi34XfUb35cAVSHsYFViHF6MYTxQjqWGHUxRbBgwNTaJ1A+JEuXp8bN7YLrfb3NvI9rhx+iR/SBgqcphC/gNXM4/pDsIB1de4Ca5WJc3Zcnk50/U= 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 1659628578678852.0404515394224; Thu, 4 Aug 2022 08:56:18 -0700 (PDT) Received: from localhost ([::1]:35546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJdCq-00042f-MA for importer@patchew.org; Thu, 04 Aug 2022 11:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJdBU-0002lv-B8 for qemu-devel@nongnu.org; Thu, 04 Aug 2022 11:54:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:44881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJdBS-0003Vb-0O for qemu-devel@nongnu.org; Thu, 04 Aug 2022 11:54:51 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-79-SjWrp6i0MgumGmWMpaVAwA-1; Thu, 04 Aug 2022 11:54:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 031E33801155 for ; Thu, 4 Aug 2022 15:54:48 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15B68909FF; Thu, 4 Aug 2022 15:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659628489; 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=zT0SUzZ4QG4veBt5kBkRW9UyYI8sTKomvCG+k/pMwaw=; b=NCi2F9hqtqUYIyMbCazYhpw10IRXTFpDVOIg1hI6EfoQ8JvjeT536xUAGzBY68V6XJX1c6 FG1ymJ8sdR2ZpO9a7gSjut5N0k4Fsg88AS8tiEUFAG8Uubzz5lEaYDJVDhhrdWRki3Aduw sVF9dtQ43rMU7WSQ48YWpRtithdsXdA= X-MC-Unique: SjWrp6i0MgumGmWMpaVAwA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Jason Wang , Lei Yang , "Michael S. Tsirkin" Subject: [PATCH v2 1/2] vdpa: Skip the maps not in the iova tree Date: Thu, 4 Aug 2022 17:54:42 +0200 Message-Id: <20220804155443.671136-2-eperezma@redhat.com> In-Reply-To: <20220804155443.671136-1-eperezma@redhat.com> References: <20220804155443.671136-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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: 1659628580353100001 Next patch will skip the registering of dma maps that the vdpa device rejects in the iova tree. We need to consider that here or we cause a SIGSEGV accessing result. Reported-by: Lei Yang Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- hw/virtio/vhost-vdpa.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 3ff9ce3501..983d3697b0 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -289,6 +289,10 @@ static void vhost_vdpa_listener_region_del(MemoryListe= ner *listener, }; =20 result =3D vhost_iova_tree_find_iova(v->iova_tree, &mem_region); + if (!result) { + /* The memory listener map wasn't mapped */ + return; + } iova =3D result->iova; vhost_iova_tree_remove(v->iova_tree, result); } --=20 2.31.1 From nobody Sun Feb 8 10:59:17 2026 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=1659628705; cv=none; d=zohomail.com; s=zohoarc; b=AgDOAuEvsBqaUNTA10uS77tjCms/HSAHfzXPHZgkBzUm5/TtUcdsl/k2atwPvXd+k4OYXfRFh7MsDW7r7bpYsSeMnp9KscmA+YucpCF0wnnVSJ1wEq44aOyH6nIPGfDErGBQq9/tSRrUUwFHEYrPyOo3R6ma59WAmDvFDx09bjk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659628705; 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=zibunRhm+sIi3pljgeMpXElkFB9p0aIg/cGjDGnEIdM=; b=PcjSpLKtTMGtbFNzXRNiwR1u5zcSn9UO4HbpjHhEtS1Czi6i7kmhgVl9bGdFWV0WR8IzxDuKdYSzQXuOk6Yrf+zvX9eSN+xmIEXO9B6E8AzvYTIWQo9jWtbrhWWwaEqqywZBzxk1mwHD3A3AQK/4UCTh9BwhWAZKIw/Y0xMuvvw= 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 1659628705615871.8754365545755; Thu, 4 Aug 2022 08:58:25 -0700 (PDT) Received: from localhost ([::1]:39046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJdEt-0006YW-83 for importer@patchew.org; Thu, 04 Aug 2022 11:58:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJdBb-0002o2-SS for qemu-devel@nongnu.org; Thu, 04 Aug 2022 11:54:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32000) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJdBT-0003XR-U5 for qemu-devel@nongnu.org; Thu, 04 Aug 2022 11:54:53 -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-636-CdJuAT0NMAGwD8DJWGfNHw-1; Thu, 04 Aug 2022 11:54:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2B06C185A79C for ; Thu, 4 Aug 2022 15:54:49 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4586A909FF; Thu, 4 Aug 2022 15:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659628491; 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=zibunRhm+sIi3pljgeMpXElkFB9p0aIg/cGjDGnEIdM=; b=Ze7IuV4I76USeaHj5aFQK+9G5/MeOYs7EU6HX0zPTpXpGArxdz1frBC7q1VXaPeGRxArVn hvG515ZnLamzc7+BROQKgL2O3bFVl1OH8wZ3OFbLkAWDgtRd/09s+yxnQQfOIjufWQYwCU a801d019EQW8xAWTLAeJP64paRbZe2c= X-MC-Unique: CdJuAT0NMAGwD8DJWGfNHw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Jason Wang , Lei Yang , "Michael S. Tsirkin" Subject: [PATCH v2 2/2] vdpa: do not save failed dma maps in SVQ iova tree Date: Thu, 4 Aug 2022 17:54:43 +0200 Message-Id: <20220804155443.671136-3-eperezma@redhat.com> In-Reply-To: <20220804155443.671136-1-eperezma@redhat.com> References: <20220804155443.671136-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1659628708074100001 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 --- 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 983d3697b0..7e28d2f674 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, 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; - 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; } return; +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 -- 2.31.1