* Re: [dpdk-dev] [PATCH v3] net/virtio-user: support changing tap interface name
2017-03-28 17:20 [dpdk-dev] [PATCH v3] net/virtio-user: support changing tap interface name Wenfeng Liu
@ 2017-03-28 10:30 ` Yuanhan Liu
0 siblings, 0 replies; 2+ messages in thread
From: Yuanhan Liu @ 2017-03-28 10:30 UTC (permalink / raw)
To: Wenfeng Liu; +Cc: jianfeng.tan, maxime.coquelin, dev
On Tue, Mar 28, 2017 at 05:20:00PM +0000, Wenfeng Liu wrote:
> 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>
> ---
> v3:
> * Add a sanity check and raise an exception if it's given for vhost-user backend
>
> v2:
> * Remove the misuse of VIRTIO_USER_DEF_CQ_EN
Applied to dpdk-next-virtio.
Thanks.
--yliu
^ permalink raw reply [flat|nested] 2+ messages in thread
* [dpdk-dev] [PATCH v3] net/virtio-user: support changing tap interface name
@ 2017-03-28 17:20 Wenfeng Liu
2017-03-28 10:30 ` Yuanhan Liu
0 siblings, 1 reply; 2+ messages in thread
From: Wenfeng Liu @ 2017-03-28 17:20 UTC (permalink / raw)
To: jianfeng.tan, yuanhan.liu, maxime.coquelin; +Cc: dev
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>
---
v3:
* Add a sanity check and raise an exception if it's given for vhost-user backend
v2:
* Remove the misuse of VIRTIO_USER_DEF_CQ_EN
drivers/net/virtio/virtio_user/virtio_user_dev.c | 14 ++++++++----
drivers/net/virtio/virtio_user/virtio_user_dev.h | 3 ++-
drivers/net/virtio/virtio_user_ethdev.c | 29 ++++++++++++++++++++++--
3 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 21ed00d..c1b7524 100644
--- 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 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)
}
}
-static int
+int
is_vhost_user_by_type(const char *path)
{
struct stat sb;
@@ -268,7 +265,7 @@ 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)
{
snprintf(dev->path, PATH_MAX, "%s", path);
dev->max_queue_pairs = queues;
@@ -277,6 +274,11 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)
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 @@ int virtio_user_stop_device(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 0d39f40..3d37adf 100644
--- 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 0b226ac..6f0fdd0 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -243,6 +243,8 @@
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 @@
*(char **)extra_args = strdup(value);
+ if (!*(char **)extra_args)
+ return -ENOMEM;
+
return 0;
}
@@ -347,6 +352,7 @@
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 @@
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) {
@@ -426,7 +448,7 @@
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;
@@ -447,6 +469,8 @@
free(path);
if (mac_addr)
free(mac_addr);
+ if (ifname)
+ free(ifname);
return ret;
}
@@ -492,4 +516,5 @@
"mac=<mac addr> "
"cq=<int> "
"queue_size=<int> "
- "queues=<int>");
+ "queues=<int> "
+ "iface=<string>");
--
1.8.3.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-28 10:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-28 17:20 [dpdk-dev] [PATCH v3] net/virtio-user: support changing tap interface name Wenfeng Liu
2017-03-28 10:30 ` Yuanhan Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).