#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/syscall.h>
-#include <assert.h>
#ifdef RTE_LIBRTE_VHOST_NUMA
#include <numaif.h>
#endif
#define INFLIGHT_ALIGNMENT 64
#define INFLIGHT_VERSION 0x1
-static const char *vhost_message_str[VHOST_USER_MAX] = {
- [VHOST_USER_NONE] = "VHOST_USER_NONE",
- [VHOST_USER_GET_FEATURES] = "VHOST_USER_GET_FEATURES",
- [VHOST_USER_SET_FEATURES] = "VHOST_USER_SET_FEATURES",
- [VHOST_USER_SET_OWNER] = "VHOST_USER_SET_OWNER",
- [VHOST_USER_RESET_OWNER] = "VHOST_USER_RESET_OWNER",
- [VHOST_USER_SET_MEM_TABLE] = "VHOST_USER_SET_MEM_TABLE",
- [VHOST_USER_SET_LOG_BASE] = "VHOST_USER_SET_LOG_BASE",
- [VHOST_USER_SET_LOG_FD] = "VHOST_USER_SET_LOG_FD",
- [VHOST_USER_SET_VRING_NUM] = "VHOST_USER_SET_VRING_NUM",
- [VHOST_USER_SET_VRING_ADDR] = "VHOST_USER_SET_VRING_ADDR",
- [VHOST_USER_SET_VRING_BASE] = "VHOST_USER_SET_VRING_BASE",
- [VHOST_USER_GET_VRING_BASE] = "VHOST_USER_GET_VRING_BASE",
- [VHOST_USER_SET_VRING_KICK] = "VHOST_USER_SET_VRING_KICK",
- [VHOST_USER_SET_VRING_CALL] = "VHOST_USER_SET_VRING_CALL",
- [VHOST_USER_SET_VRING_ERR] = "VHOST_USER_SET_VRING_ERR",
- [VHOST_USER_GET_PROTOCOL_FEATURES] = "VHOST_USER_GET_PROTOCOL_FEATURES",
- [VHOST_USER_SET_PROTOCOL_FEATURES] = "VHOST_USER_SET_PROTOCOL_FEATURES",
- [VHOST_USER_GET_QUEUE_NUM] = "VHOST_USER_GET_QUEUE_NUM",
- [VHOST_USER_SET_VRING_ENABLE] = "VHOST_USER_SET_VRING_ENABLE",
- [VHOST_USER_SEND_RARP] = "VHOST_USER_SEND_RARP",
- [VHOST_USER_NET_SET_MTU] = "VHOST_USER_NET_SET_MTU",
- [VHOST_USER_SET_SLAVE_REQ_FD] = "VHOST_USER_SET_SLAVE_REQ_FD",
- [VHOST_USER_IOTLB_MSG] = "VHOST_USER_IOTLB_MSG",
- [VHOST_USER_CRYPTO_CREATE_SESS] = "VHOST_USER_CRYPTO_CREATE_SESS",
- [VHOST_USER_CRYPTO_CLOSE_SESS] = "VHOST_USER_CRYPTO_CLOSE_SESS",
- [VHOST_USER_POSTCOPY_ADVISE] = "VHOST_USER_POSTCOPY_ADVISE",
- [VHOST_USER_POSTCOPY_LISTEN] = "VHOST_USER_POSTCOPY_LISTEN",
- [VHOST_USER_POSTCOPY_END] = "VHOST_USER_POSTCOPY_END",
- [VHOST_USER_GET_INFLIGHT_FD] = "VHOST_USER_GET_INFLIGHT_FD",
- [VHOST_USER_SET_INFLIGHT_FD] = "VHOST_USER_SET_INFLIGHT_FD",
- [VHOST_USER_SET_STATUS] = "VHOST_USER_SET_STATUS",
- [VHOST_USER_GET_STATUS] = "VHOST_USER_GET_STATUS",
-};
+typedef struct vhost_message_handler {
+ const char *description;
+ int (*callback)(struct virtio_net **pdev, struct vhu_msg_context *ctx,
+ int main_fd);
+ bool accepts_fd;
+} vhost_message_handler_t;
+static vhost_message_handler_t vhost_message_handlers[];
-static int send_vhost_reply(struct virtio_net *dev, int sockfd, struct VhostUserMsg *msg);
-static int read_vhost_message(struct virtio_net *dev, int sockfd, struct VhostUserMsg *msg);
+static int send_vhost_reply(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx);
+static int read_vhost_message(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx);
static void
-close_msg_fds(struct VhostUserMsg *msg)
+close_msg_fds(struct vhu_msg_context *ctx)
{
int i;
- for (i = 0; i < msg->fd_num; i++) {
- int fd = msg->fds[i];
+ for (i = 0; i < ctx->fd_num; i++) {
+ int fd = ctx->fds[i];
if (fd == -1)
continue;
- msg->fds[i] = -1;
+ ctx->fds[i] = -1;
close(fd);
}
}
* close all FDs and return an error if this is not the case.
*/
static int
-validate_msg_fds(struct virtio_net *dev, struct VhostUserMsg *msg, int expected_fds)
+validate_msg_fds(struct virtio_net *dev, struct vhu_msg_context *ctx, int expected_fds)
{
- if (msg->fd_num == expected_fds)
+ if (ctx->fd_num == expected_fds)
return 0;
VHOST_LOG_CONFIG(ERR, "(%s) expect %d FDs for request %s, received %d\n",
dev->ifname, expected_fds,
- vhost_message_str[msg->request.master],
- msg->fd_num);
+ vhost_message_handlers[ctx->msg.request.master].description,
+ ctx->fd_num);
- close_msg_fds(msg);
+ close_msg_fds(ctx);
return -1;
}
return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize;
}
-static int
-async_dma_map(struct virtio_net *dev, struct rte_vhost_mem_region *region, bool do_map)
+static void
+async_dma_map(struct virtio_net *dev, bool do_map)
{
- uint64_t host_iova;
int ret = 0;
+ uint32_t i;
+ struct guest_page *page;
- host_iova = rte_mem_virt2iova((void *)(uintptr_t)region->host_user_addr);
if (do_map) {
- /* Add mapped region into the default container of DPDK. */
- ret = rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
- region->host_user_addr,
- host_iova,
- region->size);
- if (ret) {
- /*
- * DMA device may bind with kernel driver, in this case,
- * we don't need to program IOMMU manually. However, if no
- * device is bound with vfio/uio in DPDK, and vfio kernel
- * module is loaded, the API will still be called and return
- * with ENODEV/ENOSUP.
- *
- * DPDK vfio only returns ENODEV/ENOSUP in very similar
- * situations(vfio either unsupported, or supported
- * but no devices found). Either way, no mappings could be
- * performed. We treat it as normal case in async path.
- */
- if (rte_errno == ENODEV || rte_errno == ENOTSUP)
- return 0;
-
- VHOST_LOG_CONFIG(ERR, "(%s) DMA engine map failed\n", dev->ifname);
- /* DMA mapping errors won't stop VHST_USER_SET_MEM_TABLE. */
- return 0;
+ for (i = 0; i < dev->nr_guest_pages; i++) {
+ page = &dev->guest_pages[i];
+ ret = rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,
+ page->host_user_addr,
+ page->host_iova,
+ page->size);
+ if (ret) {
+ /*
+ * DMA device may bind with kernel driver, in this case,
+ * we don't need to program IOMMU manually. However, if no
+ * device is bound with vfio/uio in DPDK, and vfio kernel
+ * module is loaded, the API will still be called and return
+ * with ENODEV.
+ *
+ * DPDK vfio only returns ENODEV in very similar situations
+ * (vfio either unsupported, or supported but no devices found).
+ * Either way, no mappings could be performed. We treat it as
+ * normal case in async path. This is a workaround.
+ */
+ if (rte_errno == ENODEV)
+ return;
+
+ /* DMA mapping errors won't stop VHOST_USER_SET_MEM_TABLE. */
+ VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n");
+ }
}
} else {
- /* Remove mapped region from the default container of DPDK. */
- ret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
- region->host_user_addr,
- host_iova,
- region->size);
- if (ret) {
- /* like DMA map, ignore the kernel driver case when unmap. */
- if (rte_errno == EINVAL)
- return 0;
-
- VHOST_LOG_CONFIG(ERR, "(%s) DMA engine unmap failed\n", dev->ifname);
- return ret;
+ for (i = 0; i < dev->nr_guest_pages; i++) {
+ page = &dev->guest_pages[i];
+ ret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,
+ page->host_user_addr,
+ page->host_iova,
+ page->size);
+ if (ret) {
+ /* like DMA map, ignore the kernel driver case when unmap. */
+ if (rte_errno == EINVAL)
+ return;
+
+ VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n");
+ }
}
}
-
- return ret;
}
static void
if (!dev || !dev->mem)
return;
+ if (dev->async_copy && rte_vfio_is_enabled("vfio"))
+ async_dma_map(dev, false);
+
for (i = 0; i < dev->mem->nregions; i++) {
reg = &dev->mem->regions[i];
if (reg->host_user_addr) {
- if (dev->async_copy && rte_vfio_is_enabled("vfio"))
- async_dma_map(dev, reg, false);
-
munmap(reg->mmap_addr, reg->mmap_size);
close(reg->fd);
}
void
vhost_backend_cleanup(struct virtio_net *dev)
{
+ struct rte_vdpa_device *vdpa_dev;
+
+ vdpa_dev = dev->vdpa_dev;
+ if (vdpa_dev && vdpa_dev->ops->dev_cleanup != NULL)
+ vdpa_dev->ops->dev_cleanup(dev->vid);
+
if (dev->mem) {
free_mem_region(dev);
rte_free(dev->mem);
* the device hasn't been initialised.
*/
static int
-vhost_user_set_owner(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+vhost_user_set_owner(struct virtio_net **pdev __rte_unused,
+ struct vhu_msg_context *ctx __rte_unused,
int main_fd __rte_unused)
{
- struct virtio_net *dev = *pdev;
-
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
return RTE_VHOST_MSG_RESULT_OK;
}
static int
vhost_user_reset_owner(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx __rte_unused,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
vhost_destroy_device_notify(dev);
cleanup_device(dev, 0);
* The features that we support are requested.
*/
static int
-vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_get_features(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint64_t features = 0;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
rte_vhost_driver_get_features(dev->ifname, &features);
- msg->payload.u64 = features;
- msg->size = sizeof(msg->payload.u64);
- msg->fd_num = 0;
+ ctx->msg.payload.u64 = features;
+ ctx->msg.size = sizeof(ctx->msg.payload.u64);
+ ctx->fd_num = 0;
return RTE_VHOST_MSG_RESULT_REPLY;
}
* The queue number that we support are requested.
*/
static int
-vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_get_queue_num(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint32_t queue_num = 0;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
rte_vhost_driver_get_queue_num(dev->ifname, &queue_num);
- msg->payload.u64 = (uint64_t)queue_num;
- msg->size = sizeof(msg->payload.u64);
- msg->fd_num = 0;
+ ctx->msg.payload.u64 = (uint64_t)queue_num;
+ ctx->msg.size = sizeof(ctx->msg.payload.u64);
+ ctx->fd_num = 0;
return RTE_VHOST_MSG_RESULT_REPLY;
}
* We receive the negotiated features supported by us and the virtio device.
*/
static int
-vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_features(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- uint64_t features = msg->payload.u64;
+ uint64_t features = ctx->msg.payload.u64;
uint64_t vhost_features = 0;
struct rte_vdpa_device *vdpa_dev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
rte_vhost_driver_get_features(dev->ifname, &vhost_features);
if (features & ~vhost_features) {
VHOST_LOG_CONFIG(ERR, "(%s) received invalid negotiated features.\n",
*/
static int
vhost_user_set_vring_num(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
+ struct vhost_virtqueue *vq = dev->virtqueue[ctx->msg.payload.state.index];
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
- if (msg->payload.state.num > 32768) {
+ if (ctx->msg.payload.state.num > 32768) {
VHOST_LOG_CONFIG(ERR, "(%s) invalid virtqueue size %u\n",
- dev->ifname, msg->payload.state.num);
+ dev->ifname, ctx->msg.payload.state.num);
return RTE_VHOST_MSG_RESULT_ERR;
}
- vq->size = msg->payload.state.num;
+ vq->size = ctx->msg.payload.state.num;
/* VIRTIO 1.0, 2.4 Virtqueues says:
*
}
if (vq_is_packed(dev)) {
- if (vq->shadow_used_packed)
- rte_free(vq->shadow_used_packed);
+ rte_free(vq->shadow_used_packed);
vq->shadow_used_packed = rte_malloc_socket(NULL,
vq->size *
sizeof(struct vring_used_elem_packed),
}
} else {
- if (vq->shadow_used_split)
- rte_free(vq->shadow_used_split);
+ rte_free(vq->shadow_used_split);
vq->shadow_used_split = rte_malloc_socket(NULL,
vq->size * sizeof(struct vring_used_elem),
}
}
- if (vq->batch_copy_elems)
- rte_free(vq->batch_copy_elems);
+ rte_free(vq->batch_copy_elems);
vq->batch_copy_elems = rte_malloc_socket(NULL,
vq->size * sizeof(struct batch_copy_elem),
RTE_CACHE_LINE_SIZE, vq->numa_node);
dev = rte_realloc_socket(old_dev, sizeof(*dev), 0, node);
if (!dev) {
VHOST_LOG_CONFIG(ERR, "(%s) failed to realloc dev on node %d\n",
- dev->ifname, node);
+ old_dev->ifname, node);
return old_dev;
}
* This function then converts these to our address space.
*/
static int
-vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_vring_addr(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_virtqueue *vq;
- struct vhost_vring_addr *addr = &msg->payload.addr;
+ struct vhost_vring_addr *addr = &ctx->msg.payload.addr;
bool access_ok;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
if (dev->mem == NULL)
return RTE_VHOST_MSG_RESULT_ERR;
/* addr->index refers to the queue index. The txq 1, rxq is 0. */
- vq = dev->virtqueue[msg->payload.addr.index];
+ vq = dev->virtqueue[ctx->msg.payload.addr.index];
access_ok = vq->access_ok;
if ((vq->enabled && (dev->features &
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES))) ||
access_ok) {
- dev = translate_ring_addresses(dev, msg->payload.addr.index);
+ dev = translate_ring_addresses(dev, ctx->msg.payload.addr.index);
if (!dev)
return RTE_VHOST_MSG_RESULT_ERR;
*/
static int
vhost_user_set_vring_base(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
- uint64_t val = msg->payload.state.num;
-
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
+ struct vhost_virtqueue *vq = dev->virtqueue[ctx->msg.payload.state.index];
+ uint64_t val = ctx->msg.payload.state.num;
if (vq_is_packed(dev)) {
/*
vq->last_used_idx = vq->last_avail_idx;
vq->used_wrap_counter = vq->avail_wrap_counter;
} else {
- vq->last_used_idx = msg->payload.state.num;
- vq->last_avail_idx = msg->payload.state.num;
+ vq->last_used_idx = ctx->msg.payload.state.num;
+ vq->last_avail_idx = ctx->msg.payload.state.num;
}
VHOST_LOG_CONFIG(INFO,
"(%s) vring base idx:%u last_used_idx:%u last_avail_idx:%u.\n",
- dev->ifname, msg->payload.state.index, vq->last_used_idx,
+ dev->ifname, ctx->msg.payload.state.index, vq->last_used_idx,
vq->last_avail_idx);
return RTE_VHOST_MSG_RESULT_OK;
static int
add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
- uint64_t host_phys_addr, uint64_t size)
+ uint64_t host_iova, uint64_t host_user_addr, uint64_t size)
{
struct guest_page *page, *last_page;
struct guest_page *old_pages;
dev->max_guest_pages * sizeof(*page),
RTE_CACHE_LINE_SIZE);
if (dev->guest_pages == NULL) {
- VHOST_LOG_CONFIG(ERR, "(%s) cannot realloc guest_pages\n", dev->ifname);
+ VHOST_LOG_CONFIG(ERR, "cannot realloc guest_pages\n");
rte_free(old_pages);
return -1;
}
if (dev->nr_guest_pages > 0) {
last_page = &dev->guest_pages[dev->nr_guest_pages - 1];
/* merge if the two pages are continuous */
- if (host_phys_addr == last_page->host_phys_addr +
- last_page->size) {
+ if (host_iova == last_page->host_iova + last_page->size &&
+ guest_phys_addr == last_page->guest_phys_addr + last_page->size &&
+ host_user_addr == last_page->host_user_addr + last_page->size) {
last_page->size += size;
return 0;
}
page = &dev->guest_pages[dev->nr_guest_pages++];
page->guest_phys_addr = guest_phys_addr;
- page->host_phys_addr = host_phys_addr;
+ page->host_iova = host_iova;
+ page->host_user_addr = host_user_addr;
page->size = size;
return 0;
uint64_t reg_size = reg->size;
uint64_t host_user_addr = reg->host_user_addr;
uint64_t guest_phys_addr = reg->guest_phys_addr;
- uint64_t host_phys_addr;
+ uint64_t host_iova;
uint64_t size;
- host_phys_addr = rte_mem_virt2iova((void *)(uintptr_t)host_user_addr);
+ host_iova = rte_mem_virt2iova((void *)(uintptr_t)host_user_addr);
size = page_size - (guest_phys_addr & (page_size - 1));
size = RTE_MIN(size, reg_size);
- if (add_one_guest_page(dev, guest_phys_addr, host_phys_addr, size) < 0)
+ if (add_one_guest_page(dev, guest_phys_addr, host_iova,
+ host_user_addr, size) < 0)
return -1;
host_user_addr += size;
while (reg_size > 0) {
size = RTE_MIN(reg_size, page_size);
- host_phys_addr = rte_mem_virt2iova((void *)(uintptr_t)
+ host_iova = rte_mem_virt2iova((void *)(uintptr_t)
host_user_addr);
- if (add_one_guest_page(dev, guest_phys_addr, host_phys_addr,
- size) < 0)
+ if (add_one_guest_page(dev, guest_phys_addr, host_iova,
+ host_user_addr, size) < 0)
return -1;
host_user_addr += size;
dev->ifname, i);
VHOST_LOG_CONFIG(INFO, "(%s)\tguest_phys_addr: %" PRIx64 "\n",
dev->ifname, page->guest_phys_addr);
- VHOST_LOG_CONFIG(INFO, "(%s)\thost_phys_addr : %" PRIx64 "\n",
- dev->ifname, page->host_phys_addr);
+ VHOST_LOG_CONFIG(INFO, "(%s)\thost_iova : %" PRIx64 "\n",
+ dev->ifname, page->host_iova);
VHOST_LOG_CONFIG(INFO, "(%s)\tsize : %" PRIx64 "\n",
dev->ifname, page->size);
}
static int
vhost_user_postcopy_register(struct virtio_net *dev, int main_fd,
- struct VhostUserMsg *msg)
+ struct vhu_msg_context *ctx)
{
struct VhostUserMemory *memory;
struct rte_vhost_mem_region *reg;
- VhostUserMsg ack_msg;
+ struct vhu_msg_context ack_ctx;
uint32_t i;
if (!dev->postcopy_listening)
* DPDK's virtual address with Qemu, so that Qemu can
* retrieve the region offset when handling userfaults.
*/
- memory = &msg->payload.memory;
+ memory = &ctx->msg.payload.memory;
for (i = 0; i < memory->nregions; i++) {
reg = &dev->mem->regions[i];
memory->regions[i].userspace_addr = reg->host_user_addr;
}
/* Send the addresses back to qemu */
- msg->fd_num = 0;
- send_vhost_reply(dev, main_fd, msg);
+ ctx->fd_num = 0;
+ send_vhost_reply(dev, main_fd, ctx);
/* Wait for qemu to acknowledge it got the addresses
* we've got to wait before we're allowed to generate faults.
*/
- if (read_vhost_message(dev, main_fd, &ack_msg) <= 0) {
+ if (read_vhost_message(dev, main_fd, &ack_ctx) <= 0) {
VHOST_LOG_CONFIG(ERR, "(%s) failed to read qemu ack on postcopy set-mem-table\n",
dev->ifname);
return -1;
}
- if (validate_msg_fds(dev, &ack_msg, 0) != 0)
+ if (validate_msg_fds(dev, &ack_ctx, 0) != 0)
return -1;
- if (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE) {
+ if (ack_ctx.msg.request.master != VHOST_USER_SET_MEM_TABLE) {
VHOST_LOG_CONFIG(ERR, "(%s) bad qemu ack on postcopy set-mem-table (%d)\n",
- dev->ifname, ack_msg.request.master);
+ dev->ifname, ack_ctx.msg.request.master);
return -1;
}
uint64_t mmap_size;
uint64_t alignment;
int populate;
- int ret;
/* Check for memory_size + mmap_offset overflow */
if (mmap_offset >= -region->size) {
dev->ifname);
return -1;
}
-
- if (rte_vfio_is_enabled("vfio")) {
- ret = async_dma_map(dev, region, true);
- if (ret) {
- VHOST_LOG_CONFIG(ERR,
- "(%s) configure IOMMU for DMA engine failed\n",
- dev->ifname);
- return -1;
- }
- }
}
VHOST_LOG_CONFIG(INFO, "(%s) guest memory region size: 0x%" PRIx64 "\n",
}
static int
-vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_mem_table(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd)
{
struct virtio_net *dev = *pdev;
- struct VhostUserMemory *memory = &msg->payload.memory;
+ struct VhostUserMemory *memory = &ctx->msg.payload.memory;
struct rte_vhost_mem_region *reg;
int numa_node = SOCKET_ID_ANY;
uint64_t mmap_offset;
uint32_t i;
bool async_notify = false;
- if (validate_msg_fds(dev, msg, memory->nregions) != 0)
+ if (validate_msg_fds(dev, ctx, memory->nregions) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
if (memory->nregions > VHOST_MEMORY_MAX_NREGIONS) {
if (dev->mem && !vhost_memory_changed(memory, dev->mem)) {
VHOST_LOG_CONFIG(INFO, "(%s) memory regions not changed\n", dev->ifname);
- close_msg_fds(msg);
+ close_msg_fds(ctx);
return RTE_VHOST_MSG_RESULT_OK;
}
reg->guest_phys_addr = memory->regions[i].guest_phys_addr;
reg->guest_user_addr = memory->regions[i].userspace_addr;
reg->size = memory->regions[i].memory_size;
- reg->fd = msg->fds[i];
+ reg->fd = ctx->fds[i];
/*
* Assign invalid file descriptor value to avoid double
* closing on error path.
*/
- msg->fds[i] = -1;
+ ctx->fds[i] = -1;
mmap_offset = memory->regions[i].mmap_offset;
dev->mem->nregions++;
}
- if (vhost_user_postcopy_register(dev, main_fd, msg) < 0)
+ if (dev->async_copy && rte_vfio_is_enabled("vfio"))
+ async_dma_map(dev, true);
+
+ if (vhost_user_postcopy_register(dev, main_fd, ctx) < 0)
goto free_mem_table;
for (i = 0; i < dev->nr_vring; i++) {
rte_free(dev->guest_pages);
dev->guest_pages = NULL;
close_msg_fds:
- close_msg_fds(msg);
+ close_msg_fds(ctx);
return RTE_VHOST_MSG_RESULT_ERR;
}
static int
vhost_user_get_inflight_fd(struct virtio_net **pdev,
- VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct rte_vhost_inflight_info_packed *inflight_packed;
int numa_node = SOCKET_ID_ANY;
void *addr;
- if (msg->size != sizeof(msg->payload.inflight)) {
+ if (ctx->msg.size != sizeof(ctx->msg.payload.inflight)) {
VHOST_LOG_CONFIG(ERR, "(%s) invalid get_inflight_fd message size is %d\n",
- dev->ifname, msg->size);
+ dev->ifname, ctx->msg.size);
return RTE_VHOST_MSG_RESULT_ERR;
}
dev->inflight_info->fd = -1;
}
- num_queues = msg->payload.inflight.num_queues;
- queue_size = msg->payload.inflight.queue_size;
+ num_queues = ctx->msg.payload.inflight.num_queues;
+ queue_size = ctx->msg.payload.inflight.queue_size;
VHOST_LOG_CONFIG(INFO, "(%s) get_inflight_fd num_queues: %u\n",
- dev->ifname, msg->payload.inflight.num_queues);
+ dev->ifname, ctx->msg.payload.inflight.num_queues);
VHOST_LOG_CONFIG(INFO, "(%s) get_inflight_fd queue_size: %u\n",
- dev->ifname, msg->payload.inflight.queue_size);
+ dev->ifname, ctx->msg.payload.inflight.queue_size);
if (vq_is_packed(dev))
pervq_inflight_size = get_pervq_shm_size_packed(queue_size);
addr = inflight_mem_alloc(dev, "vhost-inflight", mmap_size, &fd);
if (!addr) {
VHOST_LOG_CONFIG(ERR, "(%s) failed to alloc vhost inflight area\n", dev->ifname);
- msg->payload.inflight.mmap_size = 0;
+ ctx->msg.payload.inflight.mmap_size = 0;
return RTE_VHOST_MSG_RESULT_ERR;
}
memset(addr, 0, mmap_size);
}
dev->inflight_info->addr = addr;
- dev->inflight_info->size = msg->payload.inflight.mmap_size = mmap_size;
- dev->inflight_info->fd = msg->fds[0] = fd;
- msg->payload.inflight.mmap_offset = 0;
- msg->fd_num = 1;
+ dev->inflight_info->size = ctx->msg.payload.inflight.mmap_size = mmap_size;
+ dev->inflight_info->fd = ctx->fds[0] = fd;
+ ctx->msg.payload.inflight.mmap_offset = 0;
+ ctx->fd_num = 1;
if (vq_is_packed(dev)) {
for (i = 0; i < num_queues; i++) {
}
VHOST_LOG_CONFIG(INFO, "(%s) send inflight mmap_size: %"PRIu64"\n",
- dev->ifname, msg->payload.inflight.mmap_size);
+ dev->ifname, ctx->msg.payload.inflight.mmap_size);
VHOST_LOG_CONFIG(INFO, "(%s) send inflight mmap_offset: %"PRIu64"\n",
- dev->ifname, msg->payload.inflight.mmap_offset);
- VHOST_LOG_CONFIG(INFO, "(%s) send inflight fd: %d\n", dev->ifname, msg->fds[0]);
+ dev->ifname, ctx->msg.payload.inflight.mmap_offset);
+ VHOST_LOG_CONFIG(INFO, "(%s) send inflight fd: %d\n", dev->ifname, ctx->fds[0]);
return RTE_VHOST_MSG_RESULT_REPLY;
}
static int
-vhost_user_set_inflight_fd(struct virtio_net **pdev, VhostUserMsg *msg,
+vhost_user_set_inflight_fd(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
uint64_t mmap_size, mmap_offset;
int fd, i;
int numa_node = SOCKET_ID_ANY;
- fd = msg->fds[0];
- if (msg->size != sizeof(msg->payload.inflight) || fd < 0) {
+ if (validate_msg_fds(dev, ctx, 1) != 0)
+ return RTE_VHOST_MSG_RESULT_ERR;
+
+ fd = ctx->fds[0];
+ if (ctx->msg.size != sizeof(ctx->msg.payload.inflight) || fd < 0) {
VHOST_LOG_CONFIG(ERR, "(%s) invalid set_inflight_fd message size is %d,fd is %d\n",
- dev->ifname, msg->size, fd);
+ dev->ifname, ctx->msg.size, fd);
return RTE_VHOST_MSG_RESULT_ERR;
}
- mmap_size = msg->payload.inflight.mmap_size;
- mmap_offset = msg->payload.inflight.mmap_offset;
- num_queues = msg->payload.inflight.num_queues;
- queue_size = msg->payload.inflight.queue_size;
+ mmap_size = ctx->msg.payload.inflight.mmap_size;
+ mmap_offset = ctx->msg.payload.inflight.mmap_offset;
+ num_queues = ctx->msg.payload.inflight.num_queues;
+ queue_size = ctx->msg.payload.inflight.queue_size;
if (vq_is_packed(dev))
pervq_inflight_size = get_pervq_shm_size_packed(queue_size);
}
static int
-vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_vring_call(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_virtqueue *vq;
int expected_fds;
- expected_fds = (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
- if (validate_msg_fds(dev, msg, expected_fds) != 0)
+ expected_fds = (ctx->msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
+ if (validate_msg_fds(dev, ctx, expected_fds) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
- file.index = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
- if (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)
+ file.index = ctx->msg.payload.u64 & VHOST_USER_VRING_IDX_MASK;
+ if (ctx->msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK)
file.fd = VIRTIO_INVALID_EVENTFD;
else
- file.fd = msg->fds[0];
+ file.fd = ctx->fds[0];
VHOST_LOG_CONFIG(INFO, "(%s) vring call idx:%d file:%d\n",
dev->ifname, file.index, file.fd);
}
static int vhost_user_set_vring_err(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
int expected_fds;
- expected_fds = (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
- if (validate_msg_fds(dev, msg, expected_fds) != 0)
+ expected_fds = (ctx->msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
+ if (validate_msg_fds(dev, ctx, expected_fds) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
- if (!(msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK))
- close(msg->fds[0]);
+ if (!(ctx->msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK))
+ close(ctx->fds[0]);
VHOST_LOG_CONFIG(INFO, "(%s) not implemented\n", dev->ifname);
return RTE_VHOST_MSG_RESULT_OK;
}
static int
-vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_vring_kick(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_virtqueue *vq;
int expected_fds;
- expected_fds = (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
- if (validate_msg_fds(dev, msg, expected_fds) != 0)
+ expected_fds = (ctx->msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK) ? 0 : 1;
+ if (validate_msg_fds(dev, ctx, expected_fds) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
- file.index = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
- if (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)
+ file.index = ctx->msg.payload.u64 & VHOST_USER_VRING_IDX_MASK;
+ if (ctx->msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK)
file.fd = VIRTIO_INVALID_EVENTFD;
else
- file.fd = msg->fds[0];
+ file.fd = ctx->fds[0];
VHOST_LOG_CONFIG(INFO, "(%s) vring kick idx:%d file:%d\n",
dev->ifname, file.index, file.fd);
*/
static int
vhost_user_get_vring_base(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
+ struct vhost_virtqueue *vq = dev->virtqueue[ctx->msg.payload.state.index];
uint64_t val;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
/* We have to stop the queue (virtio) if it is running. */
vhost_destroy_device_notify(dev);
*/
val = vq->last_avail_idx & 0x7fff;
val |= vq->avail_wrap_counter << 15;
- msg->payload.state.num = val;
+ ctx->msg.payload.state.num = val;
} else {
- msg->payload.state.num = vq->last_avail_idx;
+ ctx->msg.payload.state.num = vq->last_avail_idx;
}
VHOST_LOG_CONFIG(INFO, "(%s) vring base idx:%d file:%d\n",
- dev->ifname, msg->payload.state.index,
- msg->payload.state.num);
+ dev->ifname, ctx->msg.payload.state.index,
+ ctx->msg.payload.state.num);
/*
* Based on current qemu vhost-user implementation, this message is
* sent and only sent in vhost_vring_stop.
rte_free(vq->log_cache);
vq->log_cache = NULL;
- msg->size = sizeof(msg->payload.state);
- msg->fd_num = 0;
+ ctx->msg.size = sizeof(ctx->msg.payload.state);
+ ctx->fd_num = 0;
vhost_user_iotlb_flush_all(vq);
*/
static int
vhost_user_set_vring_enable(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- bool enable = !!msg->payload.state.num;
- int index = (int)msg->payload.state.index;
-
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
+ bool enable = !!ctx->msg.payload.state.num;
+ int index = (int)ctx->msg.payload.state.index;
VHOST_LOG_CONFIG(INFO, "(%s) set queue enable: %d to qp idx: %d\n",
dev->ifname, enable, index);
static int
vhost_user_get_protocol_features(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint64_t features, protocol_features;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
rte_vhost_driver_get_features(dev->ifname, &features);
rte_vhost_driver_get_protocol_features(dev->ifname, &protocol_features);
- msg->payload.u64 = protocol_features;
- msg->size = sizeof(msg->payload.u64);
- msg->fd_num = 0;
+ ctx->msg.payload.u64 = protocol_features;
+ ctx->msg.size = sizeof(ctx->msg.payload.u64);
+ ctx->fd_num = 0;
return RTE_VHOST_MSG_RESULT_REPLY;
}
static int
vhost_user_set_protocol_features(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- uint64_t protocol_features = msg->payload.u64;
+ uint64_t protocol_features = ctx->msg.payload.u64;
uint64_t slave_protocol_features = 0;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
rte_vhost_driver_get_protocol_features(dev->ifname,
&slave_protocol_features);
if (protocol_features & ~slave_protocol_features) {
}
static int
-vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_log_base(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- int fd = msg->fds[0];
+ int fd = ctx->fds[0];
uint64_t size, off;
void *addr;
uint32_t i;
- if (validate_msg_fds(dev, msg, 1) != 0)
+ if (validate_msg_fds(dev, ctx, 1) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
if (fd < 0) {
return RTE_VHOST_MSG_RESULT_ERR;
}
- if (msg->size != sizeof(VhostUserLog)) {
+ if (ctx->msg.size != sizeof(VhostUserLog)) {
VHOST_LOG_CONFIG(ERR, "(%s) invalid log base msg size: %"PRId32" != %d\n",
- dev->ifname, msg->size, (int)sizeof(VhostUserLog));
+ dev->ifname, ctx->msg.size, (int)sizeof(VhostUserLog));
goto close_msg_fds;
}
- size = msg->payload.log.mmap_size;
- off = msg->payload.log.mmap_offset;
+ size = ctx->msg.payload.log.mmap_size;
+ off = ctx->msg.payload.log.mmap_offset;
/* Check for mmap size and offset overflow. */
if (off >= -size) {
* The spec is not clear about it (yet), but QEMU doesn't expect
* any payload in the reply.
*/
- msg->size = 0;
- msg->fd_num = 0;
+ ctx->msg.size = 0;
+ ctx->fd_num = 0;
return RTE_VHOST_MSG_RESULT_REPLY;
close_msg_fds:
- close_msg_fds(msg);
+ close_msg_fds(ctx);
return RTE_VHOST_MSG_RESULT_ERR;
}
static int vhost_user_set_log_fd(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- if (validate_msg_fds(dev, msg, 1) != 0)
+ if (validate_msg_fds(dev, ctx, 1) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
- close(msg->fds[0]);
+ close(ctx->fds[0]);
VHOST_LOG_CONFIG(INFO, "(%s) not implemented.\n", dev->ifname);
return RTE_VHOST_MSG_RESULT_OK;
* a flag 'broadcast_rarp' to let rte_vhost_dequeue_burst() inject it.
*/
static int
-vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_send_rarp(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- uint8_t *mac = (uint8_t *)&msg->payload.u64;
+ uint8_t *mac = (uint8_t *)&ctx->msg.payload.u64;
struct rte_vdpa_device *vdpa_dev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
VHOST_LOG_CONFIG(DEBUG, "(%s) MAC: " RTE_ETHER_ADDR_PRT_FMT "\n",
dev->ifname, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
memcpy(dev->mac.addr_bytes, mac, 6);
}
static int
-vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_net_set_mtu(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
- if (msg->payload.u64 < VIRTIO_MIN_MTU ||
- msg->payload.u64 > VIRTIO_MAX_MTU) {
+ if (ctx->msg.payload.u64 < VIRTIO_MIN_MTU ||
+ ctx->msg.payload.u64 > VIRTIO_MAX_MTU) {
VHOST_LOG_CONFIG(ERR, "(%s) invalid MTU size (%"PRIu64")\n",
- dev->ifname, msg->payload.u64);
+ dev->ifname, ctx->msg.payload.u64);
return RTE_VHOST_MSG_RESULT_ERR;
}
- dev->mtu = msg->payload.u64;
+ dev->mtu = ctx->msg.payload.u64;
return RTE_VHOST_MSG_RESULT_OK;
}
static int
-vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_req_fd(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- int fd = msg->fds[0];
+ int fd = ctx->fds[0];
- if (validate_msg_fds(dev, msg, 1) != 0)
+ if (validate_msg_fds(dev, ctx, 1) != 0)
return RTE_VHOST_MSG_RESULT_ERR;
if (fd < 0) {
}
static int
-vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_get_config(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- struct vhost_iotlb_msg *imsg = &msg->payload.iotlb;
- uint16_t i;
- uint64_t vva, len;
+ struct rte_vdpa_device *vdpa_dev = dev->vdpa_dev;
+ int ret = 0;
+
+ if (validate_msg_fds(dev, ctx, 0) != 0)
+ return RTE_VHOST_MSG_RESULT_ERR;
- if (validate_msg_fds(dev, msg, 0) != 0)
+ if (!vdpa_dev) {
+ VHOST_LOG_CONFIG(ERR, "(%s) is not vDPA device!\n",
+ dev->ifname);
return RTE_VHOST_MSG_RESULT_ERR;
+ }
+
+ if (vdpa_dev->ops->get_config) {
+ ret = vdpa_dev->ops->get_config(dev->vid,
+ ctx->msg.payload.cfg.region,
+ ctx->msg.payload.cfg.size);
+ if (ret != 0) {
+ ctx->msg.size = 0;
+ VHOST_LOG_CONFIG(ERR,
+ "(%s) get_config() return error!\n",
+ dev->ifname);
+ }
+ } else {
+ VHOST_LOG_CONFIG(ERR, "(%s) get_config() not supported!\n",
+ dev->ifname);
+ }
+
+ return RTE_VHOST_MSG_RESULT_REPLY;
+}
+
+static int
+vhost_user_set_config(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
+ int main_fd __rte_unused)
+{
+ struct virtio_net *dev = *pdev;
+ struct rte_vdpa_device *vdpa_dev = dev->vdpa_dev;
+ int ret = 0;
+
+ if (validate_msg_fds(dev, ctx, 0) != 0)
+ return RTE_VHOST_MSG_RESULT_ERR;
+
+ if (ctx->msg.payload.cfg.size > VHOST_USER_MAX_CONFIG_SIZE) {
+ VHOST_LOG_CONFIG(ERR,
+ "(%s) vhost_user_config size: %"PRIu32", should not be larger than %d\n",
+ dev->ifname, ctx->msg.payload.cfg.size,
+ VHOST_USER_MAX_CONFIG_SIZE);
+ goto out;
+ }
+
+ if (!vdpa_dev) {
+ VHOST_LOG_CONFIG(ERR, "(%s) is not vDPA device!\n",
+ dev->ifname);
+ goto out;
+ }
+
+ if (vdpa_dev->ops->set_config) {
+ ret = vdpa_dev->ops->set_config(dev->vid,
+ ctx->msg.payload.cfg.region,
+ ctx->msg.payload.cfg.offset,
+ ctx->msg.payload.cfg.size,
+ ctx->msg.payload.cfg.flags);
+ if (ret)
+ VHOST_LOG_CONFIG(ERR,
+ "(%s) set_config() return error!\n",
+ dev->ifname);
+ } else {
+ VHOST_LOG_CONFIG(ERR, "(%s) set_config() not supported!\n",
+ dev->ifname);
+ }
+
+ return RTE_VHOST_MSG_RESULT_OK;
+
+out:
+ return RTE_VHOST_MSG_RESULT_ERR;
+}
+
+static int
+vhost_user_iotlb_msg(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
+ int main_fd __rte_unused)
+{
+ struct virtio_net *dev = *pdev;
+ struct vhost_iotlb_msg *imsg = &ctx->msg.payload.iotlb;
+ uint16_t i;
+ uint64_t vva, len;
switch (imsg->type) {
case VHOST_IOTLB_UPDATE:
vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva,
len, imsg->perm);
- if (is_vring_iotlb(dev, vq, imsg))
+ if (is_vring_iotlb(dev, vq, imsg)) {
+ rte_spinlock_lock(&vq->access_lock);
*pdev = dev = translate_ring_addresses(dev, i);
+ rte_spinlock_unlock(&vq->access_lock);
+ }
}
break;
case VHOST_IOTLB_INVALIDATE:
vhost_user_iotlb_cache_remove(vq, imsg->iova,
imsg->size);
- if (is_vring_iotlb(dev, vq, imsg))
+ if (is_vring_iotlb(dev, vq, imsg)) {
+ rte_spinlock_lock(&vq->access_lock);
vring_invalidate(dev, vq);
+ rte_spinlock_unlock(&vq->access_lock);
+ }
}
break;
default:
static int
vhost_user_set_postcopy_advise(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
#ifdef RTE_LIBRTE_VHOST_POSTCOPY
struct uffdio_api api_struct;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
dev->postcopy_ufd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
if (dev->postcopy_ufd == -1) {
dev->postcopy_ufd = -1;
return RTE_VHOST_MSG_RESULT_ERR;
}
- msg->fds[0] = dev->postcopy_ufd;
- msg->fd_num = 1;
+ ctx->fds[0] = dev->postcopy_ufd;
+ ctx->fd_num = 1;
return RTE_VHOST_MSG_RESULT_REPLY;
#else
dev->postcopy_ufd = -1;
- msg->fd_num = 0;
+ ctx->fd_num = 0;
return RTE_VHOST_MSG_RESULT_ERR;
#endif
static int
vhost_user_set_postcopy_listen(struct virtio_net **pdev,
- struct VhostUserMsg *msg __rte_unused,
+ struct vhu_msg_context *ctx __rte_unused,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
if (dev->mem && dev->mem->nregions) {
VHOST_LOG_CONFIG(ERR, "(%s) regions already registered at postcopy-listen\n",
dev->ifname);
}
static int
-vhost_user_postcopy_end(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_postcopy_end(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
dev->postcopy_listening = 0;
if (dev->postcopy_ufd >= 0) {
close(dev->postcopy_ufd);
dev->postcopy_ufd = -1;
}
- msg->payload.u64 = 0;
- msg->size = sizeof(msg->payload.u64);
- msg->fd_num = 0;
+ ctx->msg.payload.u64 = 0;
+ ctx->msg.size = sizeof(ctx->msg.payload.u64);
+ ctx->fd_num = 0;
return RTE_VHOST_MSG_RESULT_REPLY;
}
static int
-vhost_user_get_status(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_get_status(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
- msg->payload.u64 = dev->status;
- msg->size = sizeof(msg->payload.u64);
- msg->fd_num = 0;
+ ctx->msg.payload.u64 = dev->status;
+ ctx->msg.size = sizeof(ctx->msg.payload.u64);
+ ctx->fd_num = 0;
return RTE_VHOST_MSG_RESULT_REPLY;
}
static int
-vhost_user_set_status(struct virtio_net **pdev, struct VhostUserMsg *msg,
+vhost_user_set_status(struct virtio_net **pdev,
+ struct vhu_msg_context *ctx,
int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
- if (validate_msg_fds(dev, msg, 0) != 0)
- return RTE_VHOST_MSG_RESULT_ERR;
-
/* As per Virtio specification, the device status is 8bits long */
- if (msg->payload.u64 > UINT8_MAX) {
+ if (ctx->msg.payload.u64 > UINT8_MAX) {
VHOST_LOG_CONFIG(ERR, "(%s) invalid VHOST_USER_SET_STATUS payload 0x%" PRIx64 "\n",
- dev->ifname, msg->payload.u64);
+ dev->ifname, ctx->msg.payload.u64);
return RTE_VHOST_MSG_RESULT_ERR;
}
- dev->status = msg->payload.u64;
+ dev->status = ctx->msg.payload.u64;
if ((dev->status & VIRTIO_DEVICE_STATUS_FEATURES_OK) &&
(dev->flags & VIRTIO_DEV_FEATURES_FAILED)) {
return RTE_VHOST_MSG_RESULT_OK;
}
-typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
- struct VhostUserMsg *msg,
- int main_fd);
-static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
- [VHOST_USER_NONE] = NULL,
- [VHOST_USER_GET_FEATURES] = vhost_user_get_features,
- [VHOST_USER_SET_FEATURES] = vhost_user_set_features,
- [VHOST_USER_SET_OWNER] = vhost_user_set_owner,
- [VHOST_USER_RESET_OWNER] = vhost_user_reset_owner,
- [VHOST_USER_SET_MEM_TABLE] = vhost_user_set_mem_table,
- [VHOST_USER_SET_LOG_BASE] = vhost_user_set_log_base,
- [VHOST_USER_SET_LOG_FD] = vhost_user_set_log_fd,
- [VHOST_USER_SET_VRING_NUM] = vhost_user_set_vring_num,
- [VHOST_USER_SET_VRING_ADDR] = vhost_user_set_vring_addr,
- [VHOST_USER_SET_VRING_BASE] = vhost_user_set_vring_base,
- [VHOST_USER_GET_VRING_BASE] = vhost_user_get_vring_base,
- [VHOST_USER_SET_VRING_KICK] = vhost_user_set_vring_kick,
- [VHOST_USER_SET_VRING_CALL] = vhost_user_set_vring_call,
- [VHOST_USER_SET_VRING_ERR] = vhost_user_set_vring_err,
- [VHOST_USER_GET_PROTOCOL_FEATURES] = vhost_user_get_protocol_features,
- [VHOST_USER_SET_PROTOCOL_FEATURES] = vhost_user_set_protocol_features,
- [VHOST_USER_GET_QUEUE_NUM] = vhost_user_get_queue_num,
- [VHOST_USER_SET_VRING_ENABLE] = vhost_user_set_vring_enable,
- [VHOST_USER_SEND_RARP] = vhost_user_send_rarp,
- [VHOST_USER_NET_SET_MTU] = vhost_user_net_set_mtu,
- [VHOST_USER_SET_SLAVE_REQ_FD] = vhost_user_set_req_fd,
- [VHOST_USER_IOTLB_MSG] = vhost_user_iotlb_msg,
- [VHOST_USER_POSTCOPY_ADVISE] = vhost_user_set_postcopy_advise,
- [VHOST_USER_POSTCOPY_LISTEN] = vhost_user_set_postcopy_listen,
- [VHOST_USER_POSTCOPY_END] = vhost_user_postcopy_end,
- [VHOST_USER_GET_INFLIGHT_FD] = vhost_user_get_inflight_fd,
- [VHOST_USER_SET_INFLIGHT_FD] = vhost_user_set_inflight_fd,
- [VHOST_USER_SET_STATUS] = vhost_user_set_status,
- [VHOST_USER_GET_STATUS] = vhost_user_get_status,
+#define VHOST_MESSAGE_HANDLERS \
+VHOST_MESSAGE_HANDLER(VHOST_USER_NONE, NULL, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_FEATURES, vhost_user_get_features, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_FEATURES, vhost_user_set_features, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_OWNER, vhost_user_set_owner, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_RESET_OWNER, vhost_user_reset_owner, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_MEM_TABLE, vhost_user_set_mem_table, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_LOG_BASE, vhost_user_set_log_base, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_LOG_FD, vhost_user_set_log_fd, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_NUM, vhost_user_set_vring_num, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_ADDR, vhost_user_set_vring_addr, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_BASE, vhost_user_set_vring_base, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_VRING_BASE, vhost_user_get_vring_base, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_KICK, vhost_user_set_vring_kick, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_CALL, vhost_user_set_vring_call, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_ERR, vhost_user_set_vring_err, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_PROTOCOL_FEATURES, vhost_user_get_protocol_features, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_PROTOCOL_FEATURES, vhost_user_set_protocol_features, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_QUEUE_NUM, vhost_user_get_queue_num, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_ENABLE, vhost_user_set_vring_enable, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SEND_RARP, vhost_user_send_rarp, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_NET_SET_MTU, vhost_user_net_set_mtu, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_SLAVE_REQ_FD, vhost_user_set_req_fd, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_IOTLB_MSG, vhost_user_iotlb_msg, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_CONFIG, vhost_user_get_config, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_CONFIG, vhost_user_set_config, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_POSTCOPY_ADVISE, vhost_user_set_postcopy_advise, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_POSTCOPY_LISTEN, vhost_user_set_postcopy_listen, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_POSTCOPY_END, vhost_user_postcopy_end, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_INFLIGHT_FD, vhost_user_get_inflight_fd, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_INFLIGHT_FD, vhost_user_set_inflight_fd, true) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_SET_STATUS, vhost_user_set_status, false) \
+VHOST_MESSAGE_HANDLER(VHOST_USER_GET_STATUS, vhost_user_get_status, false)
+
+#define VHOST_MESSAGE_HANDLER(id, handler, accepts_fd) \
+ [id] = { #id, handler, accepts_fd },
+static vhost_message_handler_t vhost_message_handlers[] = {
+ VHOST_MESSAGE_HANDLERS
};
+#undef VHOST_MESSAGE_HANDLER
/* return bytes# of read on success or negative val on failure. */
static int
-read_vhost_message(struct virtio_net *dev, int sockfd, struct VhostUserMsg *msg)
+read_vhost_message(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx)
{
int ret;
- ret = read_fd_message(dev->ifname, sockfd, (char *)msg, VHOST_USER_HDR_SIZE,
- msg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num);
+ ret = read_fd_message(dev->ifname, sockfd, (char *)&ctx->msg, VHOST_USER_HDR_SIZE,
+ ctx->fds, VHOST_MEMORY_MAX_NREGIONS, &ctx->fd_num);
if (ret <= 0) {
return ret;
} else if (ret != VHOST_USER_HDR_SIZE) {
VHOST_LOG_CONFIG(ERR, "(%s) Unexpected header size read\n", dev->ifname);
- close_msg_fds(msg);
+ close_msg_fds(ctx);
return -1;
}
- if (msg->size) {
- if (msg->size > sizeof(msg->payload)) {
+ if (ctx->msg.size) {
+ if (ctx->msg.size > sizeof(ctx->msg.payload)) {
VHOST_LOG_CONFIG(ERR, "(%s) invalid msg size: %d\n",
- dev->ifname, msg->size);
+ dev->ifname, ctx->msg.size);
return -1;
}
- ret = read(sockfd, &msg->payload, msg->size);
+ ret = read(sockfd, &ctx->msg.payload, ctx->msg.size);
if (ret <= 0)
return ret;
- if (ret != (int)msg->size) {
+ if (ret != (int)ctx->msg.size) {
VHOST_LOG_CONFIG(ERR, "(%s) read control message failed\n", dev->ifname);
return -1;
}
}
static int
-send_vhost_message(struct virtio_net *dev, int sockfd, struct VhostUserMsg *msg)
+send_vhost_message(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx)
{
- if (!msg)
+ if (!ctx)
return 0;
- return send_fd_message(dev->ifname, sockfd, (char *)msg,
- VHOST_USER_HDR_SIZE + msg->size, msg->fds, msg->fd_num);
+ return send_fd_message(dev->ifname, sockfd, (char *)&ctx->msg,
+ VHOST_USER_HDR_SIZE + ctx->msg.size, ctx->fds, ctx->fd_num);
}
static int
-send_vhost_reply(struct virtio_net *dev, int sockfd, struct VhostUserMsg *msg)
+send_vhost_reply(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx)
{
- if (!msg)
+ if (!ctx)
return 0;
- msg->flags &= ~VHOST_USER_VERSION_MASK;
- msg->flags &= ~VHOST_USER_NEED_REPLY;
- msg->flags |= VHOST_USER_VERSION;
- msg->flags |= VHOST_USER_REPLY_MASK;
+ ctx->msg.flags &= ~VHOST_USER_VERSION_MASK;
+ ctx->msg.flags &= ~VHOST_USER_NEED_REPLY;
+ ctx->msg.flags |= VHOST_USER_VERSION;
+ ctx->msg.flags |= VHOST_USER_REPLY_MASK;
- return send_vhost_message(dev, sockfd, msg);
+ return send_vhost_message(dev, sockfd, ctx);
}
static int
-send_vhost_slave_message(struct virtio_net *dev, struct VhostUserMsg *msg)
+send_vhost_slave_message(struct virtio_net *dev,
+ struct vhu_msg_context *ctx)
{
int ret;
- if (msg->flags & VHOST_USER_NEED_REPLY)
+ if (ctx->msg.flags & VHOST_USER_NEED_REPLY)
rte_spinlock_lock(&dev->slave_req_lock);
- ret = send_vhost_message(dev, dev->slave_req_fd, msg);
- if (ret < 0 && (msg->flags & VHOST_USER_NEED_REPLY))
+ ret = send_vhost_message(dev, dev->slave_req_fd, ctx);
+ if (ret < 0 && (ctx->msg.flags & VHOST_USER_NEED_REPLY))
rte_spinlock_unlock(&dev->slave_req_lock);
return ret;
*/
static int
vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev,
- struct VhostUserMsg *msg)
+ struct vhu_msg_context *ctx)
{
uint32_t vring_idx;
- switch (msg->request.master) {
+ switch (ctx->msg.request.master) {
case VHOST_USER_SET_VRING_KICK:
case VHOST_USER_SET_VRING_CALL:
case VHOST_USER_SET_VRING_ERR:
- vring_idx = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
+ vring_idx = ctx->msg.payload.u64 & VHOST_USER_VRING_IDX_MASK;
break;
case VHOST_USER_SET_VRING_NUM:
case VHOST_USER_SET_VRING_BASE:
case VHOST_USER_GET_VRING_BASE:
case VHOST_USER_SET_VRING_ENABLE:
- vring_idx = msg->payload.state.index;
+ vring_idx = ctx->msg.payload.state.index;
break;
case VHOST_USER_SET_VRING_ADDR:
- vring_idx = msg->payload.addr.index;
+ vring_idx = ctx->msg.payload.addr.index;
+ break;
+ case VHOST_USER_SET_INFLIGHT_FD:
+ vring_idx = ctx->msg.payload.inflight.num_queues - 1;
break;
default:
return 0;
vhost_user_msg_handler(int vid, int fd)
{
struct virtio_net *dev;
- struct VhostUserMsg msg;
+ struct vhu_msg_context ctx;
+ vhost_message_handler_t *msg_handler;
struct rte_vdpa_device *vdpa_dev;
int ret;
int unlock_required = 0;
bool handled;
- int request;
+ uint32_t request;
uint32_t i;
dev = get_device(vid);
}
}
- ret = read_vhost_message(dev, fd, &msg);
+ ret = read_vhost_message(dev, fd, &ctx);
if (ret <= 0) {
if (ret < 0)
VHOST_LOG_CONFIG(ERR, "(%s) vhost read message failed\n", dev->ifname);
return -1;
}
- ret = 0;
- request = msg.request.master;
- if (request > VHOST_USER_NONE && request < VHOST_USER_MAX &&
- vhost_message_str[request]) {
+ request = ctx.msg.request.master;
+ if (request > VHOST_USER_NONE && request < RTE_DIM(vhost_message_handlers))
+ msg_handler = &vhost_message_handlers[request];
+ else
+ msg_handler = NULL;
+
+ if (msg_handler != NULL && msg_handler->description != NULL) {
if (request != VHOST_USER_IOTLB_MSG)
VHOST_LOG_CONFIG(INFO, "(%s) read message %s\n",
- dev->ifname, vhost_message_str[request]);
+ dev->ifname, msg_handler->description);
else
VHOST_LOG_CONFIG(DEBUG, "(%s) read message %s\n",
- dev->ifname, vhost_message_str[request]);
+ dev->ifname, msg_handler->description);
} else {
VHOST_LOG_CONFIG(DEBUG, "(%s) external request %d\n", dev->ifname, request);
}
- ret = vhost_user_check_and_alloc_queue_pair(dev, &msg);
+ ret = vhost_user_check_and_alloc_queue_pair(dev, &ctx);
if (ret < 0) {
VHOST_LOG_CONFIG(ERR, "(%s) failed to alloc queue\n", dev->ifname);
return -1;
handled = false;
if (dev->extern_ops.pre_msg_handle) {
- ret = (*dev->extern_ops.pre_msg_handle)(dev->vid,
- (void *)&msg);
+ RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, msg) != 0);
+ ret = (*dev->extern_ops.pre_msg_handle)(dev->vid, &ctx);
switch (ret) {
case RTE_VHOST_MSG_RESULT_REPLY:
- send_vhost_reply(dev, fd, &msg);
+ send_vhost_reply(dev, fd, &ctx);
/* Fall-through */
case RTE_VHOST_MSG_RESULT_ERR:
case RTE_VHOST_MSG_RESULT_OK:
}
}
- if (request > VHOST_USER_NONE && request < VHOST_USER_MAX) {
- if (!vhost_message_handlers[request])
- goto skip_to_post_handle;
- ret = vhost_message_handlers[request](&dev, &msg, fd);
+ if (msg_handler == NULL || msg_handler->callback == NULL)
+ goto skip_to_post_handle;
- switch (ret) {
- case RTE_VHOST_MSG_RESULT_ERR:
- VHOST_LOG_CONFIG(ERR, "(%s) processing %s failed.\n",
- dev->ifname, vhost_message_str[request]);
- handled = true;
- break;
- case RTE_VHOST_MSG_RESULT_OK:
- VHOST_LOG_CONFIG(DEBUG, "(%s) processing %s succeeded.\n",
- dev->ifname, vhost_message_str[request]);
- handled = true;
- break;
- case RTE_VHOST_MSG_RESULT_REPLY:
- VHOST_LOG_CONFIG(DEBUG, "(%s) processing %s succeeded and needs reply.\n",
- dev->ifname, vhost_message_str[request]);
- send_vhost_reply(dev, fd, &msg);
- handled = true;
- break;
- default:
- break;
- }
+ if (!msg_handler->accepts_fd && validate_msg_fds(dev, &ctx, 0) != 0) {
+ ret = RTE_VHOST_MSG_RESULT_ERR;
+ } else {
+ ret = msg_handler->callback(&dev, &ctx, fd);
+ }
+
+ switch (ret) {
+ case RTE_VHOST_MSG_RESULT_ERR:
+ VHOST_LOG_CONFIG(ERR, "(%s) processing %s failed.\n",
+ dev->ifname, msg_handler->description);
+ handled = true;
+ break;
+ case RTE_VHOST_MSG_RESULT_OK:
+ VHOST_LOG_CONFIG(DEBUG, "(%s) processing %s succeeded.\n",
+ dev->ifname, msg_handler->description);
+ handled = true;
+ break;
+ case RTE_VHOST_MSG_RESULT_REPLY:
+ VHOST_LOG_CONFIG(DEBUG, "(%s) processing %s succeeded and needs reply.\n",
+ dev->ifname, msg_handler->description);
+ send_vhost_reply(dev, fd, &ctx);
+ handled = true;
+ break;
+ default:
+ break;
}
skip_to_post_handle:
if (ret != RTE_VHOST_MSG_RESULT_ERR &&
dev->extern_ops.post_msg_handle) {
- ret = (*dev->extern_ops.post_msg_handle)(dev->vid,
- (void *)&msg);
+ RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, msg) != 0);
+ ret = (*dev->extern_ops.post_msg_handle)(dev->vid, &ctx);
switch (ret) {
case RTE_VHOST_MSG_RESULT_REPLY:
- send_vhost_reply(dev, fd, &msg);
+ send_vhost_reply(dev, fd, &ctx);
/* Fall-through */
case RTE_VHOST_MSG_RESULT_ERR:
case RTE_VHOST_MSG_RESULT_OK:
if (!handled) {
VHOST_LOG_CONFIG(ERR, "(%s) vhost message (req: %d) was not handled.\n",
dev->ifname, request);
- close_msg_fds(&msg);
+ close_msg_fds(&ctx);
ret = RTE_VHOST_MSG_RESULT_ERR;
}
* this optional reply-ack won't be sent as the
* VHOST_USER_NEED_REPLY was cleared in send_vhost_reply().
*/
- if (msg.flags & VHOST_USER_NEED_REPLY) {
- msg.payload.u64 = ret == RTE_VHOST_MSG_RESULT_ERR;
- msg.size = sizeof(msg.payload.u64);
- msg.fd_num = 0;
- send_vhost_reply(dev, fd, &msg);
+ if (ctx.msg.flags & VHOST_USER_NEED_REPLY) {
+ ctx.msg.payload.u64 = ret == RTE_VHOST_MSG_RESULT_ERR;
+ ctx.msg.size = sizeof(ctx.msg.payload.u64);
+ ctx.fd_num = 0;
+ send_vhost_reply(dev, fd, &ctx);
} else if (ret == RTE_VHOST_MSG_RESULT_ERR) {
VHOST_LOG_CONFIG(ERR, "(%s) vhost message handling failed.\n", dev->ifname);
- return -1;
+ ret = -1;
+ goto unlock;
}
+ ret = 0;
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
bool cur_ready = vq_is_ready(dev, vq);
}
}
+unlock:
if (unlock_required)
vhost_user_unlock_all_queue_pairs(dev);
- if (!virtio_is_ready(dev))
+ if (ret != 0 || !virtio_is_ready(dev))
goto out;
/*
}
out:
- return 0;
+ return ret;
}
static int process_slave_message_reply(struct virtio_net *dev,
- const struct VhostUserMsg *msg)
+ const struct vhu_msg_context *ctx)
{
- struct VhostUserMsg msg_reply;
+ struct vhu_msg_context msg_reply;
int ret;
- if ((msg->flags & VHOST_USER_NEED_REPLY) == 0)
+ if ((ctx->msg.flags & VHOST_USER_NEED_REPLY) == 0)
return 0;
ret = read_vhost_message(dev, dev->slave_req_fd, &msg_reply);
}
ret = 0;
- if (msg_reply.request.slave != msg->request.slave) {
+ if (msg_reply.msg.request.slave != ctx->msg.request.slave) {
VHOST_LOG_CONFIG(ERR, "(%s) received unexpected msg type (%u), expected %u\n",
- dev->ifname, msg_reply.request.slave, msg->request.slave);
+ dev->ifname, msg_reply.msg.request.slave, ctx->msg.request.slave);
ret = -1;
goto out;
}
- ret = msg_reply.payload.u64 ? -1 : 0;
+ ret = msg_reply.msg.payload.u64 ? -1 : 0;
out:
rte_spinlock_unlock(&dev->slave_req_lock);
vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
{
int ret;
- struct VhostUserMsg msg = {
- .request.slave = VHOST_USER_SLAVE_IOTLB_MSG,
- .flags = VHOST_USER_VERSION,
- .size = sizeof(msg.payload.iotlb),
- .payload.iotlb = {
- .iova = iova,
- .perm = perm,
- .type = VHOST_IOTLB_MISS,
+ struct vhu_msg_context ctx = {
+ .msg = {
+ .request.slave = VHOST_USER_SLAVE_IOTLB_MSG,
+ .flags = VHOST_USER_VERSION,
+ .size = sizeof(ctx.msg.payload.iotlb),
+ .payload.iotlb = {
+ .iova = iova,
+ .perm = perm,
+ .type = VHOST_IOTLB_MISS,
+ },
},
};
- ret = send_vhost_message(dev, dev->slave_req_fd, &msg);
+ ret = send_vhost_message(dev, dev->slave_req_fd, &ctx);
if (ret < 0) {
VHOST_LOG_CONFIG(ERR, "(%s) failed to send IOTLB miss message (%d)\n",
dev->ifname, ret);
vhost_user_slave_config_change(struct virtio_net *dev, bool need_reply)
{
int ret;
- struct VhostUserMsg msg = {
- .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
- .flags = VHOST_USER_VERSION,
- .size = 0,
+ struct vhu_msg_context ctx = {
+ .msg = {
+ .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
+ .flags = VHOST_USER_VERSION,
+ .size = 0,
+ }
};
if (need_reply)
- msg.flags |= VHOST_USER_NEED_REPLY;
+ ctx.msg.flags |= VHOST_USER_NEED_REPLY;
- ret = send_vhost_slave_message(dev, &msg);
+ ret = send_vhost_slave_message(dev, &ctx);
if (ret < 0) {
VHOST_LOG_CONFIG(ERR, "(%s) failed to send config change (%d)\n",
dev->ifname, ret);
return ret;
}
- return process_slave_message_reply(dev, &msg);
+ return process_slave_message_reply(dev, &ctx);
}
int
uint64_t size)
{
int ret;
- struct VhostUserMsg msg = {
- .request.slave = VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG,
- .flags = VHOST_USER_VERSION | VHOST_USER_NEED_REPLY,
- .size = sizeof(msg.payload.area),
- .payload.area = {
- .u64 = index & VHOST_USER_VRING_IDX_MASK,
- .size = size,
- .offset = offset,
+ struct vhu_msg_context ctx = {
+ .msg = {
+ .request.slave = VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG,
+ .flags = VHOST_USER_VERSION | VHOST_USER_NEED_REPLY,
+ .size = sizeof(ctx.msg.payload.area),
+ .payload.area = {
+ .u64 = index & VHOST_USER_VRING_IDX_MASK,
+ .size = size,
+ .offset = offset,
+ },
},
};
if (fd < 0)
- msg.payload.area.u64 |= VHOST_USER_VRING_NOFD_MASK;
+ ctx.msg.payload.area.u64 |= VHOST_USER_VRING_NOFD_MASK;
else {
- msg.fds[0] = fd;
- msg.fd_num = 1;
+ ctx.fds[0] = fd;
+ ctx.fd_num = 1;
}
- ret = send_vhost_slave_message(dev, &msg);
+ ret = send_vhost_slave_message(dev, &ctx);
if (ret < 0) {
VHOST_LOG_CONFIG(ERR, "(%s) failed to set host notifier (%d)\n",
dev->ifname, ret);
return ret;
}
- return process_slave_message_reply(dev, &msg);
+ return process_slave_message_reply(dev, &ctx);
}
int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable)
git.droids-corp.org / dpdk.git / blobdiff