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 86CF4C433EF for ; Tue, 12 Jul 2022 07:13:14 +0000 (UTC) Received: from localhost ([::1]:39238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBA53-0003fQ-G4 for qemu-devel@archiver.kernel.org; Tue, 12 Jul 2022 03:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBA0L-0001D8-8p for qemu-devel@nongnu.org; Tue, 12 Jul 2022 03:08:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBA0G-0004nS-Cl for qemu-devel@nongnu.org; Tue, 12 Jul 2022 03:08:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657609695; 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; bh=8KRwJT+2rdLSHUJavjhTsGJ0GQzgJxB2o8jQxNmcNXM=; b=CMLS++ewA6vIiwWkUnmzCaqxKPDJxP4O4KA88qw9hEW5a1oAt2UrW7rOG6Z98mv7gxRrHO Yc3mwouxKNn9obAnybcugIGczNeMqJKPrPfAHmtqqolGx480bNOtNYL5LE21xFZRPsmmUI SHRwK3PwIpVzBLusY9M0Sw+eGoYGl2c= 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-166-bxQB0qktNVmpRKdr214TLw-1; Tue, 12 Jul 2022 03:08:08 -0400 X-MC-Unique: bxQB0qktNVmpRKdr214TLw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E0C4B811E7A for ; Tue, 12 Jul 2022 07:08:07 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AF4640CF8EF; Tue, 12 Jul 2022 07:08:06 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Laurent Vivier , Jason Wang Subject: [PATCH] vhost: Return earlier if used buffers overrun SVQ flush Date: Tue, 12 Jul 2022 09:08:04 +0200 Message-Id: <20220712070804.2140168-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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" Previous function misses the just picked avail buffer from the queue. This way keeps blocking the used queue until queue reset, but is cleaner to check before calling to vhost_svq_get_buf. Fixes: 100890f7cad50 ("vhost: Shadow virtqueue buffers forwarding") Acked-by: Jason Wang Signed-off-by: Eugenio Pérez --- hw/virtio/vhost-shadow-virtqueue.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c index 56c96ebd13..9280285435 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -405,19 +405,21 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq, vhost_svq_disable_notification(svq); while (true) { uint32_t len; - g_autofree VirtQueueElement *elem = vhost_svq_get_buf(svq, &len); - if (!elem) { - break; - } + g_autofree VirtQueueElement *elem = NULL; if (unlikely(i >= svq->vring.num)) { qemu_log_mask(LOG_GUEST_ERROR, "More than %u used buffers obtained in a %u size SVQ", i, svq->vring.num); - virtqueue_fill(vq, elem, len, i); - virtqueue_flush(vq, i); + virtqueue_flush(vq, svq->vring.num); return; } + + elem = vhost_svq_get_buf(svq, &len); + if (!elem) { + break; + } + virtqueue_fill(vq, elem, len, i++); } -- 2.31.1