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 13D2EA0556; Mon, 17 Oct 2022 09:18:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BE28427F3; Mon, 17 Oct 2022 09:17:56 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 0315F4114B for ; Mon, 17 Oct 2022 09:17:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665991075; x=1697527075; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=2BfcbsosBr27Pp2i72cC1AjeptpU9lhqfMa+tPBX+bA=; b=HD3gth/JHbruTKVOrOTU3h6zFBapbn+Fl03qTqKSO4amEoG3jkjhfhTe P8zwChzgIVuiYnn4ibKg/bvU3A5436LpM2v9iBfjAnqGNts3kwPMhMjea STLEI9Pq46S59cyv1dPqWW+dQJfpOuEIQPQamR3unVqK8R7hOnSrJS1B8 rHiYAqL0E1o7jD+gUWlwVWUai7+eJ/MmFImagZ15gbqlRG2ghhorwF7dv FGprZilpWB6k4871YDaciQc1CpcmHfCXE9EIzfNDNllGptveoq/7FPA2e 15YauNhzrmB8eWHAZspnFUQPY2YpPTiGBhFZJD5QTh+U9HNlXphOrNgIH A==; X-IronPort-AV: E=McAfee;i="6500,9779,10502"; a="367751434" X-IronPort-AV: E=Sophos;i="5.95,190,1661842800"; d="scan'208";a="367751434" 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:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10502"; a="696949626" X-IronPort-AV: E=Sophos;i="5.95,190,1661842800"; d="scan'208";a="696949626" Received: from dpdk-dipei.sh.intel.com ([10.67.110.251]) by fmsmga004.fm.intel.com with ESMTP; 17 Oct 2022 00:17:53 -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 8/8] vhost: improve vDPA blk device configure condition Date: Mon, 17 Oct 2022 15:13:53 +0800 Message-Id: <1665990833-44710-9-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 To support multi-queue, configure device after call fd of all queues are set. Signed-off-by: Andy Pei Signed-off-by: Huang Wei Reviewed-by: Chenbo Xia --- lib/vhost/vhost_user.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index f5206dd..6b5f89a 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2984,6 +2984,7 @@ static int is_vring_iotlb(struct virtio_net *dev, uint32_t vdpa_type = 0; uint32_t request; uint32_t i; + uint16_t blk_call_fd; dev = get_device(vid); if (dev == NULL) @@ -3203,9 +3204,15 @@ static int is_vring_iotlb(struct virtio_net *dev, } else { vdpa_type = RTE_VHOST_VDPA_DEVICE_TYPE_NET; } - if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK - && request != VHOST_USER_SET_VRING_CALL) - goto out; + if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK) { + if (request == VHOST_USER_SET_VRING_CALL) { + blk_call_fd = ctx.msg.payload.u64 & VHOST_USER_VRING_IDX_MASK; + if (blk_call_fd != dev->nr_vring - 1) + goto out; + } else { + goto out; + } + } if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) { if (vdpa_dev->ops->dev_conf(dev->vid)) -- 1.8.3.1