net/virtio-user: support changing tap interface name

This patch adds a new option 'iface' to change the interface name of
tap device with vhost-kernel as backend.

Signed-off-by: Wenfeng Liu <liuwf@arraynetworks.com.cn>
Reviewed-by: Jianfeng Tan <jianfeng.tan@intel.com>
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 9dcdac8..902b6cd 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -193,9 +193,6 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)
        for (i = 0; i < dev->max_queue_pairs; ++i)
                dev->ops->enable_qp(dev, i, 0);
 
-       free(dev->ifname);
-       dev->ifname = NULL;
-
        return 0;
 }
 
@@ -220,7 +217,7 @@ parse_mac(struct virtio_user_dev *dev, const char *mac)
        }
 }
 
-static int
+int
 is_vhost_user_by_type(const char *path)
 {
        struct stat sb;
@@ -268,7 +265,7 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)
 
 int
 virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
-                    int cq, int queue_size, const char *mac)
+                    int cq, int queue_size, const char *mac, char **ifname)
 {
        snprintf(dev->path, PATH_MAX, "%s", path);
        dev->max_queue_pairs = queues;
@@ -277,6 +274,11 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
        dev->mac_specified = 0;
        parse_mac(dev, mac);
 
+       if (*ifname) {
+               dev->ifname = *ifname;
+               *ifname = NULL;
+       }
+
        if (virtio_user_dev_setup(dev) < 0) {
                PMD_INIT_LOG(ERR, "backend set up fails");
                return -1;
@@ -327,6 +329,8 @@ virtio_user_dev_uninit(struct virtio_user_dev *dev)
                free(dev->vhostfds);
                free(dev->tapfds);
        }
+
+       free(dev->ifname);
 }
 
 static uint8_t

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index bd2e4ca..8abaa68 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -66,10 +66,11 @@ struct virtio_user_dev {
        struct virtio_user_backend_ops *ops;
 };
 
+int is_vhost_user_by_type(const char *path);
 int virtio_user_start_device(struct virtio_user_dev *dev);
 int virtio_user_stop_device(struct virtio_user_dev *dev);
 int virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
-                        int cq, int queue_size, const char *mac);
+                        int cq, int queue_size, const char *mac, char **ifname);
 void virtio_user_dev_uninit(struct virtio_user_dev *dev);
 void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx);
 #endif

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 7528a16..740d7b1 100644 (file)
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -243,6 +243,8 @@ static const char *valid_args[] = {
        VIRTIO_USER_ARG_PATH,
 #define VIRTIO_USER_ARG_QUEUE_SIZE     "queue_size"
        VIRTIO_USER_ARG_QUEUE_SIZE,
+#define VIRTIO_USER_ARG_INTERFACE_NAME "iface"
+       VIRTIO_USER_ARG_INTERFACE_NAME,
        NULL
 };
 
@@ -259,6 +261,9 @@ get_string_arg(const char *key __rte_unused,
 
        *(char **)extra_args = strdup(value);
 
+       if (!*(char **)extra_args)
+               return -ENOMEM;
+
        return 0;
 }
 
@@ -347,6 +352,7 @@ virtio_user_pmd_probe(const char *name, const char *params)
        uint64_t cq = VIRTIO_USER_DEF_CQ_EN;
        uint64_t queue_size = VIRTIO_USER_DEF_Q_SZ;
        char *path = NULL;
+       char *ifname = NULL;
        char *mac_addr = NULL;
        int ret = -1;
 
@@ -375,6 +381,22 @@ virtio_user_pmd_probe(const char *name, const char *params)
                goto end;
        }
 
+       if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_INTERFACE_NAME) == 1) {
+               if (is_vhost_user_by_type(path)) {
+                       PMD_INIT_LOG(ERR,
+                               "arg %s applies only to vhost-kernel backend",
+                               VIRTIO_USER_ARG_INTERFACE_NAME);
+                       goto end;
+               }
+
+               if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_INTERFACE_NAME,
+                                      &get_string_arg, &ifname) < 0) {
+                       PMD_INIT_LOG(ERR, "error to parse %s",
+                                    VIRTIO_USER_ARG_INTERFACE_NAME);
+                       goto end;
+               }
+       }
+
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MAC) == 1) {
                if (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,
                                       &get_string_arg, &mac_addr) < 0) {
@@ -433,7 +455,7 @@ virtio_user_pmd_probe(const char *name, const char *params)
 
        hw = eth_dev->data->dev_private;
        if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
-                                queue_size, mac_addr) < 0) {
+                                queue_size, mac_addr, &ifname) < 0) {
                PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
                virtio_user_eth_dev_free(eth_dev);
                goto end;
@@ -454,6 +476,8 @@ end:
                free(path);
        if (mac_addr)
                free(mac_addr);
+       if (ifname)
+               free(ifname);
        return ret;
 }
 
@@ -499,4 +523,5 @@ RTE_PMD_REGISTER_PARAM_STRING(net_virtio_user,
        "mac=<mac addr> "
        "cq=<int> "
        "queue_size=<int> "
-       "queues=<int>");
+       "queues=<int> "
+       "iface=<string>");