| Message ID | 1418926027-19794-1-git-send-email-ciara.loftus@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 432AA7DF0; Thu, 18 Dec 2014 19:12:04 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 684BE68BF for <dev@dpdk.org>; Thu, 18 Dec 2014 19:12:02 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 18 Dec 2014 10:05:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,691,1406617200"; d="scan'208";a="501074356" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 18 Dec 2014 10:02:53 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id sBII7BCV006050; Thu, 18 Dec 2014 18:07:11 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id sBII7AIh019845; Thu, 18 Dec 2014 18:07:10 GMT Received: (from cloftus@localhost) by sivswdev01.ir.intel.com with id sBII79b1019841; Thu, 18 Dec 2014 18:07:09 GMT From: ciara.loftus@intel.com To: dev@dpdk.org Date: Thu, 18 Dec 2014 18:07:07 +0000 Message-Id: <1418926027-19794-1-git-send-email-ciara.loftus@intel.com> X-Mailer: git-send-email 1.7.4.1 Cc: Anthony Fee <anthonyx.fee@intel.com> Subject: [dpdk-dev] [PATCH v2] vhost: add interface name to virtio-net struct X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Commit Message
Loftus, Ciara
Dec. 18, 2014, 6:07 p.m. UTC
From: Ciara Loftus <ciara.loftus@intel.com> This patch fixes the issue whereby when using userspace vhost ports in the context of vSwitching, the name provided to the hypervisor/QEMU of the vhost tap device needs to be exposed in the library, in order for the vSwitch to be able to direct packets to the correct device. This patch introduces an 'ifname' member to the virtio-net structure which is populated with the tap device name when QEMU is brought up with a vhost device. Signed-off-by: Ciara Loftus <ciara.loftus@intel.com> Signed-off-by: Anthony Fee <anthonyx.fee@intel.com> Acked-by: Huawei Xie <huawei.xie@intel.com> --- lib/librte_vhost/rte_virtio_net.h | 3 ++ lib/librte_vhost/virtio-net.c | 48 ++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletions(-)
Comments
2014-12-18 18:07, ciara.loftus@intel.com: > This patch fixes the issue whereby when using userspace vhost ports > in the context of vSwitching, the name provided to the hypervisor/QEMU > of the vhost tap device needs to be exposed in the library, in order > for the vSwitch to be able to direct packets to the correct device. > This patch introduces an 'ifname' member to the virtio-net structure > which is populated with the tap device name when QEMU is brought up > with a vhost device. > > Signed-off-by: Ciara Loftus <ciara.loftus@intel.com> > Signed-off-by: Anthony Fee <anthonyx.fee@intel.com> > Acked-by: Huawei Xie <huawei.xie@intel.com> Seems important to make this new library working in a common scenario. Applied Thanks
Hi Ciara, > -----Original Message----- > From: Loftus, Ciara > Sent: Thursday, December 18, 2014 6:07 PM > To: dev@dpdk.org > Cc: thomas.monjalon@6wind.com; stephen@networkplumber.org; vincent.jardin@6wind.com; Ananyev, Konstantin; Czesnowicz, > Przemyslaw; Loftus, Ciara; Anthony Fee > Subject: [PATCH v2] vhost: add interface name to virtio-net struct > > From: Ciara Loftus <ciara.loftus@intel.com> > > This patch fixes the issue whereby when using userspace vhost ports > in the context of vSwitching, the name provided to the hypervisor/QEMU > of the vhost tap device needs to be exposed in the library, in order > for the vSwitch to be able to direct packets to the correct device. > This patch introduces an 'ifname' member to the virtio-net structure > which is populated with the tap device name when QEMU is brought up > with a vhost device. > > Signed-off-by: Ciara Loftus <ciara.loftus@intel.com> > Signed-off-by: Anthony Fee <anthonyx.fee@intel.com> > Acked-by: Huawei Xie <huawei.xie@intel.com> > --- > lib/librte_vhost/rte_virtio_net.h | 3 ++ > lib/librte_vhost/virtio-net.c | 48 ++++++++++++++++++++++++++++++++++++- > 2 files changed, 50 insertions(+), 1 deletions(-) > > diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h > index 00b1328..0bf07c7 100644 > --- a/lib/librte_vhost/rte_virtio_net.h > +++ b/lib/librte_vhost/rte_virtio_net.h > @@ -43,6 +43,8 @@ > #include <linux/virtio_ring.h> > #include <linux/virtio_net.h> > #include <sys/eventfd.h> > +#include <sys/socket.h> > +#include <linux/if.h> > > #include <rte_memory.h> > #include <rte_mempool.h> > @@ -96,6 +98,7 @@ struct virtio_net { > uint64_t features; /**< Negotiated feature set. */ > uint64_t device_fh; /**< device identifier. */ > uint32_t flags; /**< Device flags. Only used to check if device is running on data core. */ > + char ifname[IFNAMSIZ]; /**< Name of the tap device. */ > void *priv; /**< private context */ > } __rte_cache_aligned; > > diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c > index 852b6d1..7eae5ee 100644 > --- a/lib/librte_vhost/virtio-net.c > +++ b/lib/librte_vhost/virtio-net.c > @@ -43,6 +43,10 @@ > #include <sys/mman.h> > #include <unistd.h> > > +#include <sys/socket.h> > +#include <linux/if_tun.h> > +#include <linux/if.h> > + > #include <rte_ethdev.h> > #include <rte_log.h> > #include <rte_string_fns.h> > @@ -1000,6 +1004,46 @@ set_vring_kick(struct vhost_device_ctx ctx, struct vhost_vring_file *file) > } > > /* > + * Function to get the tap device name from the provided file descriptor and > + * save it in the device structure. > + */ > +static int > +get_ifname(struct virtio_net *dev, int tap_fd, int pid) > +{ > + struct eventfd_copy fd_tap; > + struct ifreq ifr; > + uint32_t size, ifr_size; > + int ret; > + > + fd_tap.source_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); > + fd_tap.target_fd = tap_fd; > + fd_tap.target_pid = pid; > + > + if (eventfd_copy(dev, &fd_tap)) > + return -1; > + > + ret = ioctl(fd_tap.source_fd, TUNGETIFF, &ifr); > + > + if (close(fd_tap.source_fd) < 0) > + RTE_LOG(ERR, VHOST_CONFIG, > + "(%"PRIu64") fd close failed\n", > + dev->device_fh); > + > + if (ret >= 0) { > + ifr_size = strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)); > + size = ifr_size > sizeof(dev->ifname)? > + sizeof(dev->ifname): ifr_size; If you saying that sizeof(ifr.ifr_name) would always be equal to sizeof(dev->ifname), then why are you doing the comparison above? "ifr_size <= sizeof(dev->ifname)" would always be true, right? From other side, if if strlen(ifr.ifr_name) < sizeof(dev->ifname), you wouldn't copy over terminating 0. I think it needs to be something like: size = strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)) + 1; size = RTE_MIN(size, sizeof(dev->ifname)); strncpy(dev->ifname, ifr.ifr_name, size); dev->ifname[sizeof(dev->ifname) - 1] = 0; > + > + strncpy(dev->ifname, ifr.ifr_name, size); > + } else > + RTE_LOG(ERR, VHOST_CONFIG, > + "(%"PRIu64") TUNGETIFF ioctl failed\n", > + dev->device_fh); > + > + return 0; Shouldn't we return a failure if ret is negative (ioclt failed)? Konstantin > +} > + > +/* > * Called from CUSE IOCTL: VHOST_NET_SET_BACKEND > * To complete device initialisation when the virtio driver is loaded, > * we are provided with a valid fd for a tap device (not used by us). > @@ -1026,8 +1070,10 @@ set_backend(struct vhost_device_ctx ctx, struct vhost_vring_file *file) > */ > if (!(dev->flags & VIRTIO_DEV_RUNNING)) { > if (((int)dev->virtqueue[VIRTIO_TXQ]->backend != VIRTIO_DEV_STOPPED) && > - ((int)dev->virtqueue[VIRTIO_RXQ]->backend != VIRTIO_DEV_STOPPED)) > + ((int)dev->virtqueue[VIRTIO_RXQ]->backend != VIRTIO_DEV_STOPPED)) { > + get_ifname(dev, file->fd, ctx.pid); > return notify_ops->new_device(dev); > + } > /* Otherwise we remove it. */ > } else > if (file->fd == VIRTIO_DEV_STOPPED) > -- > 1.7.4.1
Hi Konstantin, 2014-12-19 15:39, Ananyev, Konstantin: > Hi Ciara, > > > -----Original Message----- > > From: Loftus, Ciara > > Sent: Thursday, December 18, 2014 6:07 PM > > To: dev@dpdk.org > > Cc: thomas.monjalon@6wind.com; stephen@networkplumber.org; vincent.jardin@6wind.com; Ananyev, Konstantin; Czesnowicz, > > Przemyslaw; Loftus, Ciara; Anthony Fee > > Subject: [PATCH v2] vhost: add interface name to virtio-net struct > > > > From: Ciara Loftus <ciara.loftus@intel.com> > > > > This patch fixes the issue whereby when using userspace vhost ports > > in the context of vSwitching, the name provided to the hypervisor/QEMU > > of the vhost tap device needs to be exposed in the library, in order > > for the vSwitch to be able to direct packets to the correct device. > > This patch introduces an 'ifname' member to the virtio-net structure > > which is populated with the tap device name when QEMU is brought up > > with a vhost device. > > > > Signed-off-by: Ciara Loftus <ciara.loftus@intel.com> > > Signed-off-by: Anthony Fee <anthonyx.fee@intel.com> > > Acked-by: Huawei Xie <huawei.xie@intel.com> [...] > > /* > > + * Function to get the tap device name from the provided file descriptor and > > + * save it in the device structure. > > + */ > > +static int > > +get_ifname(struct virtio_net *dev, int tap_fd, int pid) > > +{ > > + struct eventfd_copy fd_tap; > > + struct ifreq ifr; > > + uint32_t size, ifr_size; > > + int ret; > > + > > + fd_tap.source_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); > > + fd_tap.target_fd = tap_fd; > > + fd_tap.target_pid = pid; > > + > > + if (eventfd_copy(dev, &fd_tap)) > > + return -1; > > + > > + ret = ioctl(fd_tap.source_fd, TUNGETIFF, &ifr); > > + > > + if (close(fd_tap.source_fd) < 0) > > + RTE_LOG(ERR, VHOST_CONFIG, > > + "(%"PRIu64") fd close failed\n", > > + dev->device_fh); > > + > > + if (ret >= 0) { > > + ifr_size = strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)); > > + size = ifr_size > sizeof(dev->ifname)? > > + sizeof(dev->ifname): ifr_size; > > If you saying that sizeof(ifr.ifr_name) would always be equal to sizeof(dev->ifname), > then why are you doing the comparison above? > "ifr_size <= sizeof(dev->ifname)" would always be true, right? > From other side, if if strlen(ifr.ifr_name) < sizeof(dev->ifname), you wouldn't copy over terminating 0. > I think it needs to be something like: > > size = strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)) + 1; > size = RTE_MIN(size, sizeof(dev->ifname)); > strncpy(dev->ifname, ifr.ifr_name, size); > dev->ifname[sizeof(dev->ifname) - 1] = 0; This patch has been applied as hot fix. If you think you can improve it, please submit a patch. We are releasing in few hours (probably tomorrow morning). > > + > > + strncpy(dev->ifname, ifr.ifr_name, size); > > + } else > > + RTE_LOG(ERR, VHOST_CONFIG, > > + "(%"PRIu64") TUNGETIFF ioctl failed\n", > > + dev->device_fh); > > + > > + return 0; > > Shouldn't we return a failure if ret is negative (ioclt failed)? > Konstantin
On 2014/12/19 2:07, ciara.loftus@intel.com wrote: > From: Ciara Loftus <ciara.loftus@intel.com> > > This patch fixes the issue whereby when using userspace vhost ports > in the context of vSwitching, the name provided to the hypervisor/QEMU > of the vhost tap device needs to be exposed in the library, in order Who create the tap device?When using vhost-user QEMU will not create it. > for the vSwitch to be able to direct packets to the correct device. Why not use unix domain socket path? > This patch introduces an 'ifname' member to the virtio-net structure > which is populated with the tap device name when QEMU is brought up > with a vhost device. > > Signed-off-by: Ciara Loftus <ciara.loftus@intel.com> > Signed-off-by: Anthony Fee <anthonyx.fee@intel.com> > Acked-by: Huawei Xie <huawei.xie@intel.com> > --- > lib/librte_vhost/rte_virtio_net.h | 3 ++ > lib/librte_vhost/virtio-net.c | 48 ++++++++++++++++++++++++++++++++++++- > 2 files changed, 50 insertions(+), 1 deletions(-) > > diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h > index 00b1328..0bf07c7 100644 > --- a/lib/librte_vhost/rte_virtio_net.h > +++ b/lib/librte_vhost/rte_virtio_net.h > @@ -43,6 +43,8 @@ > #include <linux/virtio_ring.h> > #include <linux/virtio_net.h> > #include <sys/eventfd.h> > +#include <sys/socket.h> > +#include <linux/if.h> > > #include <rte_memory.h> > #include <rte_mempool.h> > @@ -96,6 +98,7 @@ struct virtio_net { > uint64_t features; /**< Negotiated feature set. */ > uint64_t device_fh; /**< device identifier. */ > uint32_t flags; /**< Device flags. Only used to check if device is running on data core. */ > + char ifname[IFNAMSIZ]; /**< Name of the tap device. */ > void *priv; /**< private context */ > } __rte_cache_aligned; > > diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c > index 852b6d1..7eae5ee 100644 > --- a/lib/librte_vhost/virtio-net.c > +++ b/lib/librte_vhost/virtio-net.c > @@ -43,6 +43,10 @@ > #include <sys/mman.h> > #include <unistd.h> > > +#include <sys/socket.h> > +#include <linux/if_tun.h> > +#include <linux/if.h> > + > #include <rte_ethdev.h> > #include <rte_log.h> > #include <rte_string_fns.h> > @@ -1000,6 +1004,46 @@ set_vring_kick(struct vhost_device_ctx ctx, struct vhost_vring_file *file) > } > > /* > + * Function to get the tap device name from the provided file descriptor and > + * save it in the device structure. > + */ > +static int > +get_ifname(struct virtio_net *dev, int tap_fd, int pid) > +{ > + struct eventfd_copy fd_tap; > + struct ifreq ifr; > + uint32_t size, ifr_size; > + int ret; > + > + fd_tap.source_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); > + fd_tap.target_fd = tap_fd; > + fd_tap.target_pid = pid; > + > + if (eventfd_copy(dev, &fd_tap)) > + return -1; > + > + ret = ioctl(fd_tap.source_fd, TUNGETIFF, &ifr); > + > + if (close(fd_tap.source_fd) < 0) > + RTE_LOG(ERR, VHOST_CONFIG, > + "(%"PRIu64") fd close failed\n", > + dev->device_fh); > + > + if (ret >= 0) { > + ifr_size = strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)); > + size = ifr_size > sizeof(dev->ifname)? > + sizeof(dev->ifname): ifr_size; > + > + strncpy(dev->ifname, ifr.ifr_name, size); > + } else > + RTE_LOG(ERR, VHOST_CONFIG, > + "(%"PRIu64") TUNGETIFF ioctl failed\n", > + dev->device_fh); > + > + return 0; > +} > + > +/* > * Called from CUSE IOCTL: VHOST_NET_SET_BACKEND > * To complete device initialisation when the virtio driver is loaded, > * we are provided with a valid fd for a tap device (not used by us). > @@ -1026,8 +1070,10 @@ set_backend(struct vhost_device_ctx ctx, struct vhost_vring_file *file) > */ > if (!(dev->flags & VIRTIO_DEV_RUNNING)) { > if (((int)dev->virtqueue[VIRTIO_TXQ]->backend != VIRTIO_DEV_STOPPED) && > - ((int)dev->virtqueue[VIRTIO_RXQ]->backend != VIRTIO_DEV_STOPPED)) > + ((int)dev->virtqueue[VIRTIO_RXQ]->backend != VIRTIO_DEV_STOPPED)) { > + get_ifname(dev, file->fd, ctx.pid); > return notify_ops->new_device(dev); > + } > /* Otherwise we remove it. */ > } else > if (file->fd == VIRTIO_DEV_STOPPED) >
> -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Linhaifeng > Sent: Sunday, January 25, 2015 12:42 PM > To: Loftus, Ciara; dev@dpdk.org > Cc: Anthony Fee > Subject: Re: [dpdk-dev] [PATCH v2] vhost: add interface name to virtio-net struct > > > > On 2014/12/19 2:07, ciara.loftus@intel.com wrote: > > From: Ciara Loftus <ciara.loftus@intel.com> > > > > This patch fixes the issue whereby when using userspace vhost ports > > in the context of vSwitching, the name provided to the hypervisor/QEMU > > of the vhost tap device needs to be exposed in the library, in order > > Who create the tap device?When using vhost-user QEMU will not create it. > > > for the vSwitch to be able to direct packets to the correct device. > > Why not use unix domain socket path? In this patch, for vhost-cuse, the ifname comes from the name of the tap device. For vhost-user, ifname is the name of the socket path. > > > This patch introduces an 'ifname' member to the virtio-net structure > > which is populated with the tap device name when QEMU is brought up > > with a vhost device. > > > > Signed-off-by: Ciara Loftus <ciara.loftus@intel.com> > > Signed-off-by: Anthony Fee <anthonyx.fee@intel.com> > > Acked-by: Huawei Xie <huawei.xie@intel.com> > > --- > > lib/librte_vhost/rte_virtio_net.h | 3 ++ > > lib/librte_vhost/virtio-net.c | 48 > ++++++++++++++++++++++++++++++++++++- > > 2 files changed, 50 insertions(+), 1 deletions(-) > > > > diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h > > index 00b1328..0bf07c7 100644 > > --- a/lib/librte_vhost/rte_virtio_net.h > > +++ b/lib/librte_vhost/rte_virtio_net.h > > @@ -43,6 +43,8 @@ > > #include <linux/virtio_ring.h> > > #include <linux/virtio_net.h> > > #include <sys/eventfd.h> > > +#include <sys/socket.h> > > +#include <linux/if.h> > > > > #include <rte_memory.h> > > #include <rte_mempool.h> > > @@ -96,6 +98,7 @@ struct virtio_net { > > uint64_t features; /**< Negotiated feature set. > */ > > uint64_t device_fh; /**< device identifier. */ > > uint32_t flags; /**< Device flags. Only used to > check if device is running on data core. */ > > + char ifname[IFNAMSIZ]; /**< Name of the tap > device. */ > > void *priv; /**< private context */ > > } __rte_cache_aligned; > > > > diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c > > index 852b6d1..7eae5ee 100644 > > --- a/lib/librte_vhost/virtio-net.c > > +++ b/lib/librte_vhost/virtio-net.c > > @@ -43,6 +43,10 @@ > > #include <sys/mman.h> > > #include <unistd.h> > > > > +#include <sys/socket.h> > > +#include <linux/if_tun.h> > > +#include <linux/if.h> > > + > > #include <rte_ethdev.h> > > #include <rte_log.h> > > #include <rte_string_fns.h> > > @@ -1000,6 +1004,46 @@ set_vring_kick(struct vhost_device_ctx ctx, struct > vhost_vring_file *file) > > } > > > > /* > > + * Function to get the tap device name from the provided file descriptor and > > + * save it in the device structure. > > + */ > > +static int > > +get_ifname(struct virtio_net *dev, int tap_fd, int pid) > > +{ > > + struct eventfd_copy fd_tap; > > + struct ifreq ifr; > > + uint32_t size, ifr_size; > > + int ret; > > + > > + fd_tap.source_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); > > + fd_tap.target_fd = tap_fd; > > + fd_tap.target_pid = pid; > > + > > + if (eventfd_copy(dev, &fd_tap)) > > + return -1; > > + > > + ret = ioctl(fd_tap.source_fd, TUNGETIFF, &ifr); > > + > > + if (close(fd_tap.source_fd) < 0) > > + RTE_LOG(ERR, VHOST_CONFIG, > > + "(%"PRIu64") fd close failed\n", > > + dev->device_fh); > > + > > + if (ret >= 0) { > > + ifr_size = strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)); > > + size = ifr_size > sizeof(dev->ifname)? > > + sizeof(dev->ifname): ifr_size; > > + > > + strncpy(dev->ifname, ifr.ifr_name, size); > > + } else > > + RTE_LOG(ERR, VHOST_CONFIG, > > + "(%"PRIu64") TUNGETIFF ioctl failed\n", > > + dev->device_fh); > > + > > + return 0; > > +} > > + > > +/* > > * Called from CUSE IOCTL: VHOST_NET_SET_BACKEND > > * To complete device initialisation when the virtio driver is loaded, > > * we are provided with a valid fd for a tap device (not used by us). > > @@ -1026,8 +1070,10 @@ set_backend(struct vhost_device_ctx ctx, struct > vhost_vring_file *file) > > */ > > if (!(dev->flags & VIRTIO_DEV_RUNNING)) { > > if (((int)dev->virtqueue[VIRTIO_TXQ]->backend != > VIRTIO_DEV_STOPPED) && > > - ((int)dev->virtqueue[VIRTIO_RXQ]->backend != > VIRTIO_DEV_STOPPED)) > > + ((int)dev->virtqueue[VIRTIO_RXQ]->backend != > VIRTIO_DEV_STOPPED)) { > > + get_ifname(dev, file->fd, ctx.pid); > > return notify_ops->new_device(dev); > > + } > > /* Otherwise we remove it. */ > > } else > > if (file->fd == VIRTIO_DEV_STOPPED) > > > > -- > Regards, > Haifeng
diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h index 00b1328..0bf07c7 100644 --- a/lib/librte_vhost/rte_virtio_net.h +++ b/lib/librte_vhost/rte_virtio_net.h @@ -43,6 +43,8 @@ #include <linux/virtio_ring.h> #include <linux/virtio_net.h> #include <sys/eventfd.h> +#include <sys/socket.h> +#include <linux/if.h> #include <rte_memory.h> #include <rte_mempool.h> @@ -96,6 +98,7 @@ struct virtio_net { uint64_t features; /**< Negotiated feature set. */ uint64_t device_fh; /**< device identifier. */ uint32_t flags; /**< Device flags. Only used to check if device is running on data core. */ + char ifname[IFNAMSIZ]; /**< Name of the tap device. */ void *priv; /**< private context */ } __rte_cache_aligned; diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c index 852b6d1..7eae5ee 100644 --- a/lib/librte_vhost/virtio-net.c +++ b/lib/librte_vhost/virtio-net.c @@ -43,6 +43,10 @@ #include <sys/mman.h> #include <unistd.h> +#include <sys/socket.h> +#include <linux/if_tun.h> +#include <linux/if.h> + #include <rte_ethdev.h> #include <rte_log.h> #include <rte_string_fns.h> @@ -1000,6 +1004,46 @@ set_vring_kick(struct vhost_device_ctx ctx, struct vhost_vring_file *file) } /* + * Function to get the tap device name from the provided file descriptor and + * save it in the device structure. + */ +static int +get_ifname(struct virtio_net *dev, int tap_fd, int pid) +{ + struct eventfd_copy fd_tap; + struct ifreq ifr; + uint32_t size, ifr_size; + int ret; + + fd_tap.source_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); + fd_tap.target_fd = tap_fd; + fd_tap.target_pid = pid; + + if (eventfd_copy(dev, &fd_tap)) + return -1; + + ret = ioctl(fd_tap.source_fd, TUNGETIFF, &ifr); + + if (close(fd_tap.source_fd) < 0) + RTE_LOG(ERR, VHOST_CONFIG, + "(%"PRIu64") fd close failed\n", + dev->device_fh); + + if (ret >= 0) { + ifr_size = strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)); + size = ifr_size > sizeof(dev->ifname)? + sizeof(dev->ifname): ifr_size; + + strncpy(dev->ifname, ifr.ifr_name, size); + } else + RTE_LOG(ERR, VHOST_CONFIG, + "(%"PRIu64") TUNGETIFF ioctl failed\n", + dev->device_fh); + + return 0; +} + +/* * Called from CUSE IOCTL: VHOST_NET_SET_BACKEND * To complete device initialisation when the virtio driver is loaded, * we are provided with a valid fd for a tap device (not used by us). @@ -1026,8 +1070,10 @@ set_backend(struct vhost_device_ctx ctx, struct vhost_vring_file *file) */ if (!(dev->flags & VIRTIO_DEV_RUNNING)) { if (((int)dev->virtqueue[VIRTIO_TXQ]->backend != VIRTIO_DEV_STOPPED) && - ((int)dev->virtqueue[VIRTIO_RXQ]->backend != VIRTIO_DEV_STOPPED)) + ((int)dev->virtqueue[VIRTIO_RXQ]->backend != VIRTIO_DEV_STOPPED)) { + get_ifname(dev, file->fd, ctx.pid); return notify_ops->new_device(dev); + } /* Otherwise we remove it. */ } else if (file->fd == VIRTIO_DEV_STOPPED)