vhost: fix return code of messages requiring replies
[dpdk.git] / lib / librte_vhost / vhost_user.c
index d686b5a..09a90a2 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2016 Intel Corporation
+ * Copyright(c) 2010-2018 Intel Corporation
  */
 
 /* Security model
@@ -67,6 +67,8 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
        [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",
 };
 
 static uint64_t
@@ -125,55 +127,81 @@ vhost_backend_cleanup(struct virtio_net *dev)
  * the device hasn't been initialised.
  */
 static int
-vhost_user_set_owner(void)
+vhost_user_set_owner(struct virtio_net **pdev __rte_unused,
+               struct VhostUserMsg *msg __rte_unused)
 {
-       return 0;
+       return VH_RESULT_OK;
 }
 
 static int
-vhost_user_reset_owner(struct virtio_net *dev)
+vhost_user_reset_owner(struct virtio_net **pdev,
+               struct VhostUserMsg *msg __rte_unused)
 {
-       if (dev->flags & VIRTIO_DEV_RUNNING) {
-               dev->flags &= ~VIRTIO_DEV_RUNNING;
-               dev->notify_ops->destroy_device(dev->vid);
-       }
+       struct virtio_net *dev = *pdev;
+       vhost_destroy_device_notify(dev);
 
        cleanup_device(dev, 0);
        reset_device(dev);
-       return 0;
+       return VH_RESULT_OK;
 }
 
 /*
  * The features that we support are requested.
  */
-static uint64_t
-vhost_user_get_features(struct virtio_net *dev)
+static int
+vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        uint64_t features = 0;
 
        rte_vhost_driver_get_features(dev->ifname, &features);
-       return features;
+
+       msg->payload.u64 = features;
+       msg->size = sizeof(msg->payload.u64);
+
+       return VH_RESULT_REPLY;
+}
+
+/*
+ * The queue number that we support are requested.
+ */
+static int
+vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg)
+{
+       struct virtio_net *dev = *pdev;
+       uint32_t queue_num = 0;
+
+       rte_vhost_driver_get_queue_num(dev->ifname, &queue_num);
+
+       msg->payload.u64 = (uint64_t)queue_num;
+       msg->size = sizeof(msg->payload.u64);
+
+       return VH_RESULT_REPLY;
 }
 
 /*
  * We receive the negotiated features supported by us and the virtio device.
  */
 static int
-vhost_user_set_features(struct virtio_net *dev, uint64_t features)
+vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
+       uint64_t features = msg->payload.u64;
        uint64_t vhost_features = 0;
+       struct rte_vdpa_device *vdpa_dev;
+       int did = -1;
 
        rte_vhost_driver_get_features(dev->ifname, &vhost_features);
        if (features & ~vhost_features) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "(%d) received invalid negotiated features.\n",
                        dev->vid);
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        if (dev->flags & VIRTIO_DEV_RUNNING) {
                if (dev->features == features)
-                       return 0;
+                       return VH_RESULT_OK;
 
                /*
                 * Error out if master tries to change features while device is
@@ -184,7 +212,7 @@ vhost_user_set_features(struct virtio_net *dev, uint64_t features)
                        RTE_LOG(ERR, VHOST_CONFIG,
                                "(%d) features changed while device is running.\n",
                                dev->vid);
-                       return -1;
+                       return VH_RESULT_ERR;
                }
 
                if (dev->notify_ops->features_changed)
@@ -198,7 +226,7 @@ vhost_user_set_features(struct virtio_net *dev, uint64_t features)
        } else {
                dev->vhost_hlen = sizeof(struct virtio_net_hdr);
        }
-       LOG_DEBUG(VHOST_CONFIG,
+       VHOST_LOG_DEBUG(VHOST_CONFIG,
                "(%d) mergeable RX buffers %s, virtio 1 %s\n",
                dev->vid,
                (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ? "on" : "off",
@@ -220,20 +248,26 @@ vhost_user_set_features(struct virtio_net *dev, uint64_t features)
 
                        dev->virtqueue[dev->nr_vring] = NULL;
                        cleanup_vq(vq, 1);
-                       free_vq(vq);
+                       free_vq(dev, vq);
                }
        }
 
-       return 0;
+       did = dev->vdpa_dev_id;
+       vdpa_dev = rte_vdpa_get_device(did);
+       if (vdpa_dev && vdpa_dev->ops->set_features)
+               vdpa_dev->ops->set_features(dev->vid);
+
+       return VH_RESULT_OK;
 }
 
 /*
  * The virtio device sends us the size of the descriptor ring.
  */
 static int
-vhost_user_set_vring_num(struct virtio_net *dev,
-                        VhostUserMsg *msg)
+vhost_user_set_vring_num(struct virtio_net **pdev,
+                        struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
 
        vq->size = msg->payload.state.num;
@@ -246,7 +280,7 @@ vhost_user_set_vring_num(struct virtio_net *dev,
        if ((vq->size & (vq->size - 1)) || vq->size > 32768) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "invalid virtqueue size %u\n", vq->size);
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        if (dev->dequeue_zero_copy) {
@@ -264,13 +298,26 @@ vhost_user_set_vring_num(struct virtio_net *dev,
                TAILQ_INIT(&vq->zmbuf_list);
        }
 
-       vq->shadow_used_ring = rte_malloc(NULL,
+       if (vq_is_packed(dev)) {
+               vq->shadow_used_packed = rte_malloc(NULL,
+                               vq->size *
+                               sizeof(struct vring_used_elem_packed),
+                               RTE_CACHE_LINE_SIZE);
+               if (!vq->shadow_used_packed) {
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                                       "failed to allocate memory for shadow used ring.\n");
+                       return VH_RESULT_ERR;
+               }
+
+       } else {
+               vq->shadow_used_split = rte_malloc(NULL,
                                vq->size * sizeof(struct vring_used_elem),
                                RTE_CACHE_LINE_SIZE);
-       if (!vq->shadow_used_ring) {
-               RTE_LOG(ERR, VHOST_CONFIG,
-                       "failed to allocate memory for shadow used ring.\n");
-               return -1;
+               if (!vq->shadow_used_split) {
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                                       "failed to allocate memory for shadow used ring.\n");
+                       return VH_RESULT_ERR;
+               }
        }
 
        vq->batch_copy_elems = rte_malloc(NULL,
@@ -279,10 +326,10 @@ vhost_user_set_vring_num(struct virtio_net *dev,
        if (!vq->batch_copy_elems) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "failed to allocate memory for batching copy.\n");
-               return -1;
+               return VH_RESULT_ERR;
        }
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
 /*
@@ -297,7 +344,8 @@ numa_realloc(struct virtio_net *dev, int index)
        struct virtio_net *old_dev;
        struct vhost_virtqueue *old_vq, *vq;
        struct zcopy_mbuf *new_zmbuf;
-       struct vring_used_elem *new_shadow_used_ring;
+       struct vring_used_elem *new_shadow_used_split;
+       struct vring_used_elem_packed *new_shadow_used_packed;
        struct batch_copy_elem *new_batch_copy_elems;
        int ret;
 
@@ -325,20 +373,35 @@ numa_realloc(struct virtio_net *dev, int index)
                memcpy(vq, old_vq, sizeof(*vq));
                TAILQ_INIT(&vq->zmbuf_list);
 
-               new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
-                       sizeof(struct zcopy_mbuf), 0, newnode);
-               if (new_zmbuf) {
-                       rte_free(vq->zmbufs);
-                       vq->zmbufs = new_zmbuf;
+               if (dev->dequeue_zero_copy) {
+                       new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
+                                       sizeof(struct zcopy_mbuf), 0, newnode);
+                       if (new_zmbuf) {
+                               rte_free(vq->zmbufs);
+                               vq->zmbufs = new_zmbuf;
+                       }
                }
 
-               new_shadow_used_ring = rte_malloc_socket(NULL,
-                       vq->size * sizeof(struct vring_used_elem),
-                       RTE_CACHE_LINE_SIZE,
-                       newnode);
-               if (new_shadow_used_ring) {
-                       rte_free(vq->shadow_used_ring);
-                       vq->shadow_used_ring = new_shadow_used_ring;
+               if (vq_is_packed(dev)) {
+                       new_shadow_used_packed = rte_malloc_socket(NULL,
+                                       vq->size *
+                                       sizeof(struct vring_used_elem_packed),
+                                       RTE_CACHE_LINE_SIZE,
+                                       newnode);
+                       if (new_shadow_used_packed) {
+                               rte_free(vq->shadow_used_packed);
+                               vq->shadow_used_packed = new_shadow_used_packed;
+                       }
+               } else {
+                       new_shadow_used_split = rte_malloc_socket(NULL,
+                                       vq->size *
+                                       sizeof(struct vring_used_elem),
+                                       RTE_CACHE_LINE_SIZE,
+                                       newnode);
+                       if (new_shadow_used_split) {
+                               rte_free(vq->shadow_used_split);
+                               vq->shadow_used_split = new_shadow_used_split;
+                       }
                }
 
                new_batch_copy_elems = rte_malloc_socket(NULL,
@@ -394,21 +457,26 @@ numa_realloc(struct virtio_net *dev, int index __rte_unused)
 
 /* Converts QEMU virtual address to Vhost virtual address. */
 static uint64_t
-qva_to_vva(struct virtio_net *dev, uint64_t qva)
+qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len)
 {
-       struct rte_vhost_mem_region *reg;
+       struct rte_vhost_mem_region *r;
        uint32_t i;
 
        /* Find the region where the address lives. */
        for (i = 0; i < dev->mem->nregions; i++) {
-               reg = &dev->mem->regions[i];
+               r = &dev->mem->regions[i];
+
+               if (qva >= r->guest_user_addr &&
+                   qva <  r->guest_user_addr + r->size) {
 
-               if (qva >= reg->guest_user_addr &&
-                   qva <  reg->guest_user_addr + reg->size) {
-                       return qva - reg->guest_user_addr +
-                              reg->host_user_addr;
+                       if (unlikely(*len > r->guest_user_addr + r->size - qva))
+                               *len = r->guest_user_addr + r->size - qva;
+
+                       return qva - r->guest_user_addr +
+                              r->host_user_addr;
                }
        }
+       *len = 0;
 
        return 0;
 }
@@ -421,20 +489,20 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva)
  */
 static uint64_t
 ring_addr_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
-               uint64_t ra, uint64_t size)
+               uint64_t ra, uint64_t *size)
 {
        if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) {
                uint64_t vva;
 
                vva = vhost_user_iotlb_cache_find(vq, ra,
-                                       &size, VHOST_ACCESS_RW);
+                                       size, VHOST_ACCESS_RW);
                if (!vva)
                        vhost_user_iotlb_miss(dev, ra, VHOST_ACCESS_RW);
 
                return vva;
        }
 
-       return qva_to_vva(dev, ra);
+       return qva_to_vva(dev, ra, size);
 }
 
 static struct virtio_net *
@@ -442,16 +510,63 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
 {
        struct vhost_virtqueue *vq = dev->virtqueue[vq_index];
        struct vhost_vring_addr *addr = &vq->ring_addrs;
+       uint64_t len;
+
+       if (vq_is_packed(dev)) {
+               len = sizeof(struct vring_packed_desc) * vq->size;
+               vq->desc_packed = (struct vring_packed_desc *)(uintptr_t)
+                       ring_addr_to_vva(dev, vq, addr->desc_user_addr, &len);
+               vq->log_guest_addr = 0;
+               if (vq->desc_packed == NULL ||
+                               len != sizeof(struct vring_packed_desc) *
+                               vq->size) {
+                       RTE_LOG(DEBUG, VHOST_CONFIG,
+                               "(%d) failed to map desc_packed ring.\n",
+                               dev->vid);
+                       return dev;
+               }
+
+               dev = numa_realloc(dev, vq_index);
+               vq = dev->virtqueue[vq_index];
+               addr = &vq->ring_addrs;
+
+               len = sizeof(struct vring_packed_desc_event);
+               vq->driver_event = (struct vring_packed_desc_event *)
+                                       (uintptr_t)ring_addr_to_vva(dev,
+                                       vq, addr->avail_user_addr, &len);
+               if (vq->driver_event == NULL ||
+                               len != sizeof(struct vring_packed_desc_event)) {
+                       RTE_LOG(DEBUG, VHOST_CONFIG,
+                               "(%d) failed to find driver area address.\n",
+                               dev->vid);
+                       return dev;
+               }
+
+               len = sizeof(struct vring_packed_desc_event);
+               vq->device_event = (struct vring_packed_desc_event *)
+                                       (uintptr_t)ring_addr_to_vva(dev,
+                                       vq, addr->used_user_addr, &len);
+               if (vq->device_event == NULL ||
+                               len != sizeof(struct vring_packed_desc_event)) {
+                       RTE_LOG(DEBUG, VHOST_CONFIG,
+                               "(%d) failed to find device area address.\n",
+                               dev->vid);
+                       return dev;
+               }
+
+               return dev;
+       }
 
        /* The addresses are converted from QEMU virtual to Vhost virtual. */
        if (vq->desc && vq->avail && vq->used)
                return dev;
 
+       len = sizeof(struct vring_desc) * vq->size;
        vq->desc = (struct vring_desc *)(uintptr_t)ring_addr_to_vva(dev,
-                       vq, addr->desc_user_addr, sizeof(struct vring_desc));
-       if (vq->desc == 0) {
+                       vq, addr->desc_user_addr, &len);
+       if (vq->desc == 0 || len != sizeof(struct vring_desc) * vq->size) {
                RTE_LOG(DEBUG, VHOST_CONFIG,
-                       "(%d) failed to find desc ring address.\n",
+                       "(%d) failed to map desc ring.\n",
                        dev->vid);
                return dev;
        }
@@ -460,20 +575,26 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
        vq = dev->virtqueue[vq_index];
        addr = &vq->ring_addrs;
 
+       len = sizeof(struct vring_avail) + sizeof(uint16_t) * vq->size;
        vq->avail = (struct vring_avail *)(uintptr_t)ring_addr_to_vva(dev,
-                       vq, addr->avail_user_addr, sizeof(struct vring_avail));
-       if (vq->avail == 0) {
+                       vq, addr->avail_user_addr, &len);
+       if (vq->avail == 0 ||
+                       len != sizeof(struct vring_avail) +
+                       sizeof(uint16_t) * vq->size) {
                RTE_LOG(DEBUG, VHOST_CONFIG,
-                       "(%d) failed to find avail ring address.\n",
+                       "(%d) failed to map avail ring.\n",
                        dev->vid);
                return dev;
        }
 
+       len = sizeof(struct vring_used) +
+               sizeof(struct vring_used_elem) * vq->size;
        vq->used = (struct vring_used *)(uintptr_t)ring_addr_to_vva(dev,
-                       vq, addr->used_user_addr, sizeof(struct vring_used));
-       if (vq->used == 0) {
+                       vq, addr->used_user_addr, &len);
+       if (vq->used == 0 || len != sizeof(struct vring_used) +
+                       sizeof(struct vring_used_elem) * vq->size) {
                RTE_LOG(DEBUG, VHOST_CONFIG,
-                       "(%d) failed to find used ring address.\n",
+                       "(%d) failed to map used ring.\n",
                        dev->vid);
                return dev;
        }
@@ -489,13 +610,13 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
 
        vq->log_guest_addr = addr->log_guest_addr;
 
-       LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",
+       VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",
                        dev->vid, vq->desc);
-       LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address avail: %p\n",
+       VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address avail: %p\n",
                        dev->vid, vq->avail);
-       LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address used: %p\n",
+       VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address used: %p\n",
                        dev->vid, vq->used);
-       LOG_DEBUG(VHOST_CONFIG, "(%d) log_guest_addr: %" PRIx64 "\n",
+       VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) log_guest_addr: %" PRIx64 "\n",
                        dev->vid, vq->log_guest_addr);
 
        return dev;
@@ -506,14 +627,14 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
  * This function then converts these to our address space.
  */
 static int
-vhost_user_set_vring_addr(struct virtio_net **pdev, VhostUserMsg *msg)
+vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        struct vhost_virtqueue *vq;
        struct vhost_vring_addr *addr = &msg->payload.addr;
-       struct virtio_net *dev = *pdev;
 
        if (dev->mem == NULL)
-               return -1;
+               return VH_RESULT_ERR;
 
        /* addr->index refers to the queue index. The txq 1, rxq is 0. */
        vq = dev->virtqueue[msg->payload.addr.index];
@@ -530,27 +651,28 @@ vhost_user_set_vring_addr(struct virtio_net **pdev, VhostUserMsg *msg)
                                (1ULL << VHOST_USER_F_PROTOCOL_FEATURES))) {
                dev = translate_ring_addresses(dev, msg->payload.addr.index);
                if (!dev)
-                       return -1;
+                       return VH_RESULT_ERR;
 
                *pdev = dev;
        }
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
 /*
  * The virtio device sends us the available ring last used index.
  */
 static int
-vhost_user_set_vring_base(struct virtio_net *dev,
-                         VhostUserMsg *msg)
+vhost_user_set_vring_base(struct virtio_net **pdev,
+                         struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        dev->virtqueue[msg->payload.state.index]->last_used_idx  =
                        msg->payload.state.num;
        dev->virtqueue[msg->payload.state.index]->last_avail_idx =
                        msg->payload.state.num;
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
 static int
@@ -675,21 +797,23 @@ vhost_memory_changed(struct VhostUserMemory *new,
 }
 
 static int
-vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
+vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
-       struct VhostUserMemory memory = pmsg->payload.memory;
+       struct virtio_net *dev = *pdev;
+       struct VhostUserMemory memory = msg->payload.memory;
        struct rte_vhost_mem_region *reg;
        void *mmap_addr;
        uint64_t mmap_size;
        uint64_t mmap_offset;
        uint64_t alignment;
        uint32_t i;
+       int populate;
        int fd;
 
        if (memory.nregions > VHOST_MEMORY_MAX_NREGIONS) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "too many memory regions (%u)\n", memory.nregions);
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        if (dev->mem && !vhost_memory_changed(&memory, dev->mem)) {
@@ -697,9 +821,9 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
                        "(%d) memory regions not changed\n", dev->vid);
 
                for (i = 0; i < memory.nregions; i++)
-                       close(pmsg->fds[i]);
+                       close(msg->fds[i]);
 
-               return 0;
+               return VH_RESULT_OK;
        }
 
        if (dev->mem) {
@@ -708,6 +832,11 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
                dev->mem = NULL;
        }
 
+       /* Flush IOTLB cache as previous HVAs are now invalid */
+       if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
+               for (i = 0; i < dev->nr_vring; i++)
+                       vhost_user_iotlb_flush_all(dev->virtqueue[i]);
+
        dev->nr_guest_pages = 0;
        if (!dev->guest_pages) {
                dev->max_guest_pages = 8;
@@ -718,7 +847,7 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
                                "(%d) failed to allocate memory "
                                "for dev->guest_pages\n",
                                dev->vid);
-                       return -1;
+                       return VH_RESULT_ERR;
                }
        }
 
@@ -728,12 +857,12 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
                RTE_LOG(ERR, VHOST_CONFIG,
                        "(%d) failed to allocate memory for dev->mem\n",
                        dev->vid);
-               return -1;
+               return VH_RESULT_ERR;
        }
        dev->mem->nregions = memory.nregions;
 
        for (i = 0; i < memory.nregions; i++) {
-               fd  = pmsg->fds[i];
+               fd  = msg->fds[i];
                reg = &dev->mem->regions[i];
 
                reg->guest_phys_addr = memory.regions[i].guest_phys_addr;
@@ -770,8 +899,9 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
                }
                mmap_size = RTE_ALIGN_CEIL(mmap_size, alignment);
 
+               populate = (dev->dequeue_zero_copy) ? MAP_POPULATE : 0;
                mmap_addr = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,
-                                MAP_SHARED | MAP_POPULATE, fd, 0);
+                                MAP_SHARED | populate, fd, 0);
 
                if (mmap_addr == MAP_FAILED) {
                        RTE_LOG(ERR, VHOST_CONFIG,
@@ -811,21 +941,50 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)
                        mmap_offset);
        }
 
+       for (i = 0; i < dev->nr_vring; i++) {
+               struct vhost_virtqueue *vq = dev->virtqueue[i];
+
+               if (vq->desc || vq->avail || vq->used) {
+                       /*
+                        * If the memory table got updated, the ring addresses
+                        * need to be translated again as virtual addresses have
+                        * changed.
+                        */
+                       vring_invalidate(dev, vq);
+
+                       dev = translate_ring_addresses(dev, i);
+                       if (!dev)
+                               return VH_RESULT_ERR;
+
+                       *pdev = dev;
+               }
+       }
+
        dump_guest_pages(dev);
 
-       return 0;
+       return VH_RESULT_OK;
 
 err_mmap:
        free_mem_region(dev);
        rte_free(dev->mem);
        dev->mem = NULL;
-       return -1;
+       return VH_RESULT_ERR;
 }
 
-static int
-vq_is_ready(struct vhost_virtqueue *vq)
+static bool
+vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)
 {
-       return vq && vq->desc && vq->avail && vq->used &&
+       bool rings_ok;
+
+       if (!vq)
+               return false;
+
+       if (vq_is_packed(dev))
+               rings_ok = !!vq->desc_packed;
+       else
+               rings_ok = vq->desc && vq->avail && vq->used;
+
+       return rings_ok &&
               vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD &&
               vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD;
 }
@@ -842,7 +1001,7 @@ virtio_is_ready(struct virtio_net *dev)
        for (i = 0; i < dev->nr_vring; i++) {
                vq = dev->virtqueue[i];
 
-               if (!vq_is_ready(vq))
+               if (!vq_is_ready(dev, vq))
                        return 0;
        }
 
@@ -851,17 +1010,18 @@ virtio_is_ready(struct virtio_net *dev)
        return 1;
 }
 
-static void
-vhost_user_set_vring_call(struct virtio_net *dev, struct VhostUserMsg *pmsg)
+static int
+vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        struct vhost_vring_file file;
        struct vhost_virtqueue *vq;
 
-       file.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
-       if (pmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)
+       file.index = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
+       if (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)
                file.fd = VIRTIO_INVALID_EVENTFD;
        else
-               file.fd = pmsg->fds[0];
+               file.fd = msg->fds[0];
        RTE_LOG(INFO, VHOST_CONFIG,
                "vring call idx:%d file:%d\n", file.index, file.fd);
 
@@ -870,27 +1030,39 @@ vhost_user_set_vring_call(struct virtio_net *dev, struct VhostUserMsg *pmsg)
                close(vq->callfd);
 
        vq->callfd = file.fd;
+
+       return VH_RESULT_OK;
 }
 
-static void
-vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *pmsg)
+static int vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused,
+                       struct VhostUserMsg *msg)
+{
+       if (!(msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK))
+               close(msg->fds[0]);
+       RTE_LOG(INFO, VHOST_CONFIG, "not implemented\n");
+
+       return VH_RESULT_OK;
+}
+
+static int
+vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        struct vhost_vring_file file;
        struct vhost_virtqueue *vq;
-       struct virtio_net *dev = *pdev;
 
-       file.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
-       if (pmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)
+       file.index = msg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
+       if (msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK)
                file.fd = VIRTIO_INVALID_EVENTFD;
        else
-               file.fd = pmsg->fds[0];
+               file.fd = msg->fds[0];
        RTE_LOG(INFO, VHOST_CONFIG,
                "vring kick idx:%d file:%d\n", file.index, file.fd);
 
        /* Interpret ring addresses only when ring is started. */
        dev = translate_ring_addresses(dev, file.index);
        if (!dev)
-               return;
+               return VH_RESULT_ERR;
 
        *pdev = dev;
 
@@ -907,6 +1079,8 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *pmsg)
        if (vq->kickfd >= 0)
                close(vq->kickfd);
        vq->kickfd = file.fd;
+
+       return VH_RESULT_OK;
 }
 
 static void
@@ -929,21 +1103,20 @@ free_zmbufs(struct vhost_virtqueue *vq)
  * when virtio is stopped, qemu will send us the GET_VRING_BASE message.
  */
 static int
-vhost_user_get_vring_base(struct virtio_net *dev,
-                         VhostUserMsg *msg)
+vhost_user_get_vring_base(struct virtio_net **pdev,
+                         struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
 
        /* We have to stop the queue (virtio) if it is running. */
-       if (dev->flags & VIRTIO_DEV_RUNNING) {
-               dev->flags &= ~VIRTIO_DEV_RUNNING;
-               dev->notify_ops->destroy_device(dev->vid);
-       }
+       vhost_destroy_device_notify(dev);
 
        dev->flags &= ~VIRTIO_DEV_READY;
+       dev->flags &= ~VIRTIO_DEV_VDPA_CONFIGURED;
 
-       /* Here we are safe to get the last used index */
-       msg->payload.state.num = vq->last_used_idx;
+       /* Here we are safe to get the last avail index */
+       msg->payload.state.num = vq->last_avail_idx;
 
        RTE_LOG(INFO, VHOST_CONFIG,
                "vring base idx:%d file:%d\n", msg->payload.state.index,
@@ -965,13 +1138,20 @@ vhost_user_get_vring_base(struct virtio_net *dev,
 
        if (dev->dequeue_zero_copy)
                free_zmbufs(vq);
-       rte_free(vq->shadow_used_ring);
-       vq->shadow_used_ring = NULL;
+       if (vq_is_packed(dev)) {
+               rte_free(vq->shadow_used_packed);
+               vq->shadow_used_packed = NULL;
+       } else {
+               rte_free(vq->shadow_used_split);
+               vq->shadow_used_split = NULL;
+       }
 
        rte_free(vq->batch_copy_elems);
        vq->batch_copy_elems = NULL;
 
-       return 0;
+       msg->size = sizeof(msg->payload.state);
+
+       return VH_RESULT_REPLY;
 }
 
 /*
@@ -979,31 +1159,42 @@ vhost_user_get_vring_base(struct virtio_net *dev,
  * enable the virtio queue pair.
  */
 static int
-vhost_user_set_vring_enable(struct virtio_net *dev,
-                           VhostUserMsg *msg)
+vhost_user_set_vring_enable(struct virtio_net **pdev,
+                           struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        int enable = (int)msg->payload.state.num;
+       int index = (int)msg->payload.state.index;
+       struct rte_vdpa_device *vdpa_dev;
+       int did = -1;
 
        RTE_LOG(INFO, VHOST_CONFIG,
                "set queue enable: %d to qp idx: %d\n",
-               enable, msg->payload.state.index);
+               enable, index);
+
+       did = dev->vdpa_dev_id;
+       vdpa_dev = rte_vdpa_get_device(did);
+       if (vdpa_dev && vdpa_dev->ops->set_vring_state)
+               vdpa_dev->ops->set_vring_state(dev->vid, index, enable);
 
        if (dev->notify_ops->vring_state_changed)
                dev->notify_ops->vring_state_changed(dev->vid,
-                               msg->payload.state.index, enable);
+                               index, enable);
 
-       dev->virtqueue[msg->payload.state.index]->enabled = enable;
+       dev->virtqueue[index]->enabled = enable;
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
-static void
-vhost_user_get_protocol_features(struct virtio_net *dev,
+static int
+vhost_user_get_protocol_features(struct virtio_net **pdev,
                                 struct VhostUserMsg *msg)
 {
-       uint64_t features, protocol_features = VHOST_USER_PROTOCOL_FEATURES;
+       struct virtio_net *dev = *pdev;
+       uint64_t features, protocol_features;
 
        rte_vhost_driver_get_features(dev->ifname, &features);
+       rte_vhost_driver_get_protocol_features(dev->ifname, &protocol_features);
 
        /*
         * REPLY_ACK protocol feature is only mandatory for now
@@ -1016,35 +1207,46 @@ vhost_user_get_protocol_features(struct virtio_net *dev,
 
        msg->payload.u64 = protocol_features;
        msg->size = sizeof(msg->payload.u64);
+
+       return VH_RESULT_REPLY;
 }
 
-static void
-vhost_user_set_protocol_features(struct virtio_net *dev,
-                                uint64_t protocol_features)
+static int
+vhost_user_set_protocol_features(struct virtio_net **pdev,
+                                struct VhostUserMsg *msg)
 {
-       if (protocol_features & ~VHOST_USER_PROTOCOL_FEATURES)
-               return;
+       struct virtio_net *dev = *pdev;
+       uint64_t protocol_features = msg->payload.u64;
+       if (protocol_features & ~VHOST_USER_PROTOCOL_FEATURES) {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "(%d) received invalid protocol features.\n",
+                       dev->vid);
+               return VH_RESULT_ERR;
+       }
 
        dev->protocol_features = protocol_features;
+
+       return VH_RESULT_OK;
 }
 
 static int
-vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg)
+vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        int fd = msg->fds[0];
        uint64_t size, off;
        void *addr;
 
        if (fd < 0) {
                RTE_LOG(ERR, VHOST_CONFIG, "invalid log fd: %d\n", fd);
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        if (msg->size != sizeof(VhostUserLog)) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "invalid log base msg size: %"PRId32" != %d\n",
                        msg->size, (int)sizeof(VhostUserLog));
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        size = msg->payload.log.mmap_size;
@@ -1055,7 +1257,7 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg)
                RTE_LOG(ERR, VHOST_CONFIG,
                        "log offset %#"PRIx64" exceeds log size %#"PRIx64"\n",
                        off, size);
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        RTE_LOG(INFO, VHOST_CONFIG,
@@ -1070,7 +1272,7 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg)
        close(fd);
        if (addr == MAP_FAILED) {
                RTE_LOG(ERR, VHOST_CONFIG, "mmap log base failed!\n");
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        /*
@@ -1084,7 +1286,18 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg)
        dev->log_base = dev->log_addr + off;
        dev->log_size = size;
 
-       return 0;
+       msg->size = sizeof(msg->payload.u64);
+
+       return VH_RESULT_REPLY;
+}
+
+static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused,
+                       struct VhostUserMsg *msg)
+{
+       close(msg->fds[0]);
+       RTE_LOG(INFO, VHOST_CONFIG, "not implemented.\n");
+
+       return VH_RESULT_OK;
 }
 
 /*
@@ -1096,9 +1309,12 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg)
  * a flag 'broadcast_rarp' to let rte_vhost_dequeue_burst() inject it.
  */
 static int
-vhost_user_send_rarp(struct virtio_net *dev, struct VhostUserMsg *msg)
+vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        uint8_t *mac = (uint8_t *)&msg->payload.u64;
+       struct rte_vdpa_device *vdpa_dev;
+       int did = -1;
 
        RTE_LOG(DEBUG, VHOST_CONFIG,
                ":: mac: %02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -1114,41 +1330,47 @@ vhost_user_send_rarp(struct virtio_net *dev, struct VhostUserMsg *msg)
         */
        rte_smp_wmb();
        rte_atomic16_set(&dev->broadcast_rarp, 1);
+       did = dev->vdpa_dev_id;
+       vdpa_dev = rte_vdpa_get_device(did);
+       if (vdpa_dev && vdpa_dev->ops->migration_done)
+               vdpa_dev->ops->migration_done(dev->vid);
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
 static int
-vhost_user_net_set_mtu(struct virtio_net *dev, struct VhostUserMsg *msg)
+vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        if (msg->payload.u64 < VIRTIO_MIN_MTU ||
                        msg->payload.u64 > VIRTIO_MAX_MTU) {
                RTE_LOG(ERR, VHOST_CONFIG, "Invalid MTU size (%"PRIu64")\n",
                                msg->payload.u64);
 
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        dev->mtu = msg->payload.u64;
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
 static int
-vhost_user_set_req_fd(struct virtio_net *dev, struct VhostUserMsg *msg)
+vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg)
 {
+       struct virtio_net *dev = *pdev;
        int fd = msg->fds[0];
 
        if (fd < 0) {
                RTE_LOG(ERR, VHOST_CONFIG,
                                "Invalid file descriptor for slave channel (%d)\n",
                                fd);
-               return -1;
+               return VH_RESULT_ERR;
        }
 
        dev->slave_req_fd = fd;
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
 static int
@@ -1206,19 +1428,20 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg)
        struct virtio_net *dev = *pdev;
        struct vhost_iotlb_msg *imsg = &msg->payload.iotlb;
        uint16_t i;
-       uint64_t vva;
+       uint64_t vva, len;
 
        switch (imsg->type) {
        case VHOST_IOTLB_UPDATE:
-               vva = qva_to_vva(dev, imsg->uaddr);
+               len = imsg->size;
+               vva = qva_to_vva(dev, imsg->uaddr, &len);
                if (!vva)
-                       return -1;
+                       return VH_RESULT_ERR;
 
                for (i = 0; i < dev->nr_vring; i++) {
                        struct vhost_virtqueue *vq = dev->virtqueue[i];
 
                        vhost_user_iotlb_cache_insert(vq, imsg->iova, vva,
-                                       imsg->size, imsg->perm);
+                                       len, imsg->perm);
 
                        if (is_vring_iotlb_update(vq, imsg))
                                *pdev = dev = translate_ring_addresses(dev, i);
@@ -1238,12 +1461,41 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg)
        default:
                RTE_LOG(ERR, VHOST_CONFIG, "Invalid IOTLB message type (%d)\n",
                                imsg->type);
-               return -1;
+               return VH_RESULT_ERR;
        }
 
-       return 0;
+       return VH_RESULT_OK;
 }
 
+typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
+                                       struct VhostUserMsg *msg);
+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,
+};
+
+
 /* return bytes# of read on success or negative val on failure. */
 static int
 read_vhost_message(int sockfd, struct VhostUserMsg *msg)
@@ -1275,13 +1527,13 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
 }
 
 static int
-send_vhost_message(int sockfd, struct VhostUserMsg *msg)
+send_vhost_message(int sockfd, struct VhostUserMsg *msg, int *fds, int fd_num)
 {
        if (!msg)
                return 0;
 
        return send_fd_message(sockfd, (char *)msg,
-               VHOST_USER_HDR_SIZE + msg->size, NULL, 0);
+               VHOST_USER_HDR_SIZE + msg->size, fds, fd_num);
 }
 
 static int
@@ -1295,14 +1547,31 @@ send_vhost_reply(int sockfd, struct VhostUserMsg *msg)
        msg->flags |= VHOST_USER_VERSION;
        msg->flags |= VHOST_USER_REPLY_MASK;
 
-       return send_vhost_message(sockfd, msg);
+       return send_vhost_message(sockfd, msg, NULL, 0);
+}
+
+static int
+send_vhost_slave_message(struct virtio_net *dev, struct VhostUserMsg *msg,
+                        int *fds, int fd_num)
+{
+       int ret;
+
+       if (msg->flags & VHOST_USER_NEED_REPLY)
+               rte_spinlock_lock(&dev->slave_req_lock);
+
+       ret = send_vhost_message(dev->slave_req_fd, msg, fds, fd_num);
+       if (ret < 0 && (msg->flags & VHOST_USER_NEED_REPLY))
+               rte_spinlock_unlock(&dev->slave_req_lock);
+
+       return ret;
 }
 
 /*
  * Allocate a queue pair if it hasn't been allocated yet
  */
 static int
-vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev, VhostUserMsg *msg)
+vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev,
+                       struct VhostUserMsg *msg)
 {
        uint16_t vring_idx;
 
@@ -1375,8 +1644,12 @@ vhost_user_msg_handler(int vid, int fd)
 {
        struct virtio_net *dev;
        struct VhostUserMsg msg;
+       struct rte_vdpa_device *vdpa_dev;
+       int did = -1;
        int ret;
        int unlock_required = 0;
+       uint32_t skip_master = 0;
+       int request;
 
        dev = get_device(vid);
        if (dev == NULL)
@@ -1454,116 +1727,70 @@ vhost_user_msg_handler(int vid, int fd)
 
        }
 
-       switch (msg.request.master) {
-       case VHOST_USER_GET_FEATURES:
-               msg.payload.u64 = vhost_user_get_features(dev);
-               msg.size = sizeof(msg.payload.u64);
-               send_vhost_reply(fd, &msg);
-               break;
-       case VHOST_USER_SET_FEATURES:
-               ret = vhost_user_set_features(dev, msg.payload.u64);
-               if (ret)
-                       return -1;
-               break;
-
-       case VHOST_USER_GET_PROTOCOL_FEATURES:
-               vhost_user_get_protocol_features(dev, &msg);
-               send_vhost_reply(fd, &msg);
-               break;
-       case VHOST_USER_SET_PROTOCOL_FEATURES:
-               vhost_user_set_protocol_features(dev, msg.payload.u64);
-               break;
-
-       case VHOST_USER_SET_OWNER:
-               vhost_user_set_owner();
-               break;
-       case VHOST_USER_RESET_OWNER:
-               vhost_user_reset_owner(dev);
-               break;
-
-       case VHOST_USER_SET_MEM_TABLE:
-               ret = vhost_user_set_mem_table(dev, &msg);
-               break;
-
-       case VHOST_USER_SET_LOG_BASE:
-               vhost_user_set_log_base(dev, &msg);
-
-               /* it needs a reply */
-               msg.size = sizeof(msg.payload.u64);
-               send_vhost_reply(fd, &msg);
-               break;
-       case VHOST_USER_SET_LOG_FD:
-               close(msg.fds[0]);
-               RTE_LOG(INFO, VHOST_CONFIG, "not implemented.\n");
-               break;
-
-       case VHOST_USER_SET_VRING_NUM:
-               vhost_user_set_vring_num(dev, &msg);
-               break;
-       case VHOST_USER_SET_VRING_ADDR:
-               vhost_user_set_vring_addr(&dev, &msg);
-               break;
-       case VHOST_USER_SET_VRING_BASE:
-               vhost_user_set_vring_base(dev, &msg);
-               break;
-
-       case VHOST_USER_GET_VRING_BASE:
-               vhost_user_get_vring_base(dev, &msg);
-               msg.size = sizeof(msg.payload.state);
-               send_vhost_reply(fd, &msg);
-               break;
-
-       case VHOST_USER_SET_VRING_KICK:
-               vhost_user_set_vring_kick(&dev, &msg);
-               break;
-       case VHOST_USER_SET_VRING_CALL:
-               vhost_user_set_vring_call(dev, &msg);
-               break;
-
-       case VHOST_USER_SET_VRING_ERR:
-               if (!(msg.payload.u64 & VHOST_USER_VRING_NOFD_MASK))
-                       close(msg.fds[0]);
-               RTE_LOG(INFO, VHOST_CONFIG, "not implemented\n");
-               break;
-
-       case VHOST_USER_GET_QUEUE_NUM:
-               msg.payload.u64 = VHOST_MAX_QUEUE_PAIRS;
-               msg.size = sizeof(msg.payload.u64);
-               send_vhost_reply(fd, &msg);
-               break;
-
-       case VHOST_USER_SET_VRING_ENABLE:
-               vhost_user_set_vring_enable(dev, &msg);
-               break;
-       case VHOST_USER_SEND_RARP:
-               vhost_user_send_rarp(dev, &msg);
-               break;
-
-       case VHOST_USER_NET_SET_MTU:
-               ret = vhost_user_net_set_mtu(dev, &msg);
-               break;
+       if (dev->extern_ops.pre_msg_handle) {
+               ret = (*dev->extern_ops.pre_msg_handle)(dev->vid,
+                               (void *)&msg, &skip_master);
+               if (ret == VH_RESULT_ERR)
+                       goto skip_to_reply;
+               else if (ret == VH_RESULT_REPLY)
+                       send_vhost_reply(fd, &msg);
 
-       case VHOST_USER_SET_SLAVE_REQ_FD:
-               ret = vhost_user_set_req_fd(dev, &msg);
-               break;
+               if (skip_master)
+                       goto skip_to_post_handle;
+       }
 
-       case VHOST_USER_IOTLB_MSG:
-               ret = vhost_user_iotlb_msg(&dev, &msg);
-               break;
+       request = msg.request.master;
+       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);
 
-       default:
-               ret = -1;
-               break;
+               switch (ret) {
+               case VH_RESULT_ERR:
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                               "Processing %s failed.\n",
+                               vhost_message_str[request]);
+                       break;
+               case VH_RESULT_OK:
+                       RTE_LOG(DEBUG, VHOST_CONFIG,
+                               "Processing %s succeeded.\n",
+                               vhost_message_str[request]);
+                       break;
+               case VH_RESULT_REPLY:
+                       RTE_LOG(DEBUG, VHOST_CONFIG,
+                               "Processing %s succeeded and needs reply.\n",
+                               vhost_message_str[request]);
+                       send_vhost_reply(fd, &msg);
+                       break;
+               }
+       } else {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "Requested invalid message type %d.\n", request);
+               ret = VH_RESULT_ERR;
+       }
 
+skip_to_post_handle:
+       if (ret != VH_RESULT_ERR && dev->extern_ops.post_msg_handle) {
+               ret = (*dev->extern_ops.post_msg_handle)(
+                               dev->vid, (void *)&msg);
+               if (ret == VH_RESULT_ERR)
+                       goto skip_to_reply;
+               else if (ret == VH_RESULT_REPLY)
+                       send_vhost_reply(fd, &msg);
        }
 
+skip_to_reply:
        if (unlock_required)
                vhost_user_unlock_all_queue_pairs(dev);
 
        if (msg.flags & VHOST_USER_NEED_REPLY) {
-               msg.payload.u64 = !!ret;
+               msg.payload.u64 = ret == VH_RESULT_ERR;
                msg.size = sizeof(msg.payload.u64);
                send_vhost_reply(fd, &msg);
+       } else if (ret == VH_RESULT_ERR) {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "vhost message handling failed.\n");
+               return -1;
        }
 
        if (!(dev->flags & VIRTIO_DEV_RUNNING) && virtio_is_ready(dev)) {
@@ -1580,9 +1807,53 @@ vhost_user_msg_handler(int vid, int fd)
                }
        }
 
+       did = dev->vdpa_dev_id;
+       vdpa_dev = rte_vdpa_get_device(did);
+       if (vdpa_dev && virtio_is_ready(dev) &&
+                       !(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED) &&
+                       msg.request.master == VHOST_USER_SET_VRING_ENABLE) {
+               if (vdpa_dev->ops->dev_conf)
+                       vdpa_dev->ops->dev_conf(dev->vid);
+               dev->flags |= VIRTIO_DEV_VDPA_CONFIGURED;
+               if (vhost_user_host_notifier_ctrl(dev->vid, true) != 0) {
+                       RTE_LOG(INFO, VHOST_CONFIG,
+                               "(%d) software relay is used for vDPA, performance may be low.\n",
+                               dev->vid);
+               }
+       }
+
        return 0;
 }
 
+static int process_slave_message_reply(struct virtio_net *dev,
+                                      const struct VhostUserMsg *msg)
+{
+       struct VhostUserMsg msg_reply;
+       int ret;
+
+       if ((msg->flags & VHOST_USER_NEED_REPLY) == 0)
+               return 0;
+
+       if (read_vhost_message(dev->slave_req_fd, &msg_reply) < 0) {
+               ret = -1;
+               goto out;
+       }
+
+       if (msg_reply.request.slave != msg->request.slave) {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "Received unexpected msg type (%u), expected %u\n",
+                       msg_reply.request.slave, msg->request.slave);
+               ret = -1;
+               goto out;
+       }
+
+       ret = msg_reply.payload.u64 ? -1 : 0;
+
+out:
+       rte_spinlock_unlock(&dev->slave_req_lock);
+       return ret;
+}
+
 int
 vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
 {
@@ -1598,7 +1869,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
                },
        };
 
-       ret = send_vhost_message(dev->slave_req_fd, &msg);
+       ret = send_vhost_message(dev->slave_req_fd, &msg, NULL, 0);
        if (ret < 0) {
                RTE_LOG(ERR, VHOST_CONFIG,
                                "Failed to send IOTLB miss message (%d)\n",
@@ -1608,3 +1879,101 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
 
        return 0;
 }
+
+static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,
+                                                   int index, int fd,
+                                                   uint64_t offset,
+                                                   uint64_t size)
+{
+       int *fdp = NULL;
+       size_t fd_num = 0;
+       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,
+               },
+       };
+
+       if (fd < 0)
+               msg.payload.area.u64 |= VHOST_USER_VRING_NOFD_MASK;
+       else {
+               fdp = &fd;
+               fd_num = 1;
+       }
+
+       ret = send_vhost_slave_message(dev, &msg, fdp, fd_num);
+       if (ret < 0) {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "Failed to set host notifier (%d)\n", ret);
+               return ret;
+       }
+
+       return process_slave_message_reply(dev, &msg);
+}
+
+int vhost_user_host_notifier_ctrl(int vid, bool enable)
+{
+       struct virtio_net *dev;
+       struct rte_vdpa_device *vdpa_dev;
+       int vfio_device_fd, did, ret = 0;
+       uint64_t offset, size;
+       unsigned int i;
+
+       dev = get_device(vid);
+       if (!dev)
+               return -ENODEV;
+
+       did = dev->vdpa_dev_id;
+       if (did < 0)
+               return -EINVAL;
+
+       if (!(dev->features & (1ULL << VIRTIO_F_VERSION_1)) ||
+           !(dev->features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) ||
+           !(dev->protocol_features &
+                       (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ)) ||
+           !(dev->protocol_features &
+                       (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) ||
+           !(dev->protocol_features &
+                       (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER)))
+               return -ENOTSUP;
+
+       vdpa_dev = rte_vdpa_get_device(did);
+       if (!vdpa_dev)
+               return -ENODEV;
+
+       RTE_FUNC_PTR_OR_ERR_RET(vdpa_dev->ops->get_vfio_device_fd, -ENOTSUP);
+       RTE_FUNC_PTR_OR_ERR_RET(vdpa_dev->ops->get_notify_area, -ENOTSUP);
+
+       vfio_device_fd = vdpa_dev->ops->get_vfio_device_fd(vid);
+       if (vfio_device_fd < 0)
+               return -ENOTSUP;
+
+       if (enable) {
+               for (i = 0; i < dev->nr_vring; i++) {
+                       if (vdpa_dev->ops->get_notify_area(vid, i, &offset,
+                                       &size) < 0) {
+                               ret = -ENOTSUP;
+                               goto disable;
+                       }
+
+                       if (vhost_user_slave_set_vring_host_notifier(dev, i,
+                                       vfio_device_fd, offset, size) < 0) {
+                               ret = -EFAULT;
+                               goto disable;
+                       }
+               }
+       } else {
+disable:
+               for (i = 0; i < dev->nr_vring; i++) {
+                       vhost_user_slave_set_vring_host_notifier(dev, i, -1,
+                                       0, 0);
+               }
+       }
+
+       return ret;
+}