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 CD421A0581; Wed, 19 Oct 2022 11:32:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62A1142B83; Wed, 19 Oct 2022 11:32:03 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id AA3DD42B76 for ; Wed, 19 Oct 2022 11:31:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666171917; x=1697707917; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=fcSXDElms2+7KDr9YjcXui/7J9c9ra3ZARXK96LWNKw=; b=j8S4vUvioBKS3hesB84HxLUxqn84rkqFkHB/GTV8+MxN5dfX5HAadjzS 9o34lYNfKncpdYyFcweqkgRIMaMa7mBHKARg6k5STQgUhq7/nxmN1Sej8 /bCsydhKJQmRjRstDeUGnlD/apy6QjuQ7WUEmm1bCFD2hgjY7VKicZ+H+ Xtu9Dgk8E6r8gA/ZRHj10xuku2ZrsKG0xkdOY/Yjkgmp9NLffJ16Hi3DD WmXrn6TUzC+uPZkhCODk4mcqP+rOsx1JJg5IZYW6QEe6NVXV0TF6Bp++m KRK/jCqRShEUEwsMpNupM5ydzQkgLKwNlgnJdaVykoQ4/wcpz+xZM/P61 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10504"; a="303976952" X-IronPort-AV: E=Sophos;i="5.95,195,1661842800"; d="scan'208";a="303976952" 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:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10504"; a="771691042" X-IronPort-AV: E=Sophos;i="5.95,195,1661842800"; d="scan'208";a="771691042" Received: from dpdk-dipei.sh.intel.com ([10.67.110.251]) by fmsmga001.fm.intel.com with ESMTP; 19 Oct 2022 02:31:55 -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 10/12] vhost: add type to rte vdpa device Date: Wed, 19 Oct 2022 16:41:22 +0800 Message-Id: <1666168884-104665-11-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 Add type to rte_vdpa_device to store device type. Call vdpa ops get_dev_type to fill type when register vdpa device. Signed-off-by: Andy Pei Reviewed-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- lib/vhost/socket.c | 15 +-------------- lib/vhost/vdpa.c | 15 +++++++++++++++ lib/vhost/vdpa_driver.h | 2 ++ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index 608ae57..863a6f6 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -627,7 +627,6 @@ struct rte_vdpa_device * { struct vhost_user_socket *vsocket; struct rte_vdpa_device *vdpa_dev; - uint32_t vdpa_type = 0; int ret = 0; pthread_mutex_lock(&vhost_user.mutex); @@ -644,19 +643,7 @@ struct rte_vdpa_device * goto unlock_exit; } - if (vdpa_dev->ops->get_dev_type) { - ret = vdpa_dev->ops->get_dev_type(vdpa_dev, &vdpa_type); - if (ret) { - VHOST_LOG_CONFIG(path, ERR, - "failed to get vdpa dev type for socket file.\n"); - ret = -1; - goto unlock_exit; - } - } else { - vdpa_type = RTE_VHOST_VDPA_DEVICE_TYPE_NET; - } - - *type = vdpa_type; + *type = vdpa_dev->type; unlock_exit: pthread_mutex_unlock(&vhost_user.mutex); diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c index bb82857..577cb00 100644 --- a/lib/vhost/vdpa.c +++ b/lib/vhost/vdpa.c @@ -73,6 +73,7 @@ struct rte_vdpa_device * struct rte_vdpa_dev_ops *ops) { struct rte_vdpa_device *dev; + int ret = 0; if (ops == NULL) return NULL; @@ -101,6 +102,20 @@ struct rte_vdpa_device * dev->device = rte_dev; dev->ops = ops; + + if (ops->get_dev_type) { + ret = ops->get_dev_type(dev, &dev->type); + if (ret) { + VHOST_LOG_CONFIG(rte_dev->name, ERR, + "Failed to get vdpa dev type.\n"); + ret = -1; + goto out_unlock; + } + } else { + /** by default, we assume vdpa device is a net device */ + dev->type = RTE_VHOST_VDPA_DEVICE_TYPE_NET; + } + TAILQ_INSERT_TAIL(&vdpa_device_list, dev, next); out_unlock: rte_spinlock_unlock(&vdpa_device_list_lock); diff --git a/lib/vhost/vdpa_driver.h b/lib/vhost/vdpa_driver.h index 8b88a53..8db4ab9 100644 --- a/lib/vhost/vdpa_driver.h +++ b/lib/vhost/vdpa_driver.h @@ -92,6 +92,8 @@ struct rte_vdpa_device { struct rte_device *device; /** vdpa device operations */ struct rte_vdpa_dev_ops *ops; + /** vdpa device type: net, blk... */ + uint32_t type; }; /** -- 1.8.3.1