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()

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(-)

Creating and destroying network backend does not require a fully

constructed machine. Allow the related monitor commands to run before

machine initialization has concluded.

hmp-commands.hx | 2 ++

qapi/net.json | 6 ++++--

2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx

--- a/hmp-commands.hx

+++ b/hmp-commands.hx

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

.help = "add host network device",

.cmd = hmp_netdev_add,

.command_completion = netdev_add_completion,

+ .flags = "p",

},

SRST

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

.help = "remove host network device",

.cmd = hmp_netdev_del,

.command_completion = netdev_del_completion,

+ .flags = "p",

},

SRST

diff --git a/qapi/net.json b/qapi/net.json

--- a/qapi/net.json

+++ b/qapi/net.json

# <- { "return": {} }

#

##

-{ 'command': 'netdev_add', 'data': 'Netdev', 'boxed': true }

+{ 'command': 'netdev_add', 'data': 'Netdev', 'boxed': true,

+ 'allow-preconfig': true }

##

# @netdev_del:

# <- { "return": {} }

#

##

-{ 'command': 'netdev_del', 'data': {'id': 'str'} }

+{ 'command': 'netdev_del', 'data': {'id': 'str'},

+ 'allow-preconfig': true }

##

# @NetLegacyNicOptions:

From: "Rao, Lei" <lei.rao@intel.com>

The iov_size has been calculated in filter_send(). we can directly

return the size.In this way, this is no need to repeat calculations

in filter_redirector_receive_iov();

Signed-off-by: Lei Rao <lei.rao@intel.com>

Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>

Reviewed-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Lukas Straub <lukasstraub2@web.de>

Tested-by: Lukas Straub <lukasstraub2@web.de>

Signed-off-by: Zhang Chen <chen.zhang@intel.com>

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

diff --git a/net/filter-mirror.c b/net/filter-mirror.c

--- a/net/filter-mirror.c

+++ b/net/filter-mirror.c

@@ -XXX,XX +XXX,XX @@ static int filter_send(MirrorState *s,

goto err;

}

- return 0;

+ return size;

err:

return ret < 0 ? ret : -EIO;

@@ -XXX,XX +XXX,XX @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,

int ret;

ret = filter_send(s, iov, iovcnt);

- if (ret) {

+ if (ret < 0) {

error_report("filter mirror send failed(%s)", strerror(-ret));

}

@@ -XXX,XX +XXX,XX @@ static ssize_t filter_redirector_receive_iov(NetFilterState *nf,

if (qemu_chr_fe_backend_connected(&s->chr_out)) {

ret = filter_send(s, iov, iovcnt);

- if (ret) {

+ if (ret < 0) {

error_report("filter redirector send failed(%s)", strerror(-ret));

- return iov_size(iov, iovcnt);

+ return ret;

} else {

return 0;

}

From: "Rao, Lei" <lei.rao@intel.com>

Use the packet_new_nocopy instead of packet_new in the

filter-rewriter module. There will be one less memory

copy in the processing of each network packet.

Signed-off-by: Lei Rao <lei.rao@intel.com>

Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Zhang Chen <chen.zhang@intel.com>

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

net/colo.h | 1 +

net/filter-rewriter.c | 3 +--

3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/net/colo.c b/net/colo.c

--- a/net/colo.c

+++ b/net/colo.c

@@ -XXX,XX +XXX,XX @@ void connection_destroy(void *opaque)

Packet *packet_new(const void *data, int size, int vnet_hdr_len)

{

- Packet *pkt = g_slice_new(Packet);

+ Packet *pkt = g_slice_new0(Packet);

pkt->data = g_memdup(data, size);

pkt->size = size;

pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);

pkt->vnet_hdr_len = vnet_hdr_len;

- pkt->tcp_seq = 0;

- pkt->tcp_ack = 0;

- pkt->seq_end = 0;

- pkt->header_size = 0;

- pkt->payload_size = 0;

- pkt->offset = 0;

- pkt->flags = 0;

+

+ return pkt;

+}

+

+/*

+ * packet_new_nocopy will not copy data, so the caller can't release

+ * the data. And it will be released in packet_destroy.

+ */

+Packet *packet_new_nocopy(void *data, int size, int vnet_hdr_len)

+{

+ Packet *pkt = g_slice_new0(Packet);

+

+ pkt->data = data;

+ pkt->size = size;

+ pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);

+ pkt->vnet_hdr_len = vnet_hdr_len;

return pkt;

}

diff --git a/net/colo.h b/net/colo.h

index XXXXXXX..XXXXXXX 100644

--- a/net/colo.h

+++ b/net/colo.h

@@ -XXX,XX +XXX,XX @@ bool connection_has_tracked(GHashTable *connection_track_table,

ConnectionKey *key);

void connection_hashtable_reset(GHashTable *connection_track_table);

Packet *packet_new(const void *data, int size, int vnet_hdr_len);

+Packet *packet_new_nocopy(void *data, int size, int vnet_hdr_len);

void packet_destroy(void *opaque, void *user_data);

void packet_destroy_partial(void *opaque, void *user_data);

diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c

index XXXXXXX..XXXXXXX 100644

--- a/net/filter-rewriter.c

+++ b/net/filter-rewriter.c

@@ -XXX,XX +XXX,XX @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,

vnet_hdr_len = nf->netdev->vnet_hdr_len;

}

- pkt = packet_new(buf, size, vnet_hdr_len);

- g_free(buf);

+ pkt = packet_new_nocopy(buf, size, vnet_hdr_len);

/*

* if we get tcp packet

From: "Rao, Lei" <lei.rao@intel.com>

This patch fixes the following:

#0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50

#1 0x00007f6ae4559859 in __GI_abort () at abort.c:79

#2 0x0000559aaa386720 in error_exit (err=16, msg=0x559aaa5973d0 <__func__.16227> "qemu_mutex_destroy") at util/qemu-thread-posix.c:36

#3 0x0000559aaa3868c5 in qemu_mutex_destroy (mutex=0x559aabffe828) at util/qemu-thread-posix.c:69

#4 0x0000559aaa2f93a8 in char_finalize (obj=0x559aabffe800) at chardev/char.c:285

#5 0x0000559aaa23318a in object_deinit (obj=0x559aabffe800, type=0x559aabfd7d20) at qom/object.c:606

#6 0x0000559aaa2331b8 in object_deinit (obj=0x559aabffe800, type=0x559aabfd9060) at qom/object.c:610

#7 0x0000559aaa233200 in object_finalize (data=0x559aabffe800) at qom/object.c:620

#8 0x0000559aaa234202 in object_unref (obj=0x559aabffe800) at qom/object.c:1074

#9 0x0000559aaa2356b6 in object_finalize_child_property (obj=0x559aac0dac10, name=0x559aac778760 "compare0-0", opaque=0x559aabffe800) at qom/object.c:1584

#10 0x0000559aaa232f70 in object_property_del_all (obj=0x559aac0dac10) at qom/object.c:557

#11 0x0000559aaa2331ed in object_finalize (data=0x559aac0dac10) at qom/object.c:619

#12 0x0000559aaa234202 in object_unref (obj=0x559aac0dac10) at qom/object.c:1074

#13 0x0000559aaa2356b6 in object_finalize_child_property (obj=0x559aac0c75c0, name=0x559aac0dadc0 "chardevs", opaque=0x559aac0dac10) at qom/object.c:1584

#14 0x0000559aaa233071 in object_property_del_child (obj=0x559aac0c75c0, child=0x559aac0dac10, errp=0x0) at qom/object.c:580

#15 0x0000559aaa233155 in object_unparent (obj=0x559aac0dac10) at qom/object.c:599

#16 0x0000559aaa2fb721 in qemu_chr_cleanup () at chardev/char.c:1159

#17 0x0000559aa9f9b110 in main (argc=54, argv=0x7ffeb62fa998, envp=0x7ffeb62fab50) at vl.c:4539

When chardev is cleaned up, chr_write_lock needs to be destroyed. But

the colo-compare module is not cleaned up normally before it when the

guest poweroff. It is holding chr_write_lock at this time. This will

cause qemu crash.So we add the function of colo_compare_cleanup() before

qemu_chr_cleanup() to fix the bug.

Signed-off-by: Lei Rao <lei.rao@intel.com>

Reviewed-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Lukas Straub <lukasstraub2@web.de>

Tested-by: Lukas Straub <lukasstraub2@web.de>

Signed-off-by: Zhang Chen <chen.zhang@intel.com>

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

net/colo-compare.h | 1 +

net/net.c | 4 ++++

3 files changed, 15 insertions(+)

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

#include "qapi/error.h"

#include "qapi/opts-visitor.h"

#include "sysemu/runstate.h"

+#include "net/colo-compare.h"

#include "net/filter.h"

#include "qapi/string-output-visitor.h"

@@ -XXX,XX +XXX,XX @@ void net_cleanup(void)

{

NetClientState *nc;

+ /*cleanup colo compare module for COLO*/

+ colo_compare_cleanup();

+

/* We may del multiple entries during qemu_del_net_client(),

* so QTAILQ_FOREACH_SAFE() is also not safe here.

*/

From: "Rao, Lei" <lei.rao@intel.com>

The data pointer has skipped vnet_hdr_len in the function of

parse_packet_early().So, we can not subtract vnet_hdr_len again

when calculating pkt->header_size in fill_pkt_tcp_info(). Otherwise,

it will cause network packet comparsion errors and greatly increase

the frequency of checkpoints.

Signed-off-by: Lei Rao <lei.rao@intel.com>

Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>

Reviewed-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Lukas Straub <lukasstraub2@web.de>

Tested-by: Lukas Straub <lukasstraub2@web.de>

net/colo-compare.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c

--- a/net/colo-compare.c

+++ b/net/colo-compare.c

@@ -XXX,XX +XXX,XX @@ static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)

pkt->tcp_ack = ntohl(tcphd->th_ack);

*max_ack = *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack;

pkt->header_size = pkt->transport_header - (uint8_t *)pkt->data

- + (tcphd->th_off << 2) - pkt->vnet_hdr_len;

+ + (tcphd->th_off << 2);

pkt->payload_size = pkt->size - pkt->header_size;

pkt->seq_end = pkt->tcp_seq + pkt->payload_size;

pkt->flags = tcphd->th_flags;