From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 99F9368BF for ; Thu, 18 Dec 2014 18:05:29 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 18 Dec 2014 09:00:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,601,1413270000"; d="scan'208";a="626085361" Received: from irsmsx154.ger.corp.intel.com ([163.33.192.96]) by orsmga001.jf.intel.com with ESMTP; 18 Dec 2014 09:03:06 -0800 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.144]) by IRSMSX154.ger.corp.intel.com ([169.254.12.15]) with mapi id 14.03.0195.001; Thu, 18 Dec 2014 17:03:05 +0000 From: "Ananyev, Konstantin" To: "Loftus, Ciara" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] vhost: add interface name to virtio-net struct Thread-Index: AQHQGtN3HYKkMhwo/060btA1l9WIDJyVkBcg Date: Thu, 18 Dec 2014 17:03:04 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258213C1FDC@IRSMSX105.ger.corp.intel.com> References: <1418914523-24530-1-git-send-email-ciara.loftus@intel.com> In-Reply-To: <1418914523-24530-1-git-send-email-ciara.loftus@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: Anthony Fee Subject: Re: [dpdk-dev] [PATCH] 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: Thu, 18 Dec 2014 17:05:30 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of ciara.loftus@intel.c= om > Sent: Thursday, December 18, 2014 2:55 PM > To: dev@dpdk.org > Cc: Anthony Fee > Subject: [dpdk-dev] [PATCH] vhost: add interface name to virtio-net struc= t >=20 > From: Ciara Loftus >=20 > 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. >=20 > Signed-off-by: Ciara Loftus > Signed-off-by: Anthony Fee > Acked-by: Huawei Xie > --- > lib/librte_vhost/rte_virtio_net.h | 1 + > lib/librte_vhost/virtio-net.c | 41 +++++++++++++++++++++++++++++++= +++++- > 2 files changed, 41 insertions(+), 1 deletions(-) >=20 > diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_vir= tio_net.h > index 00b1328..aebb4b5 100644 > --- a/lib/librte_vhost/rte_virtio_net.h > +++ b/lib/librte_vhost/rte_virtio_net.h > @@ -96,6 +96,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 ru= nning on data core. */ > + char ifname[32]; /** Name of the tap device **/ > void *priv; /**< private context */ > } __rte_cache_aligned; >=20 > diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.= c > index 852b6d1..7f90ecf 100644 > --- a/lib/librte_vhost/virtio-net.c > +++ b/lib/librte_vhost/virtio-net.c > @@ -43,6 +43,10 @@ > #include > #include >=20 > +#include > +#include > +#include > + > #include > #include > #include > @@ -1000,6 +1004,39 @@ set_vring_kick(struct vhost_device_ctx ctx, struct= vhost_vring_file *file) > } >=20 > /* > + * 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; > + > + fd_tap.source_fd =3D eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); > + fd_tap.target_fd =3D tap_fd; > + fd_tap.target_pid =3D pid; > + > + if (eventfd_copy(dev, &fd_tap)) > + return -1; > + > + ioctl(fd_tap.source_fd, TUNGETIFF, &ifr); Shouldn't we check that ioctl() returns with success here, and if it fails, don't copy stuff over? > + > + if (close(fd_tap.source_fd) < 0) > + RTE_LOG(ERR, VHOST_CONFIG, > + "(%"PRIu64") fd close failed\n", > + dev->device_fh); > + > + size =3D strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)) > sizeof(dev->ifna= me)? > + sizeof(dev->ifname): strnlen(ifr.ifr_name, sizeof(ifr.ifr_name)); > + So if sizeof(ifr.ifr_name) > sizeof(dev->ifname) then we can endup with dev= ->ifname not being null-termianted? Another nit: there is no need to call strnlen() twice. Konstantin > + strncpy(dev->ifname, ifr.ifr_name, size); > + > + 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 +1063,10 @@ set_backend(struct vhost_device_ctx ctx, struct vh= ost_vring_file *file) > */ > if (!(dev->flags & VIRTIO_DEV_RUNNING)) { > if (((int)dev->virtqueue[VIRTIO_TXQ]->backend !=3D VIRTIO_DEV_STOPPED)= && > - ((int)dev->virtqueue[VIRTIO_RXQ]->backend !=3D VIRTIO_DEV_STOPPED)) > + ((int)dev->virtqueue[VIRTIO_RXQ]->backend !=3D VIRTIO_DEV_STOPPED)) { > + get_ifname(dev, file->fd, ctx.pid); > return notify_ops->new_device(dev); > + } > /* Otherwise we remove it. */ > } else > if (file->fd =3D=3D VIRTIO_DEV_STOPPED) > -- > 1.7.4.1