d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: move fd copying into cuse subdirectory

Browse Source 
File descriptor is copied from qemu process into vhost process.
vhost-user doesn't need eventfd kernel module to copy fds between processes.

Signed-off-by: Huawei Xie <huawei.xie@intel.com>
Signed-off-by: Przemyslaw Czesnowicz <przemyslaw.czesnowicz@intel.com>
This commit is contained in:
Huawei Xie 2015-02-23 17:36:26 +00:00 committed by Thomas Monjalon
parent 34f4c46dc4
commit c2f60667bf
5 changed files with 170 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/librte_vhost/Makefile
View File

@ -41,7 +41,7 @@ LIBABIVER := 1
CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -I vhost_cuse -O3 -D_FILE_OFFSET_BITS=64 -lfuse
LDFLAGS += -lfuse
# all source are stored in SRCS-y
SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := vhost_cuse/vhost-net-cdev.c virtio-net.c vhost_rxtx.c
SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := vhost_cuse/vhost-net-cdev.c vhost_cuse/eventfd_copy.c virtio-net.c vhost_rxtx.c
# install includes
SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_virtio_net.h

88
lib/librte_vhost/vhost_cuse/eventfd_copy.c Normal file
View File

@ -0,0 +1,88 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <unistd.h>
#include <sys/eventfd.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <rte_log.h>
#include "eventfd_link/eventfd_link.h"
#include "eventfd_copy.h"
#include "vhost-net.h"
static const char eventfd_cdev[] = "/dev/eventfd-link";
/*
* This function uses the eventfd_link kernel module to copy an eventfd file
* descriptor provided by QEMU in to our process space.
*/
int
eventfd_copy(int target_fd, int target_pid)
{
int eventfd_link, ret;
struct eventfd_copy eventfd_copy;
int fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
if (fd == -1)
return -1;
/* Open the character device to the kernel module. */
/* TODO: check this earlier rather than fail until VM boots! */
eventfd_link = open(eventfd_cdev, O_RDWR);
if (eventfd_link < 0) {
RTE_LOG(ERR, VHOST_CONFIG,
"eventfd_link module is not loaded\n");
close(fd);
return -1;
}
eventfd_copy.source_fd = fd;
eventfd_copy.target_fd = target_fd;
eventfd_copy.target_pid = target_pid;
/* Call the IOCTL to copy the eventfd. */
ret = ioctl(eventfd_link, EVENTFD_COPY, &eventfd_copy);
close(eventfd_link);
if (ret < 0) {
RTE_LOG(ERR, VHOST_CONFIG,
"EVENTFD_COPY ioctl failed\n");
close(fd);
return -1;
}
return fd;
}

39
lib/librte_vhost/vhost_cuse/eventfd_copy.h Normal file
View File

@ -0,0 +1,39 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _EVENTFD_H
#define _EVENTFD_H
int
eventfd_copy(int target_fd, int target_pid);
#endif

41
lib/librte_vhost/vhost_cuse/vhost-net-cdev.c
View File

@ -45,6 +45,7 @@
#include <rte_virtio_net.h>
#include "vhost-net.h"
#include "eventfd_copy.h"
#define FUSE_OPT_DUMMY "\0\0"
#define FUSE_OPT_FORE "-f\0\0"
@ -284,17 +285,37 @@ vhost_net_ioctl(fuse_req_t req, int cmd, void *arg,
break;
case VHOST_SET_VRING_KICK:
LOG_DEBUG(VHOST_CONFIG,
"(%"PRIu64") IOCTL: VHOST_SET_VRING_KICK\n", ctx.fh);
VHOST_IOCTL_R(struct vhost_vring_file, file,
ops->set_vring_kick);
break;
case VHOST_SET_VRING_CALL:
LOG_DEBUG(VHOST_CONFIG,
"(%"PRIu64") IOCTL: VHOST_SET_VRING_CALL\n", ctx.fh);
VHOST_IOCTL_R(struct vhost_vring_file, file,
ops->set_vring_call);
if (cmd == VHOST_SET_VRING_KICK)
LOG_DEBUG(VHOST_CONFIG,
"(%"PRIu64") IOCTL: VHOST_SET_VRING_KICK\n",
ctx.fh);
else
LOG_DEBUG(VHOST_CONFIG,
"(%"PRIu64") IOCTL: VHOST_SET_VRING_CALL\n",
ctx.fh);
if (!in_buf)
VHOST_IOCTL_RETRY(sizeof(struct vhost_vring_file), 0);
else {
int fd;
file = *(const struct vhost_vring_file *)in_buf;
LOG_DEBUG(VHOST_CONFIG,
"idx:%d fd:%d\n", file.index, file.fd);
fd = eventfd_copy(file.fd, ctx.pid);
if (fd < 0) {
fuse_reply_ioctl(req, -1, NULL, 0);
result = -1;
break;
}
file.fd = fd;
if (cmd == VHOST_SET_VRING_KICK) {
result = ops->set_vring_kick(ctx, &file);
fuse_reply_ioctl(req, result, NULL, 0);
} else {
result = ops->set_vring_call(ctx, &file);
fuse_reply_ioctl(req, result, NULL, 0);
}
}
break;
default:

75
lib/librte_vhost/virtio-net.c
View File

@ -38,10 +38,10 @@
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <sys/eventfd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <linux/if_tun.h>
@ -53,8 +53,8 @@
#include <rte_memory.h>
#include <rte_virtio_net.h>
#include "vhost_cuse/eventfd_copy.h"
#include "vhost-net.h"
#include "eventfd_link/eventfd_link.h"
/*
* Device linked list structure for configuration.
@ -64,8 +64,6 @@ struct virtio_net_config_ll {
struct virtio_net_config_ll *next; /* Next dev on linked list.*/
};
const char eventfd_cdev[] = "/dev/eventfd-link";
/* device ops to add/remove device to/from data core. */
static struct virtio_net_device_ops const *notify_ops;
/* root address of the linked list of managed virtio devices */
@ -904,37 +902,6 @@ get_vring_base(struct vhost_device_ctx ctx, uint32_t index,
return 0;
}
/*
* This function uses the eventfd_link kernel module to copy an eventfd file
* descriptor provided by QEMU in to our process space.
*/
static int
eventfd_copy(struct virtio_net *dev, struct eventfd_copy *eventfd_copy)
{
int eventfd_link, ret;
/* Open the character device to the kernel module. */
eventfd_link = open(eventfd_cdev, O_RDWR);
if (eventfd_link < 0) {
RTE_LOG(ERR, VHOST_CONFIG,
"(%"PRIu64") eventfd_link module is not loaded\n",
dev->device_fh);
return -1;
}
/* Call the IOCTL to copy the eventfd. */
ret = ioctl(eventfd_link, EVENTFD_COPY, eventfd_copy);
close(eventfd_link);
if (ret < 0) {
RTE_LOG(ERR, VHOST_CONFIG,
"(%"PRIu64") EVENTFD_COPY ioctl failed\n",
dev->device_fh);
return -1;
}
return 0;
}
/*
* Called from CUSE IOCTL: VHOST_SET_VRING_CALL
@ -945,7 +912,6 @@ static int
set_vring_call(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
{
struct virtio_net *dev;
struct eventfd_copy eventfd_kick;
struct vhost_virtqueue *vq;
dev = get_device(ctx);
@ -958,14 +924,7 @@ set_vring_call(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
if (vq->kickfd)
close((int)vq->kickfd);
/* Populate the eventfd_copy structure and call eventfd_copy. */
vq->kickfd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
eventfd_kick.source_fd = vq->kickfd;
eventfd_kick.target_fd = file->fd;
eventfd_kick.target_pid = ctx.pid;
if (eventfd_copy(dev, &eventfd_kick))
return -1;
vq->kickfd = file->fd;
return 0;
}
@ -979,7 +938,6 @@ static int
set_vring_kick(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
{
struct virtio_net *dev;
struct eventfd_copy eventfd_call;
struct vhost_virtqueue *vq;
dev = get_device(ctx);
@ -991,15 +949,7 @@ set_vring_kick(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
if (vq->callfd)
close((int)vq->callfd);
/* Populate the eventfd_copy structure and call eventfd_copy. */
vq->callfd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
eventfd_call.source_fd = vq->callfd;
eventfd_call.target_fd = file->fd;
eventfd_call.target_pid = ctx.pid;
if (eventfd_copy(dev, &eventfd_call))
return -1;
vq->callfd = file->fd;
return 0;
}
@ -1011,21 +961,18 @@ set_vring_kick(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
static int
get_ifname(struct virtio_net *dev, int tap_fd, int pid)
{
struct eventfd_copy fd_tap;
int 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;
fd_tap = eventfd_copy(tap_fd, pid);
if (fd_tap < 0)
return -1;
if (eventfd_copy(dev, &fd_tap))
return -1;
ret = ioctl(fd_tap, TUNGETIFF, &ifr);
ret = ioctl(fd_tap.source_fd, TUNGETIFF, &ifr);
if (close(fd_tap.source_fd) < 0)
if (close(fd_tap) < 0)
RTE_LOG(ERR, VHOST_CONFIG,
"(%"PRIu64") fd close failed\n",
dev->device_fh);