From nobody Mon Feb 9 04:14:47 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=1657134459; cv=none; d=zohomail.com; s=zohoarc; b=hVXCSN4c8sQqCyDcJrE8f2XWstWyKM3v9kmebs7x2f/zpst/3uNH14t+WthrjZnPbAXxMXBWncF7gYRy0lb8Y52o3VE5kmWaHUEnN3qKzD8uZy5Z8mv4gizWbqYpI9OKksi+lcF/QL6Fy1Guj6QsR88Ul/1y8jCryFMKvH8PB18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657134459; 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=ziR3ctgT/CCLnNAiqZTlkOadNXJL1NwUmNcP1OIzuHA=; b=iMzneVmJWsx7pOKWJZd13Jf1zDsJXTuXS6kqb4tXDx/iuRRtrPGuZCKkGplK7kHCQeUEKsoOs1bmI1BkeqDK1Qlt2u4/dHaPBK+WncNJVMDpGDiFVzKsR43asdjPSGG1k7ktkQiawTiYCPy4zbX5lm9wfj7u3j2yxFpaJAM3zjQ= 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 16571344594407.643823125207518; Wed, 6 Jul 2022 12:07:39 -0700 (PDT) Received: from localhost ([::1]:38464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9AN8-0007Kz-FX for importer@patchew.org; Wed, 06 Jul 2022 15:07:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o99xm-0005aF-7G for qemu-devel@nongnu.org; Wed, 06 Jul 2022 14:41:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o99xU-0000sv-1N for qemu-devel@nongnu.org; Wed, 06 Jul 2022 14:41:21 -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-28-1C7HMeMgNWKz2SH2kUhu2A-1; Wed, 06 Jul 2022 14:41:02 -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 5DA591019C8B; Wed, 6 Jul 2022 18:41:02 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id B95531415116; Wed, 6 Jul 2022 18:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657132866; 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=ziR3ctgT/CCLnNAiqZTlkOadNXJL1NwUmNcP1OIzuHA=; b=MKvgtNipkECyKuihHgO6WqDEDmva3zXTsyO7Qft0r56RhdAyQXpmp1vO3LYzdf13R2YC8t 2yAJvrkjmU6wEUsDhW1c1KFnbXuvoA4VxGJwF/1p+5ylxpMP+7dpY/w3I0f8pEWpoKB+uA UGTDzT75N/bvfqglSyl1gpCUXVfUnXQ= X-MC-Unique: 1C7HMeMgNWKz2SH2kUhu2A-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Liuxiangdong , Markus Armbruster , Harpreet Singh Anand , Eric Blake , Laurent Vivier , Parav Pandit , Cornelia Huck , Paolo Bonzini , Gautam Dawar , Eli Cohen , "Gonglei (Arei)" , Zhu Lingshan , "Michael S. Tsirkin" , Cindy Lu , Jason Wang Subject: [RFC PATCH v9 17/23] vhost: add detach SVQ operation Date: Wed, 6 Jul 2022 20:40:02 +0200 Message-Id: <20220706184008.1649478-18-eperezma@redhat.com> In-Reply-To: <20220706184008.1649478-1-eperezma@redhat.com> References: <20220706184008.1649478-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.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.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, 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: 1657134460533100001 To notify the caller it needs to discard the element. Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-shadow-virtqueue.h | 11 +++++++++++ hw/virtio/vhost-shadow-virtqueue.c | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.h b/hw/virtio/vhost-shadow-vi= rtqueue.h index 4300cb66f8..583b6fda5d 100644 --- a/hw/virtio/vhost-shadow-virtqueue.h +++ b/hw/virtio/vhost-shadow-virtqueue.h @@ -46,10 +46,21 @@ typedef void (*VirtQueueUsedCallback)(VhostShadowVirtqu= eue *svq, void *used_elem_opaque, uint32_t written); =20 +/** + * Detach the element from the shadow virtqueue. SVQ needs to free it and= it + * cannot be pushed or discarded. + * + * @elem_opaque: The element opaque + * + * Return the guest element to detach and free if any. + */ +typedef VirtQueueElement *(*VirtQueueDetachCallback)(void *elem_opaque); + typedef struct VhostShadowVirtqueueOps { ShadowVirtQueueStart start; VirtQueueAvailCallback avail_handler; VirtQueueUsedCallback used_handler; + VirtQueueDetachCallback detach_handler; } VhostShadowVirtqueueOps; =20 /* Shadow virtqueue to relay notifications */ diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index dffea256f1..4f072f040b 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -746,7 +746,16 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq) =20 for (unsigned i =3D 0; i < svq->vring.num; ++i) { g_autofree VirtQueueElement *elem =3D NULL; - elem =3D g_steal_pointer(&svq->ring_id_maps[i].opaque); + void *opaque =3D g_steal_pointer(&svq->ring_id_maps[i].opaque); + + if (!opaque) { + continue; + } else if (svq->ops) { + elem =3D svq->ops->detach_handler(opaque); + } else { + elem =3D opaque; + } + if (elem) { virtqueue_detach_element(svq->vq, elem, 0); } --=20 2.31.1