From nobody Wed Nov 13 07:44:45 2024 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=1704805050; cv=none; d=zohomail.com; s=zohoarc; b=j5YQ9Y60lzUR38Ux3fHmoobVT76rBz5yQkHpDQec/GVTANEipBQpesl2zQBMfhweXDdyVEvhdSCtG8GP/rYCnq5bWUlKqHQiNu4pIQnxO2IDQ1psmoy3jJocMv9U/YpZoXNYEHVvVKZqVfTiq8NqScybIiKzZX747Faw6gmCd3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704805050; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wIn18bdB196CmcKnWWByvKyvKoQr67WRQlJjw+lMrYY=; b=fabEXrbDTBqMVsbbrkEkfLITDV03JifQ9P0aYKefZOCvg01MPZ5334aV0WCNAww7BXki9F6AHG8O2IjE7eVOTlIgO1benbcYuA1+6UaUmxInVgeYehSSYyC7de14cOMUXk46Qc+8Ueu6tklFnN58BpwArJpWcyqrdkWqM6zMXqQ= 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 1704805049991227.7224011636522; Tue, 9 Jan 2024 04:57:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNBej-00068C-LD; Tue, 09 Jan 2024 07:56:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNBec-00067L-Rh for qemu-devel@nongnu.org; Tue, 09 Jan 2024 07:56:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNBea-0006iN-Sj for qemu-devel@nongnu.org; Tue, 09 Jan 2024 07:56:26 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-408-U5KlTBD0MYeyCwS-oPS14Q-1; Tue, 09 Jan 2024 07:56:21 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1ED1B836F23; Tue, 9 Jan 2024 12:56:21 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.225.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F09F2166B33; Tue, 9 Jan 2024 12:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704804982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wIn18bdB196CmcKnWWByvKyvKoQr67WRQlJjw+lMrYY=; b=KNjITzgx9eTVS1kaRPZLj52fecSTYGIW8C+iVZ/IBO4XcnZ6tv60DN7b05iz8cIGQ51qJy 4R5vJDqb8i8qWLVdWpSqOyG6PWoTBXkaskMt/QUIw1ezbsdgviOyD0C/F1He+DXzd+LgrW UgLjKmyGSqeW0nfjWvDDSpEBowuoRDI= X-MC-Unique: U5KlTBD0MYeyCwS-oPS14Q-1 From: Albert Esteve To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, Albert Esteve , "Michael S. Tsirkin" , marcandre.lureau@gmail.com, kraxel@redhat.com, Stefan Hajnoczi Subject: [PATCH v3 2/3] hw/virtio: cleanup shared resources Date: Tue, 9 Jan 2024 13:56:13 +0100 Message-ID: <20240109125614.220293-3-aesteve@redhat.com> In-Reply-To: <20240109125614.220293-1-aesteve@redhat.com> References: <20240109125614.220293-1-aesteve@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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=aesteve@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.493, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704805050651100003 Content-Type: text/plain; charset="utf-8" Ensure that we cleanup all virtio shared resources when the vhost devices is cleaned up (after a hot unplug, or a crash). To do so, we add a new function to the virtio_dmabuf API called `virtio_dmabuf_vhost_cleanup`, which loop through the table and removes all resources owned by the vhost device parameter. Also, add a test to verify that the new function in the API behaves as expected. Signed-off-by: Albert Esteve Acked-by: Stefan Hajnoczi --- hw/display/virtio-dmabuf.c | 22 +++++++++++++++++++++ hw/virtio/vhost.c | 3 +++ include/hw/virtio/virtio-dmabuf.h | 10 ++++++++++ tests/unit/test-virtio-dmabuf.c | 33 +++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/hw/display/virtio-dmabuf.c b/hw/display/virtio-dmabuf.c index 3dba4577ca..6688809777 100644 --- a/hw/display/virtio-dmabuf.c +++ b/hw/display/virtio-dmabuf.c @@ -136,6 +136,28 @@ SharedObjectType virtio_object_type(const QemuUUID *uu= id) return vso->type; } =20 +static bool virtio_dmabuf_resource_is_owned(gpointer key, + gpointer value, + gpointer dev) +{ + VirtioSharedObject *vso; + + vso =3D (VirtioSharedObject *) value; + return vso->type =3D=3D TYPE_VHOST_DEV && vso->value =3D=3D dev; +} + +int virtio_dmabuf_vhost_cleanup(struct vhost_dev *dev) +{ + int num_removed; + + g_mutex_lock(&lock); + num_removed =3D g_hash_table_foreach_remove( + resource_uuids, (GHRFunc) virtio_dmabuf_resource_is_owned, dev); + g_mutex_unlock(&lock); + + return num_removed; +} + void virtio_free_resources(void) { g_mutex_lock(&lock); diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 2c9ac79468..c5622eac14 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/virtio/vhost.h" +#include "hw/virtio/virtio-dmabuf.h" #include "qemu/atomic.h" #include "qemu/range.h" #include "qemu/error-report.h" @@ -1599,6 +1600,8 @@ void vhost_dev_cleanup(struct vhost_dev *hdev) migrate_del_blocker(&hdev->migration_blocker); g_free(hdev->mem); g_free(hdev->mem_sections); + /* free virtio shared objects */ + virtio_dmabuf_vhost_cleanup(hdev); if (hdev->vhost_ops) { hdev->vhost_ops->vhost_backend_cleanup(hdev); } diff --git a/include/hw/virtio/virtio-dmabuf.h b/include/hw/virtio/virtio-d= mabuf.h index 627c3b6db7..73f70fb482 100644 --- a/include/hw/virtio/virtio-dmabuf.h +++ b/include/hw/virtio/virtio-dmabuf.h @@ -91,6 +91,16 @@ struct vhost_dev *virtio_lookup_vhost_device(const QemuU= UID *uuid); */ SharedObjectType virtio_object_type(const QemuUUID *uuid); =20 +/** + * virtio_dmabuf_vhost_cleanup() - Destroys all entries of the shared + * resources lookup table that are owned by the vhost backend + * @dev: the pointer to the vhost device that owns the entries. Data is ow= ned + * by the called of the function. + *=20 + * Return: the number of resource entries removed. + */ +int virtio_dmabuf_vhost_cleanup(struct vhost_dev *dev); + /** * virtio_free_resources() - Destroys all keys and values of the shared * resources lookup table, and frees them diff --git a/tests/unit/test-virtio-dmabuf.c b/tests/unit/test-virtio-dmabu= f.c index a45ec52f42..1c8123c2d2 100644 --- a/tests/unit/test-virtio-dmabuf.c +++ b/tests/unit/test-virtio-dmabuf.c @@ -103,6 +103,38 @@ static void test_add_invalid_resource(void) } } =20 +static void test_cleanup_res(void) +{ + QemuUUID uuids[20], uuid_alt; + struct vhost_dev *dev =3D g_new0(struct vhost_dev, 1); + struct vhost_dev *dev_alt =3D g_new0(struct vhost_dev, 1); + int i, num_removed; + + for (i =3D 0; i < ARRAY_SIZE(uuids); ++i) { + qemu_uuid_generate(&uuids[i]); + virtio_add_vhost_device(&uuids[i], dev); + /* vhost device is found */ + g_assert(virtio_lookup_vhost_device(&uuids[i]) !=3D NULL); + } + qemu_uuid_generate(&uuid_alt); + virtio_add_vhost_device(&uuid_alt, dev_alt); + /* vhost device is found */ + g_assert(virtio_lookup_vhost_device(&uuid_alt) !=3D NULL); + /* cleanup all dev resources */ + num_removed =3D virtio_dmabuf_vhost_cleanup(dev); + g_assert_cmpint(num_removed, =3D=3D, ARRAY_SIZE(uuids)); + for (i =3D 0; i < ARRAY_SIZE(uuids); ++i) { + /* None of the dev resources is found after free'd */ + g_assert_cmpint(virtio_lookup_dmabuf(&uuids[i]), =3D=3D, -1); + } + /* uuid_alt is still in the hash table */ + g_assert(virtio_lookup_vhost_device(&uuid_alt) !=3D NULL); + + virtio_free_resources(); + g_free(dev); + g_free(dev_alt); +} + static void test_free_resources(void) { QemuUUID uuids[20]; @@ -131,6 +163,7 @@ int main(int argc, char **argv) test_remove_invalid_resource); g_test_add_func("/virtio-dmabuf/add_invalid_res", test_add_invalid_resource); + g_test_add_func("/virtio-dmabuf/cleanup_dev", test_cleanup_res); g_test_add_func("/virtio-dmabuf/free_res", test_free_resources); =20 return g_test_run(); --=20 2.43.0