From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [119.145.14.65]) by dpdk.org (Postfix) with ESMTP id DC648CF9 for ; Sun, 25 Jan 2015 05:42:15 +0100 (CET) Received: from 172.24.2.119 (EHLO szxeml425-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CGG90222; Sun, 25 Jan 2015 12:42:10 +0800 (CST) Received: from [127.0.0.1] (10.177.19.115) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.158.1; Sun, 25 Jan 2015 12:42:05 +0800 Message-ID: <54C47415.9020407@huawei.com> Date: Sun, 25 Jan 2015 12:41:57 +0800 From: Linhaifeng User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Thunderbird/31.1.0 MIME-Version: 1.0 To: , References: <1418926027-19794-1-git-send-email-ciara.loftus@intel.com> In-Reply-To: <1418926027-19794-1-git-send-email-ciara.loftus@intel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.19.115] X-CFilter-Loop: Reflected Cc: Anthony Fee Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jan 2015 04:42:19 -0000 On 2014/12/19 2:07, ciara.loftus@intel.com wrote: > From: Ciara Loftus > > 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 > Signed-off-by: Anthony Fee > Acked-by: Huawei Xie > --- > 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 > #include > #include > +#include > +#include > > #include > #include > @@ -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 > #include > > +#include > +#include > +#include > + > #include > #include > #include > @@ -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