The following changes since commit 7fe7fae8b48e3f9c647fd685e5155ebc8e6fb84d:

Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210609a' into staging (2021-06-09 16:40:21 +0100)

for you to fetch changes up to 5a2d9929ac1f01a1e8ef2a3f56f69e6069863dad:

Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() (2021-06-11 10:30:13 +0800)

Jason Wang (4):

vhost-vdpa: skip ram device from the IOTLB mapping

vhost-vdpa: map virtqueue notification area if possible

vhost-vdpa: don't initialize backend_features

vhost-vdpa: remove the unused vhost_vdpa_get_acked_features()

Paolo Bonzini (1):

netdev: add more commands to preconfig mode

Rao, Lei (7):

Remove some duplicate trace code.

Fix the qemu crash when guest shutdown during checkpoint

Optimize the function of filter_send

Remove migrate_set_block_enabled in checkpoint

Add a function named packet_new_nocopy for COLO.

Add the function of colo_compare_cleanup

Fixed calculation error of pkt->header_size in fill_pkt_tcp_info()

hmp-commands.hx | 2 +

hw/virtio/vhost-vdpa.c | 100 +++++++++++++++++++++++++++++++++++------

include/hw/virtio/vhost-vdpa.h | 6 +++

include/net/vhost-vdpa.h | 1 -

migration/colo.c | 6 ---

migration/migration.c | 4 ++

net/colo-compare.c | 25 +++++------

net/colo-compare.h | 1 +

net/colo.c | 25 +++++++----

net/colo.h | 1 +

net/filter-mirror.c | 8 ++--

net/filter-rewriter.c | 3 +-

net/net.c | 4 ++

net/vhost-vdpa.c | 9 ----

qapi/net.json | 6 ++-

softmmu/runstate.c | 1 +

16 files changed, 143 insertions(+), 59 deletions(-)

This patch implements the vq notification mapping support for

vhost-vDPA. This is simply done by using mmap()/munmap() for the

vhost-vDPA fd during device start/stop. For the device without

notification mapping support, we fall back to eventfd based

notification gracefully.

Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com>

hw/virtio/vhost-vdpa.c | 85 ++++++++++++++++++++++++++++++++++++++++++

include/hw/virtio/vhost-vdpa.h | 6 +++

2 files changed, 91 insertions(+)

diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/vhost-vdpa.c

+++ b/hw/virtio/vhost-vdpa.c

@@ -XXX,XX +XXX,XX @@ static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque)

return 0;

}

+static void vhost_vdpa_host_notifier_uninit(struct vhost_dev *dev,

+ int queue_index)

+{

+ size_t page_size = qemu_real_host_page_size;

+ struct vhost_vdpa *v = dev->opaque;

+ VirtIODevice *vdev = dev->vdev;

+ VhostVDPAHostNotifier *n;

+ n = &v->notifier[queue_index];

+ if (n->addr) {

+ virtio_queue_set_host_notifier_mr(vdev, queue_index, &n->mr, false);

+ object_unparent(OBJECT(&n->mr));

+ munmap(n->addr, page_size);

+ n->addr = NULL;

+static void vhost_vdpa_host_notifiers_uninit(struct vhost_dev *dev, int n)

+ int i;

+

+ for (i = 0; i < n; i++) {

+ vhost_vdpa_host_notifier_uninit(dev, i);

+ }

+static int vhost_vdpa_host_notifier_init(struct vhost_dev *dev, int queue_index)

+ size_t page_size = qemu_real_host_page_size;

+ struct vhost_vdpa *v = dev->opaque;

+ VirtIODevice *vdev = dev->vdev;

+ VhostVDPAHostNotifier *n;

+ int fd = v->device_fd;

+ void *addr;

+ char *name;

+ vhost_vdpa_host_notifier_uninit(dev, queue_index);

+

+ n = &v->notifier[queue_index];

+

+ addr = mmap(NULL, page_size, PROT_WRITE, MAP_SHARED, fd,

+ queue_index * page_size);

+ if (addr == MAP_FAILED) {

+ goto err;

+ name = g_strdup_printf("vhost-vdpa/host-notifier@%p mmaps[%d]",

+ v, queue_index);

+ memory_region_init_ram_device_ptr(&n->mr, OBJECT(vdev), name,

+ page_size, addr);

+ g_free(name);

+

+ if (virtio_queue_set_host_notifier_mr(vdev, queue_index, &n->mr, true)) {

+ munmap(addr, page_size);

+ goto err;

+ }

+ n->addr = addr;

+

+ return 0;

+

+err:

+ return -1;

+}

+

+static void vhost_vdpa_host_notifiers_init(struct vhost_dev *dev)

+{

+ int i;

+

+ for (i = dev->vq_index; i < dev->vq_index + dev->nvqs; i++) {

+ if (vhost_vdpa_host_notifier_init(dev, i)) {

+ goto err;

+ }

+ return;

+err:

+ vhost_vdpa_host_notifiers_uninit(dev, i);

+ return;

static int vhost_vdpa_cleanup(struct vhost_dev *dev)

{

struct vhost_vdpa *v;

assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_VDPA);

v = dev->opaque;

trace_vhost_vdpa_cleanup(dev, v);

+ vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);

memory_listener_unregister(&v->listener);

dev->opaque = NULL;

@@ -XXX,XX +XXX,XX @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)

if (started) {

uint8_t status = 0;

memory_listener_register(&v->listener, &address_space_memory);

+ vhost_vdpa_host_notifiers_init(dev);

vhost_vdpa_set_vring_ready(dev);

vhost_vdpa_add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);

vhost_vdpa_call(dev, VHOST_VDPA_GET_STATUS, &status);

@@ -XXX,XX +XXX,XX @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)

vhost_vdpa_reset_device(dev);

vhost_vdpa_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE |

VIRTIO_CONFIG_S_DRIVER);

+ vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);

memory_listener_unregister(&v->listener);

return 0;

diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/virtio/vhost-vdpa.h

+++ b/include/hw/virtio/vhost-vdpa.h

@@ -XXX,XX +XXX,XX @@

#include "hw/virtio/virtio.h"

+typedef struct VhostVDPAHostNotifier {

+ MemoryRegion mr;

+ void *addr;

+} VhostVDPAHostNotifier;

typedef struct vhost_vdpa {

int device_fd;

uint32_t msg_type;

MemoryListener listener;

struct vhost_dev *dev;

+ VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX];

} VhostVDPA;

#endif

No user for this helper, let's remove it.

include/net/vhost-vdpa.h | 1 -

net/vhost-vdpa.c | 9 ---------

2 files changed, 10 deletions(-)

diff --git a/include/net/vhost-vdpa.h b/include/net/vhost-vdpa.h

--- a/include/net/vhost-vdpa.h

+++ b/include/net/vhost-vdpa.h