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 6663FA0560; Tue, 18 Oct 2022 08:24:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF3A842B6C; Tue, 18 Oct 2022 08:24:02 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 6D95042905 for ; Tue, 18 Oct 2022 08:24:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666074241; x=1697610241; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=B6n3//Zf60nblRkZRy1wXFcfXglyokxJ/BBds+bYVgw=; b=gvsMdTqJQZlAt3Q20H/9g2dT4JFPztwYjv8qlvjmOtNnVYmGuOS/1yud 3amEeXyXBqGt8xAWv+G+O/qTd1T4pwHVhY5L8ueCn8Z2zzltRX9DVVLcY IIA0HOEO82SmVxF/GT+WEON5DTy3oweRQt4Tkt1R+HeJ2EBkyH1K2uesl j2XzD26eFHfIDBaXkB4QDD5OGw31DAdMHfbrDgHPP/NLv/YH1jKaHNUoN 165hxHhomuu6n7x6ZYnbQoJD8mEGQVTWQewoec4kmjXN3c8YnG4uNDzs3 eHvnjnPUjtADGz/rvAA3260dqrwg8+KbVMY0qUAeXjgpCjKBo55Dn33ut Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="285732827" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="285732827" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 23:24:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="659655936" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="659655936" Received: from dpdk-dipei.sh.intel.com ([10.67.110.251]) by orsmga008.jf.intel.com with ESMTP; 17 Oct 2022 23:23:59 -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 v7 12/12] vhost: improve vDPA blk device configure condition Date: Tue, 18 Oct 2022 14:19:37 +0800 Message-Id: <1666073977-175484-13-git-send-email-andy.pei@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666073977-175484-1-git-send-email-andy.pei@intel.com> References: <1661229305-240952-2-git-send-email-andy.pei@intel.com> <1666073977-175484-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 d5dbd9b..96383b9 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; uint32_t request; uint32_t i; + uint16_t blk_call_fd; dev = get_device(vid); if (dev == NULL) @@ -3183,9 +3184,15 @@ static int is_vring_iotlb(struct virtio_net *dev, goto out; vdpa_type = vdpa_dev->vdpa_device_type; - 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