From patchwork Mon Dec 5 17:04:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 13064819 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 056DBC4332F for ; Mon, 5 Dec 2022 17:06:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p2Eto-0000Ta-LN; Mon, 05 Dec 2022 12:05:00 -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 1p2Etn-0000TR-4y for qemu-devel@nongnu.org; Mon, 05 Dec 2022 12:04:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2Etl-0002ey-KW for qemu-devel@nongnu.org; Mon, 05 Dec 2022 12:04:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670259897; 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=zC19UHkvMu8PnACVlAc3vwHKzXaHdSok8GEtSaD3nNc=; b=X2CeihXJobbE6dlUhP03DavRonkhGT7Uv9SZVe4/CVi6ZrVj4vwHAn56XbmkGVNR96HtTd XUwV59YwM/dr6ccJlhX2Qgke2irra1BpZY9qx5w/kalt8mdcAxkIth4GzKt4grCBHz1R8p HcCATH12h5VPw/OOXzHjs47lut1tFUs= 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-389-4ENSNoYeN0C_tN6Nlg6jnQ-1; Mon, 05 Dec 2022 12:04:53 -0500 X-MC-Unique: 4ENSNoYeN0C_tN6Nlg6jnQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5CFA038164C3; Mon, 5 Dec 2022 17:04:52 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AA2DC2C8C5; Mon, 5 Dec 2022 17:04:49 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Liuxiangdong , Stefan Hajnoczi , Jason Wang , Harpreet Singh Anand , Gautam Dawar , Zhu Lingshan , Cindy Lu , Si-Wei Liu , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Laurent Vivier , Eli Cohen , Stefano Garzarella , Juan Quintela , Parav Pandit Subject: [RFC PATCH for 8.0 03/13] vhost: merge avail list and next avail descriptors detach Date: Mon, 5 Dec 2022 18:04:26 +0100 Message-Id: <20221205170436.2977336-4-eperezma@redhat.com> In-Reply-To: <20221205170436.2977336-1-eperezma@redhat.com> References: <20221205170436.2977336-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org We need to perform the same actions for the two. Signed-off-by: Eugenio Pérez --- hw/virtio/vhost-shadow-virtqueue.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c index 1bda8ca4bf..e50bfba6dc 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -692,18 +692,18 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq) /* Send all pending used descriptors to guest */ vhost_svq_flush(svq, false); - while (!QTAILQ_EMPTY(&svq->desc_state_avail)) { + while (!QTAILQ_EMPTY(&svq->desc_state_avail) + || svq->next_guest_avail_elem) { SVQDescState *s = QTAILQ_FIRST(&svq->desc_state_avail); g_autofree VirtQueueElement *elem = NULL; - elem = g_steal_pointer(&s->elem); - virtqueue_detach_element(svq->vq, elem, 0); - QTAILQ_REMOVE(&svq->desc_state_avail, s, entry); - } - - next_avail_elem = g_steal_pointer(&svq->next_guest_avail_elem); - if (next_avail_elem) { - virtqueue_detach_element(svq->vq, next_avail_elem, 0); + elem = g_steal_pointer(s ? &s->elem : &svq->next_guest_avail_elem); + if (elem) { + virtqueue_detach_element(svq->vq, elem, 0); + } + if (s) { + QTAILQ_REMOVE(&svq->desc_state_avail, s, entry); + } } svq->vq = NULL; g_free(svq->desc_next);