[v9,10/12] vhost: add type to rte vdpa device
Checks
Commit Message
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 <andy.pei@intel.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/vhost/socket.c | 15 +--------------
lib/vhost/vdpa.c | 15 +++++++++++++++
lib/vhost/vdpa_driver.h | 2 ++
3 files changed, 18 insertions(+), 14 deletions(-)
@@ -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);
@@ -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);
@@ -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;
};
/**