From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AC846A0581; Wed, 19 Oct 2022 11:32:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A21742B89; Wed, 19 Oct 2022 11:32:04 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 3FF6642B72 for ; Wed, 19 Oct 2022 11:31:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666171919; x=1697707919; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Mhrk1kAopy8EdJE3g1dK+0c0IdwoRk4koS0FSEXR2Kw=; b=TaKK1zvdDfa9MtGseUv2SiHurUo6gLXPLMsOnEM+fplt6C8uPYFnVRuI P6Pbnrdgjh2EH0n3Mz35Mv5kpvIRbKM2C5Heb2rm2bBk6GJjgRo8Kr0aM FSRJ/oBzQ4SCel0YhslaAZUMNf04uiqipaer62zmwAexmFoqaafCjW8nl 2g/fhyrIQ9DTXmdyGyfiVbU1uN5fFV6xk8Awkiuu1i/4eVKi4Fcb5NXDc YIS0exngAr3NB8tLdAe1LxO85Q9mIOgTU1PCuLXOdkJz/EcCACvbWxXT/ /bpIw4Pz1yBeiLMOF+nV0mSNp9kVUvNTSPAo+6fFoPdGDu7k3jpL8WDv8 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10504"; a="303976954" X-IronPort-AV: E=Sophos;i="5.95,195,1661842800"; d="scan'208";a="303976954" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 02:31:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10504"; a="771691051" X-IronPort-AV: E=Sophos;i="5.95,195,1661842800"; d="scan'208";a="771691051" Received: from dpdk-dipei.sh.intel.com ([10.67.110.251]) by fmsmga001.fm.intel.com with ESMTP; 19 Oct 2022 02:31:57 -0700 From: Andy Pei To: dev@dpdk.org Cc: chenbo.xia@intel.com, rosen.xu@intel.com, wei.huang@intel.com, gang.cao@intel.com, maxime.coquelin@redhat.com Subject: [PATCH v9 11/12] vhost: vDPA blk device gets ready when the first queue is ready Date: Wed, 19 Oct 2022 16:41:23 +0800 Message-Id: <1666168884-104665-12-git-send-email-andy.pei@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666168884-104665-1-git-send-email-andy.pei@intel.com> References: <1661229305-240952-2-git-send-email-andy.pei@intel.com> <1666168884-104665-1-git-send-email-andy.pei@intel.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When boot from virtio blk device, seabios in QEMU only enables one queue. To work in this scenario, vDPA BLK device back-end configure device when the first queue is ready. Signed-off-by: Andy Pei Signed-off-by: Huang Wei Reviewed-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- lib/vhost/vhost_user.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index cd65257..e0ff79d 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -1441,11 +1441,14 @@ } #define VIRTIO_BUILTIN_NUM_VQS_TO_BE_READY 2u +#define VIRTIO_BLK_NUM_VQS_TO_BE_READY 1u static int virtio_is_ready(struct virtio_net *dev) { + struct rte_vdpa_device *vdpa_dev; struct vhost_virtqueue *vq; + uint32_t vdpa_type; uint32_t i, nr_vring = dev->nr_vring; if (dev->flags & VIRTIO_DEV_READY) @@ -1454,13 +1457,22 @@ if (!dev->nr_vring) return 0; - if (dev->flags & VIRTIO_DEV_BUILTIN_VIRTIO_NET) { - nr_vring = VIRTIO_BUILTIN_NUM_VQS_TO_BE_READY; + vdpa_dev = dev->vdpa_dev; + if (vdpa_dev) + vdpa_type = vdpa_dev->type; + else + vdpa_type = -1; - if (dev->nr_vring < nr_vring) - return 0; + if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK) { + nr_vring = VIRTIO_BLK_NUM_VQS_TO_BE_READY; + } else { + 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]; @@ -2958,7 +2970,6 @@ static int is_vring_iotlb(struct virtio_net *dev, int ret; int unlock_required = 0; bool handled; - uint32_t vdpa_type = 0; uint32_t request; uint32_t i; @@ -3170,17 +3181,7 @@ static int is_vring_iotlb(struct virtio_net *dev, if (!vdpa_dev) goto out; - if (vdpa_dev->ops->get_dev_type) { - ret = vdpa_dev->ops->get_dev_type(vdpa_dev, &vdpa_type); - if (ret) { - VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to get vdpa dev type.\n"); - ret = -1; - goto out; - } - } else { - vdpa_type = RTE_VHOST_VDPA_DEVICE_TYPE_NET; - } - if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK + if (vdpa_dev->type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK && request != VHOST_USER_SET_VRING_CALL) goto out; -- 1.8.3.1