diff --git a/lib/bdev/virtio/Makefile b/lib/bdev/virtio/Makefile index 65aa0c470..a02ef303d 100644 --- a/lib/bdev/virtio/Makefile +++ b/lib/bdev/virtio/Makefile @@ -40,7 +40,7 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/linux C_SRCS = bdev_virtio.c bdev_virtio_rpc.c C_SRCS += rte_virtio/virtio_dev.c rte_virtio/virtio_pci.c C_SRCS += rte_virtio/virtio_user.c -C_SRCS += rte_virtio/virtio_user/vhost_user.c rte_virtio/virtio_user/virtio_user_dev.c +C_SRCS += rte_virtio/virtio_user/vhost_user.c LIBNAME = bdev_virtio diff --git a/lib/bdev/virtio/rte_virtio/virtio_user.c b/lib/bdev/virtio/rte_virtio/virtio_user.c index 3c218cdb7..3ecf37ec5 100644 --- a/lib/bdev/virtio/rte_virtio/virtio_user.c +++ b/lib/bdev/virtio/rte_virtio/virtio_user.c @@ -49,6 +49,211 @@ #define virtio_dev_get_user_dev(vdev) \ ((struct virtio_user_dev *)((vdev)->ctx)) +static int +virtio_user_create_queue(struct virtio_dev *vdev, uint32_t queue_sel) +{ + struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); + + /* Of all per virtqueue MSGs, make sure VHOST_SET_VRING_CALL come + * firstly because vhost depends on this msg to allocate virtqueue + * pair. + */ + struct vhost_vring_file file; + + file.index = queue_sel; + file.fd = dev->callfds[queue_sel]; + dev->ops->send_request(dev, VHOST_USER_SET_VRING_CALL, &file); + + return 0; +} + +static int +virtio_user_kick_queue(struct virtio_dev *vdev, uint32_t queue_sel) +{ + struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); + struct vhost_vring_file file; + struct vhost_vring_state state; + struct vring *vring = &dev->vrings[queue_sel]; + struct vhost_vring_addr addr = { + .index = queue_sel, + .desc_user_addr = (uint64_t)(uintptr_t)vring->desc, + .avail_user_addr = (uint64_t)(uintptr_t)vring->avail, + .used_user_addr = (uint64_t)(uintptr_t)vring->used, + .log_guest_addr = 0, + .flags = 0, /* disable log */ + }; + + state.index = queue_sel; + state.num = vring->num; + dev->ops->send_request(dev, VHOST_USER_SET_VRING_NUM, &state); + + state.index = queue_sel; + state.num = 0; /* no reservation */ + dev->ops->send_request(dev, VHOST_USER_SET_VRING_BASE, &state); + + dev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr); + + /* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes + * lastly because vhost depends on this msg to judge if + * virtio is ready. + */ + file.index = queue_sel; + file.fd = dev->kickfds[queue_sel]; + dev->ops->send_request(dev, VHOST_USER_SET_VRING_KICK, &file); + + return 0; +} + +static int +virtio_user_stop_queue(struct virtio_dev *vdev, uint32_t queue_sel) +{ + struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); + struct vhost_vring_state state; + + state.index = queue_sel; + state.num = 0; + dev->ops->send_request(dev, VHOST_USER_GET_VRING_BASE, &state); + + return 0; +} + +static int +virtio_user_queue_setup(struct virtio_dev *vdev, + int (*fn)(struct virtio_dev *, uint32_t)) +{ + uint32_t i; + + for (i = 0; i < vdev->max_queues; ++i) { + if (fn(vdev, i) < 0) { + SPDK_ERRLOG("setup tx vq fails: %"PRIu32".\n", i); + return -1; + } + } + + return 0; +} + +static int +virtio_user_start_device(struct virtio_dev *vdev) +{ + struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); + int ret; + + /* tell vhost to create queues */ + if (virtio_user_queue_setup(vdev, virtio_user_create_queue) < 0) + return -1; + + /* share memory regions */ + ret = dev->ops->send_request(dev, VHOST_USER_SET_MEM_TABLE, NULL); + if (ret < 0) + return -1; + + /* kick queues */ + if (virtio_user_queue_setup(vdev, virtio_user_kick_queue) < 0) + return -1; + + return 0; +} + +static int virtio_user_stop_device(struct virtio_dev *vdev) +{ + return virtio_user_queue_setup(vdev, virtio_user_stop_queue); +} + +static int +virtio_user_dev_setup(struct virtio_dev *vdev) +{ + struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); + uint16_t i; + + dev->vhostfd = -1; + + for (i = 0; i < VIRTIO_MAX_VIRTQUEUES; ++i) { + dev->callfds[i] = -1; + dev->kickfds[i] = -1; + } + + dev->ops = &ops_user; + + if (dev->ops->setup(dev) < 0) + return -1; + + return 0; +} + +struct virtio_dev * +virtio_user_dev_init(const char *name, const char *path, uint16_t requested_queues, + uint32_t queue_size, + uint16_t fixed_queue_num) +{ + struct virtio_dev *vdev; + struct virtio_user_dev *dev; + uint64_t max_queues; + char err_str[64]; + + if (name == NULL) { + SPDK_ERRLOG("No name gived for controller: %s\n", path); + return NULL; + } else if (requested_queues == 0) { + SPDK_ERRLOG("Can't create controller with no queues: %s\n", path); + return NULL; + } + + dev = calloc(1, sizeof(*dev)); + if (dev == NULL) { + return NULL; + } + + vdev = virtio_dev_construct(&virtio_user_ops, dev); + if (vdev == NULL) { + SPDK_ERRLOG("Failed to init device: %s\n", path); + free(dev); + return NULL; + } + + vdev->is_hw = 0; + vdev->name = strdup(name); + if (!vdev->name) { + SPDK_ERRLOG("Failed to reserve memory for controller name: %s\n", path); + goto err; + } + + snprintf(dev->path, PATH_MAX, "%s", path); + dev->queue_size = queue_size; + + if (virtio_user_dev_setup(vdev) < 0) { + SPDK_ERRLOG("backend set up fails\n"); + goto err; + } + + if (dev->ops->send_request(dev, VHOST_USER_GET_QUEUE_NUM, &max_queues) < 0) { + spdk_strerror_r(errno, err_str, sizeof(err_str)); + SPDK_ERRLOG("get_queue_num fails: %s\n", err_str); + goto err; + } + + if (requested_queues > max_queues) { + SPDK_ERRLOG("requested %"PRIu16" request queues but only %"PRIu64" available\n", + requested_queues, max_queues); + goto err; + } + + vdev->max_queues = fixed_queue_num + requested_queues; + + if (dev->ops->send_request(dev, VHOST_USER_SET_OWNER, NULL) < 0) { + spdk_strerror_r(errno, err_str, sizeof(err_str)); + SPDK_ERRLOG("set_owner fails: %s\n", err_str); + goto err; + } + + TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq); + return vdev; + +err: + virtio_dev_free(vdev); + return NULL; +} + static void virtio_user_read_dev_config(struct virtio_dev *vdev, size_t offset, void *dst, int length) diff --git a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c b/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c deleted file mode 100644 index cb9c9f150..000000000 --- a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c +++ /dev/null @@ -1,249 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2016 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 "spdk/stdinc.h" - -#include "vhost.h" -#include "virtio_user_dev.h" -#include "../virtio_dev.h" - -#include "spdk/string.h" -#include "spdk/util.h" - -#define virtio_dev_get_user_dev(dev) \ - ((struct virtio_user_dev *)((dev)->ctx)) - -static int -virtio_user_create_queue(struct virtio_dev *vdev, uint32_t queue_sel) -{ - struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); - - /* Of all per virtqueue MSGs, make sure VHOST_SET_VRING_CALL come - * firstly because vhost depends on this msg to allocate virtqueue - * pair. - */ - struct vhost_vring_file file; - - file.index = queue_sel; - file.fd = dev->callfds[queue_sel]; - dev->ops->send_request(dev, VHOST_USER_SET_VRING_CALL, &file); - - return 0; -} - -static int -virtio_user_kick_queue(struct virtio_dev *vdev, uint32_t queue_sel) -{ - struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); - struct vhost_vring_file file; - struct vhost_vring_state state; - struct vring *vring = &dev->vrings[queue_sel]; - struct vhost_vring_addr addr = { - .index = queue_sel, - .desc_user_addr = (uint64_t)(uintptr_t)vring->desc, - .avail_user_addr = (uint64_t)(uintptr_t)vring->avail, - .used_user_addr = (uint64_t)(uintptr_t)vring->used, - .log_guest_addr = 0, - .flags = 0, /* disable log */ - }; - - state.index = queue_sel; - state.num = vring->num; - dev->ops->send_request(dev, VHOST_USER_SET_VRING_NUM, &state); - - state.index = queue_sel; - state.num = 0; /* no reservation */ - dev->ops->send_request(dev, VHOST_USER_SET_VRING_BASE, &state); - - dev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr); - - /* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes - * lastly because vhost depends on this msg to judge if - * virtio is ready. - */ - file.index = queue_sel; - file.fd = dev->kickfds[queue_sel]; - dev->ops->send_request(dev, VHOST_USER_SET_VRING_KICK, &file); - - return 0; -} - -static int -virtio_user_stop_queue(struct virtio_dev *vdev, uint32_t queue_sel) -{ - struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); - struct vhost_vring_state state; - - state.index = queue_sel; - state.num = 0; - dev->ops->send_request(dev, VHOST_USER_GET_VRING_BASE, &state); - - return 0; -} - -static int -virtio_user_queue_setup(struct virtio_dev *vdev, - int (*fn)(struct virtio_dev *, uint32_t)) -{ - uint32_t i; - - for (i = 0; i < vdev->max_queues; ++i) { - if (fn(vdev, i) < 0) { - SPDK_ERRLOG("setup tx vq fails: %"PRIu32".\n", i); - return -1; - } - } - - return 0; -} - -int -virtio_user_start_device(struct virtio_dev *vdev) -{ - struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); - int ret; - - /* tell vhost to create queues */ - if (virtio_user_queue_setup(vdev, virtio_user_create_queue) < 0) - return -1; - - /* share memory regions */ - ret = dev->ops->send_request(dev, VHOST_USER_SET_MEM_TABLE, NULL); - if (ret < 0) - return -1; - - /* kick queues */ - if (virtio_user_queue_setup(vdev, virtio_user_kick_queue) < 0) - return -1; - - return 0; -} - -int virtio_user_stop_device(struct virtio_dev *vdev) -{ - return virtio_user_queue_setup(vdev, virtio_user_stop_queue); -} - -static int -virtio_user_dev_setup(struct virtio_dev *vdev) -{ - struct virtio_user_dev *dev = virtio_dev_get_user_dev(vdev); - uint16_t i; - - dev->vhostfd = -1; - - for (i = 0; i < VIRTIO_MAX_VIRTQUEUES; ++i) { - dev->callfds[i] = -1; - dev->kickfds[i] = -1; - } - - dev->ops = &ops_user; - - if (dev->ops->setup(dev) < 0) - return -1; - - return 0; -} - -struct virtio_dev * -virtio_user_dev_init(const char *name, const char *path, uint16_t requested_queues, - uint32_t queue_size, - uint16_t fixed_queue_num) -{ - struct virtio_dev *vdev; - struct virtio_user_dev *dev; - uint64_t max_queues; - char err_str[64]; - - if (name == NULL) { - SPDK_ERRLOG("No name gived for controller: %s\n", path); - return NULL; - } else if (requested_queues == 0) { - SPDK_ERRLOG("Can't create controller with no queues: %s\n", path); - return NULL; - } - - dev = calloc(1, sizeof(*dev)); - if (dev == NULL) { - return NULL; - } - - vdev = virtio_dev_construct(&virtio_user_ops, dev); - if (vdev == NULL) { - SPDK_ERRLOG("Failed to init device: %s\n", path); - free(dev); - return NULL; - } - - vdev->is_hw = 0; - vdev->name = strdup(name); - if (!vdev->name) { - SPDK_ERRLOG("Failed to reserve memory for controller name: %s\n", path); - goto err; - } - - snprintf(dev->path, PATH_MAX, "%s", path); - dev->queue_size = queue_size; - - if (virtio_user_dev_setup(vdev) < 0) { - SPDK_ERRLOG("backend set up fails\n"); - goto err; - } - - if (dev->ops->send_request(dev, VHOST_USER_GET_QUEUE_NUM, &max_queues) < 0) { - spdk_strerror_r(errno, err_str, sizeof(err_str)); - SPDK_ERRLOG("get_queue_num fails: %s\n", err_str); - goto err; - } - - if (requested_queues > max_queues) { - SPDK_ERRLOG("requested %"PRIu16" request queues but only %"PRIu64" available\n", - requested_queues, max_queues); - goto err; - } - - vdev->max_queues = fixed_queue_num + requested_queues; - - if (dev->ops->send_request(dev, VHOST_USER_SET_OWNER, NULL) < 0) { - spdk_strerror_r(errno, err_str, sizeof(err_str)); - SPDK_ERRLOG("set_owner fails: %s\n", err_str); - goto err; - } - - TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq); - return vdev; - -err: - virtio_dev_free(vdev); - return NULL; -} diff --git a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h b/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h index cb79edf22..e115164b7 100644 --- a/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h +++ b/lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.h @@ -57,9 +57,6 @@ struct virtio_user_dev { struct virtio_user_backend_ops *ops; }; -int virtio_user_start_device(struct virtio_dev *vdev); -int virtio_user_stop_device(struct virtio_dev *vdev); - /** * Connect to a vhost-user device and create corresponding virtio_dev. *