From patchwork Wed Sep 23 09:49:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 78516 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id ADB3DA04B1; Wed, 23 Sep 2020 11:49:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 564DE1D5BC; Wed, 23 Sep 2020 11:49:16 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 204971D549 for ; Wed, 23 Sep 2020 11:49:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600854554; 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=RF8mxhHMQb0fqnN/cE3GLoAKqZFsUKwWR94KZMwDPy8=; b=T8b1Hm/kqpqGxc4G3fbpCHUUmU1X2DCo17I0jEHkutVZ2zhHBzAx8x/h1pMd59T0vPmHcq GOmp/JFo1spW+aIOiWHfiAycP5EI5N5sK/1pn59lC1YxQg+thyTAvbr9Om1Pkg1sV91W9v 0Unn0ApwoqRRtC5ryTduWgR6B4fFT6Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-298-ir4UkzUxMGGl7GTnErjzfw-1; Wed, 23 Sep 2020 05:49:12 -0400 X-MC-Unique: ir4UkzUxMGGl7GTnErjzfw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6BAE380EF84; Wed, 23 Sep 2020 09:49:11 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.110.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7362073682; Wed, 23 Sep 2020 09:49:05 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, chenbo.xia@intel.com, matan@mellanox.com, tomasz.zawadzki@intel.com, changpeng.liu@intel.com Cc: Maxime Coquelin Date: Wed, 23 Sep 2020 11:49:02 +0200 Message-Id: <20200923094902.216856-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH] vhost: fix external backends readiness X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Commit d0fcc38f5fa4 ("vhost: improve device readiness notifications") makes the assumption that every Virtio devices are considered ready for preocessing as soon as first queue pair is configured and enabled. While this is true for Virtio-net, it isn't for Virtio-scsi and Virtio-blk. This patch fixes this by only making this assumption for the builtin Virtio-net backend, and restores back to previous behaviour for other backends. Fixes: d0fcc38f5fa4 ("vhost: improve device readiness notifications") Reported-by: Changpeng Liu Signed-off-by: Maxime Coquelin Signed-off-by: Changpeng Liu Reviewed-by: Chenbo Xia --- lib/librte_vhost/vhost_user.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 501218e192..b00e1f91dc 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1343,21 +1343,28 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq) vq->enabled; } -#define VIRTIO_DEV_NUM_VQS_TO_BE_READY 2u +#define VIRTIO_BUILTIN_NUM_VQS_TO_BE_READY 2u static int virtio_is_ready(struct virtio_net *dev) { struct vhost_virtqueue *vq; - uint32_t i; + uint32_t i, nr_vring = dev->nr_vring; if (dev->flags & VIRTIO_DEV_READY) return 1; - if (dev->nr_vring < VIRTIO_DEV_NUM_VQS_TO_BE_READY) + if (!dev->nr_vring) return 0; - for (i = 0; i < VIRTIO_DEV_NUM_VQS_TO_BE_READY; i++) { + if (dev->flags & VIRTIO_DEV_BUILTIN_VIRTIO_NET) { + nr_vring = VIRTIO_BUILTIN_NUM_VQS_TO_BE_READY; + + if (dev->nr_vring < nr_vring) + return 0; + } + + for (i = 0; i < nr_vring; i++) { vq = dev->virtqueue[i]; if (!vq_is_ready(dev, vq))