From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68861C43334 for ; Fri, 8 Jul 2022 11:05:28 +0000 (UTC) Received: from localhost ([::1]:41016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9lna-0006Xy-BS for qemu-devel@archiver.kernel.org; Fri, 08 Jul 2022 07:05:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9lZp-0000pL-RJ for qemu-devel@nongnu.org; Fri, 08 Jul 2022 06:51:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:27544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9lZo-0008B8-CP for qemu-devel@nongnu.org; Fri, 08 Jul 2022 06:51:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657277471; 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=bNL84NascVj6ajagJG7cZSfnsSy+T7j4NhGAFCgZAZs=; b=ToZ852UCOG8E1Fv0XlCIsKxrhJe+Gm0O5PdxFW8rQF9XkMZbMgx1T/MoOGb6OSSVvGKlHb ecmScW/bgOovD4h2BEDi5NBqhRF/qRLAk6SQVx6r7Omp9wQKFEy9aQtWSSviMEViHw1HVR cZKGLGo9OBDO9PwJioIfewr8CP3qMj4= 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-557-oRqBVWIaM4WmVmekCeNjFg-1; Fri, 08 Jul 2022 06:51:07 -0400 X-MC-Unique: oRqBVWIaM4WmVmekCeNjFg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E1A23C0ED4F; Fri, 8 Jul 2022 10:51:07 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 870711121314; Fri, 8 Jul 2022 10:51:04 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Eric Blake , Stefan Hajnoczi , Liuxiangdong , Cindy Lu , Zhu Lingshan , "Gonglei (Arei)" , Laurent Vivier , Gautam Dawar , Stefano Garzarella , Markus Armbruster , Paolo Bonzini , Harpreet Singh Anand , Jason Wang , "Michael S. Tsirkin" , Eli Cohen , Parav Pandit , Cornelia Huck Subject: [PATCH 16/22] vhost: add detach SVQ operation Date: Fri, 8 Jul 2022 12:50:07 +0200 Message-Id: <20220708105013.1899854-17-eperezma@redhat.com> In-Reply-To: <20220708105013.1899854-1-eperezma@redhat.com> References: <20220708105013.1899854-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" To notify the caller it needs to discard the element. Signed-off-by: Eugenio Pérez --- 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-virtqueue.h index cfc891e2e8..dc0059adc6 100644 --- a/hw/virtio/vhost-shadow-virtqueue.h +++ b/hw/virtio/vhost-shadow-virtqueue.h @@ -44,9 +44,20 @@ typedef void (*VirtQueueUsedCallback)(VhostShadowVirtqueue *svq, void *used_elem_opaque, uint32_t written); +/** + * 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 { VirtQueueAvailCallback avail_handler; VirtQueueUsedCallback used_handler; + VirtQueueDetachCallback detach_handler; } VhostShadowVirtqueueOps; /* Shadow virtqueue to relay notifications */ diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c index 78579b9e0b..626691ac4e 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -749,7 +749,16 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq) for (unsigned i = 0; i < svq->vring.num; ++i) { g_autofree VirtQueueElement *elem = NULL; - elem = g_steal_pointer(&svq->ring_id_maps[i].opaque); + void *opaque = g_steal_pointer(&svq->ring_id_maps[i].opaque); + + if (!opaque) { + continue; + } else if (svq->ops) { + elem = svq->ops->detach_handler(opaque); + } else { + elem = opaque; + } + if (elem) { virtqueue_detach_element(svq->vq, elem, 0); } -- 2.31.1