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 3E9E8A0556; Mon, 17 Oct 2022 09:18:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69B254281B; Mon, 17 Oct 2022 09:17:54 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id B6F24427FF for ; Mon, 17 Oct 2022 09:17:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665991072; x=1697527072; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=snSHTPSHaj5PtLhF0MIGH0go3JlxjwPR/Mj/rZOiJMw=; b=XOyhf2ajcBsnyWrlyYEdDxaZmBTdbV/CQ+DbXgjDxDGk6MrNTAZpDt1q FMjSyZY0wIvvl+1i4fUnN+hHqhNs/mIeYwRgwDfYMqmfUfTYW8gABoxE8 v+07Aazv6xmDTrKfYANPVSygvtvuCvkzdsqxiQA5jtU8ULFZ37K7vcRSB iGFSZzsjd71RA6e97Xhu00key2acFTCE3Q0sRcFcmaEjsGqD+bw4S4Pp0 QkA0Bw3axqfM9DXWjHMzDhqE/+3FEScDT+3CinkBwSqpiR169OZkSGdYa BPOgmiY5/STJ5ytuu/dadkTtCKv2YRu2cxypj8u63aQ48PT7qBBujwhZB Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10502"; a="367751425" X-IronPort-AV: E=Sophos;i="5.95,190,1661842800"; d="scan'208";a="367751425" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 00:17:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10502"; a="696949613" X-IronPort-AV: E=Sophos;i="5.95,190,1661842800"; d="scan'208";a="696949613" Received: from dpdk-dipei.sh.intel.com ([10.67.110.251]) by fmsmga004.fm.intel.com with ESMTP; 17 Oct 2022 00:17:50 -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 v5 7/8] vhost: vDPA blk device gets ready when the first queue is ready Date: Mon, 17 Oct 2022 15:13:52 +0800 Message-Id: <1665990833-44710-8-git-send-email-andy.pei@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665990833-44710-1-git-send-email-andy.pei@intel.com> References: <1661229305-240952-2-git-send-email-andy.pei@intel.com> <1665990833-44710-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 any queue is ready. Signed-off-by: Andy Pei Signed-off-by: Huang Wei --- lib/vhost/vhost_user.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index cd65257..f5206dd 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -1441,11 +1441,15 @@ } #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; + int ret = 0; uint32_t i, nr_vring = dev->nr_vring; if (dev->flags & VIRTIO_DEV_READY) @@ -1454,13 +1458,32 @@ 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) { + 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"); + return -1; + } + } else { + vdpa_type = RTE_VHOST_VDPA_DEVICE_TYPE_NET; + } + } 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]; -- 1.8.3.1