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 E4DDFA055F; Mon, 17 Oct 2022 13:46:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D2BD4281E; Mon, 17 Oct 2022 13:45:57 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 145164281A for ; Mon, 17 Oct 2022 13:45:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666007156; x=1697543156; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WNOojTvvmo4yVG8QfkY2ip9mN8NT+mU/kyZYj/8yVgo=; b=GJssN27pIeZ1W2eFOnUy9W4kltFnzX0ZT68+nWOBeLoEgJFUA15mMTKc CrWpZOTAyNm7fxwHM9k9cAqz1yrBDwi06n17QNJUJkHFBgK/mX7atl5Tl M6yKXJ1eRX7/sQI88plTGocZ4NKRCWtDorGu9VjlPOAzK4ZiwxS2XnYrI 1LQdYC2WtwruhrOFxQF0+hqgb2O9CBAXqm4e3RPd7+1kV/rj8u+dMLhO/ vrMQ5+SSdwBBlJRUvvJ978FzTfThqlZ6ZccvYZMlglQG+5H+Llc+CwSka ex2uHLEqIfsSIyCjwa8CP/PKScNDXoxjRDn2q5nRaarXUA/jHw1bTFl6n Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10502"; a="305763858" X-IronPort-AV: E=Sophos;i="5.95,191,1661842800"; d="scan'208";a="305763858" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 04:45:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10502"; a="623199983" X-IronPort-AV: E=Sophos;i="5.95,191,1661842800"; d="scan'208";a="623199983" Received: from dpdk-dipei.sh.intel.com ([10.67.110.251]) by orsmga007.jf.intel.com with ESMTP; 17 Oct 2022 04:45:54 -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 v6 8/8] vhost: improve vDPA blk device configure condition Date: Mon, 17 Oct 2022 19:41:45 +0800 Message-Id: <1666006905-74029-9-git-send-email-andy.pei@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666006905-74029-1-git-send-email-andy.pei@intel.com> References: <1661229305-240952-2-git-send-email-andy.pei@intel.com> <1666006905-74029-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 53806fa..2c50d13 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2973,6 +2973,7 @@ static int is_vring_iotlb(struct virtio_net *dev, uint32_t vdpa_type = -1; uint32_t request; uint32_t i; + uint16_t blk_call_fd; dev = get_device(vid); if (dev == NULL) @@ -3201,9 +3202,15 @@ static int is_vring_iotlb(struct virtio_net *dev, if (!vdpa_dev) goto out; - 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