net/mlx5: handle Rx CQE compression

[dpdk.git] / lib / librte_vhost / vhost_user / virtio-net-user.c

diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c
index ae405e8..a6a48dc 100644 (file)
--- a/lib/librte_vhost/vhost_user/virtio-net-user.c
+++ b/lib/librte_vhost/vhost_user/virtio-net-user.c
@@ -43,7 +43,6 @@
 #include <rte_common.h>
 #include <rte_log.h>
 
-#include "virtio-net.h"
 #include "virtio-net-user.h"
 #include "vhost-net-user.h"
 #include "vhost-net.h"
@@ -64,9 +63,10 @@ static uint64_t
 get_blk_size(int fd)
 {
        struct stat stat;
+       int ret;
 
-       fstat(fd, &stat);
-       return (uint64_t)stat.st_blksize;
+       ret = fstat(fd, &stat);
+       return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize;
 }
 
 static void
@@ -96,6 +96,10 @@ vhost_backend_cleanup(struct virtio_net *dev)
                free(dev->mem);
                dev->mem = NULL;
        }
+       if (dev->log_addr) {
+               munmap((void *)(uintptr_t)dev->log_addr, dev->log_size);
+               dev->log_addr = 0;
+       }
 }
 
 int
@@ -117,7 +121,7 @@ user_set_mem_table(int vid, struct VhostUserMsg *pmsg)
        /* Remove from the data plane. */
        if (dev->flags & VIRTIO_DEV_RUNNING) {
                dev->flags &= ~VIRTIO_DEV_RUNNING;
-               notify_ops->destroy_device(dev);
+               notify_ops->destroy_device(vid);
        }
 
        if (dev->mem) {
@@ -164,6 +168,11 @@ user_set_mem_table(int vid, struct VhostUserMsg *pmsg)
                 * aligned.
                 */
                alignment = get_blk_size(pmsg->fds[idx]);
+               if (alignment == (uint64_t)-1) {
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                               "couldn't get hugepage size through fstat\n");
+                       goto err_mmap;
+               }
                mapped_size = RTE_ALIGN_CEIL(mapped_size, alignment);
 
                mapped_address = (uint64_t)(uintptr_t)mmap(NULL,
@@ -279,6 +288,9 @@ user_set_vring_kick(int vid, struct VhostUserMsg *pmsg)
        struct vhost_vring_file file;
        struct virtio_net *dev = get_device(vid);
 
+       if (!dev)
+               return;
+
        file.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
        if (pmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)
                file.fd = VIRTIO_INVALID_EVENTFD;
@@ -289,7 +301,7 @@ user_set_vring_kick(int vid, struct VhostUserMsg *pmsg)
        vhost_set_vring_kick(vid, &file);
 
        if (virtio_is_ready(dev) && !(dev->flags & VIRTIO_DEV_RUNNING)) {
-               if (notify_ops->new_device(dev) == 0)
+               if (notify_ops->new_device(vid) == 0)
                        dev->flags |= VIRTIO_DEV_RUNNING;
        }
 }
@@ -306,7 +318,7 @@ user_get_vring_base(int vid, struct vhost_vring_state *state)
                return -1;
        /* We have to stop the queue (virtio) if it is running. */
        if (dev->flags & VIRTIO_DEV_RUNNING)
-               notify_ops->destroy_device(dev);
+               notify_ops->destroy_device(vid);
 
        /* Here we are safe to get the last used index */
        vhost_get_vring_base(vid, state->index, state);
@@ -333,16 +345,19 @@ user_get_vring_base(int vid, struct vhost_vring_state *state)
 int
 user_set_vring_enable(int vid, struct vhost_vring_state *state)
 {
-       struct virtio_net *dev = get_device(vid);
+       struct virtio_net *dev;
        int enable = (int)state->num;
 
+       dev = get_device(vid);
+       if (dev == NULL)
+               return -1;
+
        RTE_LOG(INFO, VHOST_CONFIG,
                "set queue enable: %d to qp idx: %d\n",
                enable, state->index);
 
-       if (notify_ops->vring_state_changed) {
-               notify_ops->vring_state_changed(dev, state->index, enable);
-       }
+       if (notify_ops->vring_state_changed)
+               notify_ops->vring_state_changed(vid, state->index, enable);
 
        dev->virtqueue[state->index]->enabled = enable;
 
@@ -396,13 +411,21 @@ user_set_log_base(int vid, struct VhostUserMsg *msg)
         * fail when offset is not page size aligned.
         */
        addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+       close(fd);
        if (addr == MAP_FAILED) {
                RTE_LOG(ERR, VHOST_CONFIG, "mmap log base failed!\n");
                return -1;
        }
 
-       /* TODO: unmap on stop */
-       dev->log_base = (uint64_t)(uintptr_t)addr + off;
+       /*
+        * Free previously mapped log memory on occasionally
+        * multiple VHOST_USER_SET_LOG_BASE.
+        */
+       if (dev->log_addr) {
+               munmap((void *)(uintptr_t)dev->log_addr, dev->log_size);
+       }
+       dev->log_addr = (uint64_t)(uintptr_t)addr;
+       dev->log_base = dev->log_addr + off;
        dev->log_size = size;
 
        return 0;