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 C5B0BC19F2D for ; Tue, 9 Aug 2022 17:47:15 +0000 (UTC) Received: from localhost ([::1]:59056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLTJx-0004Ag-QK for qemu-devel@archiver.kernel.org; Tue, 09 Aug 2022 13:47:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLTCp-0002yX-CS for qemu-devel@nongnu.org; Tue, 09 Aug 2022 13:39:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLTCn-0007dc-Uh for qemu-devel@nongnu.org; Tue, 09 Aug 2022 13:39:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660066788; 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=BH5pDxJtRQ5QlbPZfRaOErQEJelhMMFxeznntPVmMQQ=; b=h0FWz2vmjyJulZ13k6tcS1MkHmIaqmYkdVnxQaglz/ncBm2JtdogDwJ2ZFDnGc8Qwc6y5u 2ubkzB4UNrccNBNbhEcnCpACZHugzh9nR3LLXv8vFJmAcJXKCPbo6eVIFOE3te89P/L2YQ 46fzVJGjHdum1nxzoudEnOV1p6IQyws= 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-94-M5vemoyiPN24E7_B_DDbDw-1; Tue, 09 Aug 2022 13:39:44 -0400 X-MC-Unique: M5vemoyiPN24E7_B_DDbDw-1 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 644EA101AA48; Tue, 9 Aug 2022 17:39:44 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50B2F9457F; Tue, 9 Aug 2022 17:39:41 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Harpreet Singh Anand , Gautam Dawar , Laurent Vivier , Liuxiangdong , Jason Wang , Cindy Lu , "Gonglei (Arei)" , Zhu Lingshan , Eric Blake , Cornelia Huck , Eli Cohen , Paolo Bonzini , Stefano Garzarella , Markus Armbruster , "Michael S. Tsirkin" , Stefan Hajnoczi , Parav Pandit Subject: [PATCH v8 04/12] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush Date: Tue, 9 Aug 2022 19:39:18 +0200 Message-Id: <20220809173926.1695280-5-eperezma@redhat.com> In-Reply-To: <20220809173926.1695280-1-eperezma@redhat.com> References: <20220809173926.1695280-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since QEMU will be able to inject new elements on CVQ to restore the state, we need not to depend on a VirtQueueElement to know if a new element has been used by the device or not. Instead of check that, check if there are new elements only using used idx on vhost_svq_flush. Signed-off-by: Eugenio Pérez Acked-by: Jason Wang --- v6: Change less from the previous function --- hw/virtio/vhost-shadow-virtqueue.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c index 1b49bf54f2..f863b08627 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -499,17 +499,20 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq, size_t vhost_svq_poll(VhostShadowVirtqueue *svq) { int64_t start_us = g_get_monotonic_time(); + uint32_t len; + do { - uint32_t len; - VirtQueueElement *elem = vhost_svq_get_buf(svq, &len); - if (elem) { - return len; + if (vhost_svq_more_used(svq)) { + break; } if (unlikely(g_get_monotonic_time() - start_us > 10e6)) { return 0; } } while (true); + + vhost_svq_get_buf(svq, &len); + return len; } /** -- 2.31.1