* [Qemu-devel] [PATCH v12 1/3] tests: Add migration xbzrle test
2019-02-06 12:36 [Qemu-devel] [PATCH v12 0/3] Add make check tests for Migration Juan Quintela
@ 2019-02-06 12:36 ` Juan Quintela
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter Juan Quintela
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 3/3] tests: Add basic migration precopy tcp test Juan Quintela
2 siblings, 0 replies; 7+ messages in thread
From: Juan Quintela @ 2019-02-06 12:36 UTC (permalink / raw)
To: qemu-devel
Cc: Dr. David Alan Gilbert, Juan Quintela, Laurent Vivier, Eric Blake,
Daniel P. Berrangé, Paolo Bonzini, Markus Armbruster,
Thomas Huth, Gerd Hoffmann, Peter Xu
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/migration-test.c | 64 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 8352612364..b0670efde7 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -584,6 +584,17 @@ static void deprecated_set_speed(QTestState *who, long long value)
migrate_check_parameter(who, "max-bandwidth", value);
}
+static void deprecated_set_cache_size(QTestState *who, long long value)
+{
+ QDict *rsp;
+
+ rsp = qtest_qmp(who, "{ 'execute': 'migrate-set-cache-size',"
+ "'arguments': { 'value': %lld } }", value);
+ g_assert(qdict_haskey(rsp, "return"));
+ qobject_unref(rsp);
+ migrate_check_parameter(who, "xbzrle-cache-size", value);
+}
+
static void test_deprecated(void)
{
QTestState *from;
@@ -592,6 +603,7 @@ static void test_deprecated(void)
deprecated_set_downtime(from, 0.12345);
deprecated_set_speed(from, 12345);
+ deprecated_set_cache_size(from, 4096);
qtest_quit(from);
}
@@ -781,6 +793,57 @@ static void test_precopy_unix(void)
g_free(uri);
}
+static void test_xbzrle(const char *uri)
+{
+ QTestState *from, *to;
+
+ if (test_migrate_start(&from, &to, uri, false)) {
+ return;
+ }
+
+ /*
+ * We want to pick a speed slow enough that the test completes
+ * quickly, but that it doesn't complete precopy even on a slow
+ * machine, so also set the downtime.
+ */
+ /* 1 ms should make it not converge*/
+ migrate_set_parameter(from, "downtime-limit", 1);
+ /* 1GB/s */
+ migrate_set_parameter(from, "max-bandwidth", 1000000000);
+
+ migrate_set_parameter(from, "xbzrle-cache-size", 33554432);
+
+ migrate_set_capability(from, "xbzrle", "true");
+ migrate_set_capability(to, "xbzrle", "true");
+ /* Wait for the first serial output from the source */
+ wait_for_serial("src_serial");
+
+ migrate(from, uri, "{}");
+
+ wait_for_migration_pass(from);
+
+ /* 300ms should converge */
+ migrate_set_parameter(from, "downtime-limit", 300);
+
+ if (!got_stop) {
+ qtest_qmp_eventwait(from, "STOP");
+ }
+ qtest_qmp_eventwait(to, "RESUME");
+
+ wait_for_serial("dest_serial");
+ wait_for_migration_complete(from);
+
+ test_migrate_end(from, to, true);
+}
+
+static void test_xbzrle_unix(void)
+{
+ char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
+
+ test_xbzrle(uri);
+ g_free(uri);
+}
+
int main(int argc, char **argv)
{
char template[] = "/tmp/migration-test-XXXXXX";
@@ -832,6 +895,7 @@ int main(int argc, char **argv)
qtest_add_func("/migration/deprecated", test_deprecated);
qtest_add_func("/migration/bad_dest", test_baddest);
qtest_add_func("/migration/precopy/unix", test_precopy_unix);
+ qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix);
ret = g_test_run();
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter
2019-02-06 12:36 [Qemu-devel] [PATCH v12 0/3] Add make check tests for Migration Juan Quintela
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 1/3] tests: Add migration xbzrle test Juan Quintela
@ 2019-02-06 12:36 ` Juan Quintela
2019-02-06 19:56 ` Dr. David Alan Gilbert
2019-02-20 13:49 ` Eric Blake
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 3/3] tests: Add basic migration precopy tcp test Juan Quintela
2 siblings, 2 replies; 7+ messages in thread
From: Juan Quintela @ 2019-02-06 12:36 UTC (permalink / raw)
To: qemu-devel
Cc: Dr. David Alan Gilbert, Juan Quintela, Laurent Vivier, Eric Blake,
Daniel P. Berrangé, Paolo Bonzini, Markus Armbruster,
Thomas Huth, Gerd Hoffmann
It will be used to store the uri parameters. We want this only for
tcp, so we don't set it for other uris. We need it to know what port
is migration running.
Signed-off-by: Juan Quintela <quintela@redhat.com>
--
This used to be uri parameter, but it has so many troubles to
reproduce that it don't just make sense.
This used to be a port parameter. I was asked to move to
SocketAddress, done.
I also merged the setting of the migration tcp port in this one
because now I need to free the address, and this makes it easier.
This used to be x-socket-address with a single direction, now it is a
list of addresses.
Move SocketAddress_to_str here. I used to try to generalize the one
in chardev/char-socket.c, but it is not worth it.
Free string (eric)
Handle VSOCK address nicely (not that migration can use them yet).
---
hmp.c | 37 +++++++++++++++++++++++++++++++++++++
migration/migration.c | 24 ++++++++++++++++++++++++
migration/migration.h | 4 ++++
migration/socket.c | 11 +++++++++++
qapi/migration.json | 6 +++++-
qapi/sockets.json | 13 +++++++++++++
6 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/hmp.c b/hmp.c
index b2a2b1f84e..63019729ed 100644
--- a/hmp.c
+++ b/hmp.c
@@ -166,6 +166,31 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
qapi_free_MouseInfoList(mice_list);
}
+static char *SocketAddress_to_str(SocketAddress *addr)
+{
+ switch (addr->type) {
+ case SOCKET_ADDRESS_TYPE_INET:
+ return g_strdup_printf("tcp:%s:%s",
+ addr->u.inet.host,
+ addr->u.inet.port);
+ break;
+ case SOCKET_ADDRESS_TYPE_UNIX:
+ return g_strdup_printf("unix:%s",
+ addr->u.q_unix.path);
+ break;
+ case SOCKET_ADDRESS_TYPE_FD:
+ return g_strdup_printf("fd:%s", addr->u.fd.str);
+ break;
+ case SOCKET_ADDRESS_TYPE_VSOCK:
+ return g_strdup_printf("tcp:%s:%s",
+ addr->u.vsock.cid,
+ addr->u.vsock.port);
+ break;
+ default:
+ return g_strdup("unknown adrress type");
+ }
+}
+
void hmp_info_migrate(Monitor *mon, const QDict *qdict)
{
MigrationInfo *info;
@@ -306,6 +331,18 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
g_free(str);
visit_free(v);
}
+ if (info->has_socket_address) {
+ SocketAddressList *addr;
+
+ monitor_printf(mon, "socket address: [\n");
+
+ for (addr = info->socket_address; addr; addr = addr->next) {
+ char *s = SocketAddress_to_str(addr->value);
+ monitor_printf(mon, "\t%s\n", s);
+ g_free(s);
+ }
+ monitor_printf(mon, "]\n");
+ }
qapi_free_MigrationInfo(info);
qapi_free_MigrationCapabilityStatusList(caps);
}
diff --git a/migration/migration.c b/migration/migration.c
index 37e06b76dc..ef1d53cde2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -31,6 +31,8 @@
#include "migration/vmstate.h"
#include "block/block.h"
#include "qapi/error.h"
+#include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-sockets.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-events-migration.h"
#include "qapi/qmp/qerror.h"
@@ -197,6 +199,11 @@ void migration_incoming_state_destroy(void)
}
qemu_event_reset(&mis->main_thread_load_event);
+
+ if (mis->socket_address) {
+ qapi_free_SocketAddressList(mis->socket_address);
+ mis->socket_address = NULL;
+ }
}
static void migrate_generate_event(int new_state)
@@ -312,6 +319,17 @@ void migration_incoming_enable_colo(void)
migration_colo_enabled = true;
}
+void migrate_add_address(SocketAddress *address)
+{
+ MigrationIncomingState *mis = migration_incoming_get_current();
+ SocketAddressList *addrs;
+
+ addrs = g_new0(SocketAddressList, 1);
+ addrs->next = mis->socket_address;
+ mis->socket_address = addrs;
+ addrs->value = QAPI_CLONE(SocketAddress, address);
+}
+
void qemu_start_incoming_migration(const char *uri, Error **errp)
{
const char *p;
@@ -966,6 +984,12 @@ static void fill_destination_migration_info(MigrationInfo *info)
{
MigrationIncomingState *mis = migration_incoming_get_current();
+ if (mis->socket_address) {
+ info->has_socket_address = true;
+ info->socket_address =
+ QAPI_CLONE(SocketAddressList, mis->socket_address);
+ }
+
switch (mis->state) {
case MIGRATION_STATUS_NONE:
return;
diff --git a/migration/migration.h b/migration/migration.h
index dcd05d9f87..bd41b57af9 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -80,6 +80,9 @@ struct MigrationIncomingState {
bool postcopy_recover_triggered;
QemuSemaphore postcopy_pause_sem_dst;
QemuSemaphore postcopy_pause_sem_fault;
+
+ /* List of listening socket addresses */
+ SocketAddressList *socket_address;
};
MigrationIncomingState *migration_incoming_get_current(void);
@@ -300,6 +303,7 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
void dirty_bitmap_mig_before_vm_start(void);
void init_dirty_bitmap_incoming_migration(void);
+void migrate_add_address(SocketAddress *address);
#define qemu_ram_foreach_block \
#warning "Use qemu_ram_foreach_block_migratable in migration code"
diff --git a/migration/socket.c b/migration/socket.c
index f4c8174400..239527fb1f 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -15,6 +15,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
@@ -177,6 +178,7 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
Error **errp)
{
QIONetListener *listener = qio_net_listener_new();
+ size_t i;
qio_net_listener_set_name(listener, "migration-socket-listener");
@@ -189,6 +191,15 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
socket_accept_incoming_migration,
NULL, NULL,
g_main_context_get_thread_default());
+
+ for (i = 0; i < listener->nsioc; i++) {
+ SocketAddress *address =
+ qio_channel_socket_get_local_address(listener->sioc[i], errp);
+ if (!address) {
+ return;
+ }
+ migrate_add_address(address);
+ }
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)
diff --git a/qapi/migration.json b/qapi/migration.json
index 7a795ecc16..b62947791f 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -6,6 +6,7 @@
##
{ 'include': 'common.json' }
+{ 'include': 'sockets.json' }
##
# @MigrationStats:
@@ -199,6 +200,8 @@
# @compression: migration compression statistics, only returned if compression
# feature is on and status is 'active' or 'completed' (Since 3.1)
#
+# @socket-address: Only used for tcp, to know what the real port is (Since 4.0)
+#
# Since: 0.14.0
##
{ 'struct': 'MigrationInfo',
@@ -213,7 +216,8 @@
'*error-desc': 'str',
'*postcopy-blocktime' : 'uint32',
'*postcopy-vcpu-blocktime': ['uint32'],
- '*compression': 'CompressionStats'} }
+ '*compression': 'CompressionStats',
+ '*socket-address': ['SocketAddress'] } }
##
# @query-migrate:
diff --git a/qapi/sockets.json b/qapi/sockets.json
index fc81d8d5e8..d7f77984af 100644
--- a/qapi/sockets.json
+++ b/qapi/sockets.json
@@ -152,3 +152,16 @@
'unix': 'UnixSocketAddress',
'vsock': 'VsockSocketAddress',
'fd': 'String' } }
+
+##
+# @DummyStruct:
+#
+# Both block-core and migration needs SocketAddressList
+# I am open to comments about how to share it
+#
+# @dummy-list: A dummy list
+#
+# Since: 3.1
+##
+{ 'struct': 'DummyStruct',
+ 'data': { 'dummy-list': ['SocketAddress'] } }
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter Juan Quintela
@ 2019-02-06 19:56 ` Dr. David Alan Gilbert
2019-02-20 10:05 ` Juan Quintela
2019-02-20 13:49 ` Eric Blake
1 sibling, 1 reply; 7+ messages in thread
From: Dr. David Alan Gilbert @ 2019-02-06 19:56 UTC (permalink / raw)
To: Juan Quintela
Cc: qemu-devel, Laurent Vivier, Eric Blake, Daniel P. Berrangé,
Paolo Bonzini, Markus Armbruster, Thomas Huth, Gerd Hoffmann
* Juan Quintela (quintela@redhat.com) wrote:
> It will be used to store the uri parameters. We want this only for
> tcp, so we don't set it for other uris. We need it to know what port
> is migration running.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
>
> --
>
> This used to be uri parameter, but it has so many troubles to
> reproduce that it don't just make sense.
>
> This used to be a port parameter. I was asked to move to
> SocketAddress, done.
> I also merged the setting of the migration tcp port in this one
> because now I need to free the address, and this makes it easier.
> This used to be x-socket-address with a single direction, now it is a
> list of addresses.
> Move SocketAddress_to_str here. I used to try to generalize the one
> in chardev/char-socket.c, but it is not worth it.
>
> Free string (eric)
> Handle VSOCK address nicely (not that migration can use them yet).
> ---
> hmp.c | 37 +++++++++++++++++++++++++++++++++++++
> migration/migration.c | 24 ++++++++++++++++++++++++
> migration/migration.h | 4 ++++
> migration/socket.c | 11 +++++++++++
> qapi/migration.json | 6 +++++-
> qapi/sockets.json | 13 +++++++++++++
> 6 files changed, 94 insertions(+), 1 deletion(-)
>
> diff --git a/hmp.c b/hmp.c
> index b2a2b1f84e..63019729ed 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -166,6 +166,31 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
> qapi_free_MouseInfoList(mice_list);
> }
>
> +static char *SocketAddress_to_str(SocketAddress *addr)
> +{
> + switch (addr->type) {
> + case SOCKET_ADDRESS_TYPE_INET:
> + return g_strdup_printf("tcp:%s:%s",
> + addr->u.inet.host,
> + addr->u.inet.port);
> + break;
(Minor)
You don't need the 'break's with the return.
> + case SOCKET_ADDRESS_TYPE_UNIX:
> + return g_strdup_printf("unix:%s",
> + addr->u.q_unix.path);
> + break;
> + case SOCKET_ADDRESS_TYPE_FD:
> + return g_strdup_printf("fd:%s", addr->u.fd.str);
> + break;
> + case SOCKET_ADDRESS_TYPE_VSOCK:
> + return g_strdup_printf("tcp:%s:%s",
> + addr->u.vsock.cid,
> + addr->u.vsock.port);
> + break;
> + default:
> + return g_strdup("unknown adrress type");
Typo in 'ad*r*ress'
Can be fixed in commit.
> + }
> +}
> +
> void hmp_info_migrate(Monitor *mon, const QDict *qdict)
> {
> MigrationInfo *info;
> @@ -306,6 +331,18 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
> g_free(str);
> visit_free(v);
> }
> + if (info->has_socket_address) {
> + SocketAddressList *addr;
> +
> + monitor_printf(mon, "socket address: [\n");
> +
> + for (addr = info->socket_address; addr; addr = addr->next) {
I guess you could use the visitors to walk that list; but it may be more
painful than it's worth.
> + char *s = SocketAddress_to_str(addr->value);
> + monitor_printf(mon, "\t%s\n", s);
> + g_free(s);
> + }
> + monitor_printf(mon, "]\n");
> + }
> qapi_free_MigrationInfo(info);
> qapi_free_MigrationCapabilityStatusList(caps);
> }
> diff --git a/migration/migration.c b/migration/migration.c
> index 37e06b76dc..ef1d53cde2 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -31,6 +31,8 @@
> #include "migration/vmstate.h"
> #include "block/block.h"
> #include "qapi/error.h"
> +#include "qapi/clone-visitor.h"
> +#include "qapi/qapi-visit-sockets.h"
> #include "qapi/qapi-commands-migration.h"
> #include "qapi/qapi-events-migration.h"
> #include "qapi/qmp/qerror.h"
> @@ -197,6 +199,11 @@ void migration_incoming_state_destroy(void)
> }
>
> qemu_event_reset(&mis->main_thread_load_event);
> +
> + if (mis->socket_address) {
> + qapi_free_SocketAddressList(mis->socket_address);
> + mis->socket_address = NULL;
> + }
> }
>
> static void migrate_generate_event(int new_state)
> @@ -312,6 +319,17 @@ void migration_incoming_enable_colo(void)
> migration_colo_enabled = true;
> }
>
> +void migrate_add_address(SocketAddress *address)
> +{
> + MigrationIncomingState *mis = migration_incoming_get_current();
> + SocketAddressList *addrs;
> +
> + addrs = g_new0(SocketAddressList, 1);
> + addrs->next = mis->socket_address;
> + mis->socket_address = addrs;
> + addrs->value = QAPI_CLONE(SocketAddress, address);
> +}
> +
> void qemu_start_incoming_migration(const char *uri, Error **errp)
> {
> const char *p;
> @@ -966,6 +984,12 @@ static void fill_destination_migration_info(MigrationInfo *info)
> {
> MigrationIncomingState *mis = migration_incoming_get_current();
>
> + if (mis->socket_address) {
> + info->has_socket_address = true;
> + info->socket_address =
> + QAPI_CLONE(SocketAddressList, mis->socket_address);
> + }
> +
> switch (mis->state) {
> case MIGRATION_STATUS_NONE:
> return;
> diff --git a/migration/migration.h b/migration/migration.h
> index dcd05d9f87..bd41b57af9 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -80,6 +80,9 @@ struct MigrationIncomingState {
> bool postcopy_recover_triggered;
> QemuSemaphore postcopy_pause_sem_dst;
> QemuSemaphore postcopy_pause_sem_fault;
> +
> + /* List of listening socket addresses */
> + SocketAddressList *socket_address;
It's slightly confusing to have a list of addresses called
'socket_address'.
> };
>
> MigrationIncomingState *migration_incoming_get_current(void);
> @@ -300,6 +303,7 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
>
> void dirty_bitmap_mig_before_vm_start(void);
> void init_dirty_bitmap_incoming_migration(void);
> +void migrate_add_address(SocketAddress *address);
>
> #define qemu_ram_foreach_block \
> #warning "Use qemu_ram_foreach_block_migratable in migration code"
> diff --git a/migration/socket.c b/migration/socket.c
> index f4c8174400..239527fb1f 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -15,6 +15,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/cutils.h"
>
> #include "qemu-common.h"
> #include "qemu/error-report.h"
> @@ -177,6 +178,7 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
> Error **errp)
> {
> QIONetListener *listener = qio_net_listener_new();
> + size_t i;
>
> qio_net_listener_set_name(listener, "migration-socket-listener");
>
> @@ -189,6 +191,15 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
> socket_accept_incoming_migration,
> NULL, NULL,
> g_main_context_get_thread_default());
> +
> + for (i = 0; i < listener->nsioc; i++) {
> + SocketAddress *address =
> + qio_channel_socket_get_local_address(listener->sioc[i], errp);
> + if (!address) {
> + return;
> + }
> + migrate_add_address(address);
> + }
> }
>
> void tcp_start_incoming_migration(const char *host_port, Error **errp)
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 7a795ecc16..b62947791f 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -6,6 +6,7 @@
> ##
>
> { 'include': 'common.json' }
> +{ 'include': 'sockets.json' }
>
> ##
> # @MigrationStats:
> @@ -199,6 +200,8 @@
> # @compression: migration compression statistics, only returned if compression
> # feature is on and status is 'active' or 'completed' (Since 3.1)
> #
> +# @socket-address: Only used for tcp, to know what the real port is (Since 4.0)
> +#
> # Since: 0.14.0
> ##
> { 'struct': 'MigrationInfo',
> @@ -213,7 +216,8 @@
> '*error-desc': 'str',
> '*postcopy-blocktime' : 'uint32',
> '*postcopy-vcpu-blocktime': ['uint32'],
> - '*compression': 'CompressionStats'} }
> + '*compression': 'CompressionStats',
> + '*socket-address': ['SocketAddress'] } }
>
> ##
> # @query-migrate:
> diff --git a/qapi/sockets.json b/qapi/sockets.json
> index fc81d8d5e8..d7f77984af 100644
> --- a/qapi/sockets.json
> +++ b/qapi/sockets.json
> @@ -152,3 +152,16 @@
> 'unix': 'UnixSocketAddress',
> 'vsock': 'VsockSocketAddress',
> 'fd': 'String' } }
> +
> +##
> +# @DummyStruct:
> +#
> +# Both block-core and migration needs SocketAddressList
> +# I am open to comments about how to share it
> +#
> +# @dummy-list: A dummy list
> +#
> +# Since: 3.1
> +##
> +{ 'struct': 'DummyStruct',
> + 'data': { 'dummy-list': ['SocketAddress'] } }
> --
> 2.20.1
All the above are minor, so:
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter
2019-02-06 19:56 ` Dr. David Alan Gilbert
@ 2019-02-20 10:05 ` Juan Quintela
0 siblings, 0 replies; 7+ messages in thread
From: Juan Quintela @ 2019-02-20 10:05 UTC (permalink / raw)
To: Dr. David Alan Gilbert
Cc: qemu-devel, Laurent Vivier, Eric Blake, Daniel P. Berrangé,
Paolo Bonzini, Markus Armbruster, Thomas Huth, Gerd Hoffmann
"Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
> * Juan Quintela (quintela@redhat.com) wrote:
>> It will be used to store the uri parameters. We want this only for
>> tcp, so we don't set it for other uris. We need it to know what port
>> is migration running.
>>
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>>
>> --
>>
>> This used to be uri parameter, but it has so many troubles to
>> reproduce that it don't just make sense.
>>
>> This used to be a port parameter. I was asked to move to
>> SocketAddress, done.
>> I also merged the setting of the migration tcp port in this one
>> because now I need to free the address, and this makes it easier.
>> This used to be x-socket-address with a single direction, now it is a
>> list of addresses.
>> Move SocketAddress_to_str here. I used to try to generalize the one
>> in chardev/char-socket.c, but it is not worth it.
>>
>> Free string (eric)
>> Handle VSOCK address nicely (not that migration can use them yet).
>> ---
>> hmp.c | 37 +++++++++++++++++++++++++++++++++++++
>> migration/migration.c | 24 ++++++++++++++++++++++++
>> migration/migration.h | 4 ++++
>> migration/socket.c | 11 +++++++++++
>> qapi/migration.json | 6 +++++-
>> qapi/sockets.json | 13 +++++++++++++
>> 6 files changed, 94 insertions(+), 1 deletion(-)
>>
>> diff --git a/hmp.c b/hmp.c
>> index b2a2b1f84e..63019729ed 100644
>> --- a/hmp.c
>> +++ b/hmp.c
>> @@ -166,6 +166,31 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
>> qapi_free_MouseInfoList(mice_list);
>> }
>>
>> +static char *SocketAddress_to_str(SocketAddress *addr)
>> +{
>> + switch (addr->type) {
>> + case SOCKET_ADDRESS_TYPE_INET:
>> + return g_strdup_printf("tcp:%s:%s",
>> + addr->u.inet.host,
>> + addr->u.inet.port);
>> + break;
>
> (Minor)
> You don't need the 'break's with the return.
oops. Fixed.
>> + case SOCKET_ADDRESS_TYPE_UNIX:
>> + return g_strdup_printf("unix:%s",
>> + addr->u.q_unix.path);
>> + break;
>
>
>> + case SOCKET_ADDRESS_TYPE_FD:
>> + return g_strdup_printf("fd:%s", addr->u.fd.str);
>> + break;
>> + case SOCKET_ADDRESS_TYPE_VSOCK:
>> + return g_strdup_printf("tcp:%s:%s",
>> + addr->u.vsock.cid,
>> + addr->u.vsock.port);
>> + break;
>> + default:
>> + return g_strdup("unknown adrress type");
>
> Typo in 'ad*r*ress'
> Can be fixed in commit.
Done.
>> + }
>> +}
>> +
>> void hmp_info_migrate(Monitor *mon, const QDict *qdict)
>> {
>> MigrationInfo *info;
>> @@ -306,6 +331,18 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
>> g_free(str);
>> visit_free(v);
>> }
>> + if (info->has_socket_address) {
>> + SocketAddressList *addr;
>> +
>> + monitor_printf(mon, "socket address: [\n");
>> +
>> + for (addr = info->socket_address; addr; addr = addr->next) {
>
> I guess you could use the visitors to walk that list; but it may be more
> painful than it's worth.
>
>> + char *s = SocketAddress_to_str(addr->value);
>> + monitor_printf(mon, "\t%s\n", s);
>> + g_free(s);
>> + }
>> + monitor_printf(mon, "]\n");
>> + }
>> qapi_free_MigrationInfo(info);
>> qapi_free_MigrationCapabilityStatusList(caps);
>> }
>> diff --git a/migration/migration.c b/migration/migration.c
>> index 37e06b76dc..ef1d53cde2 100644
>> --- a/migration/migration.c
>> +++ b/migration/migration.c
>> @@ -31,6 +31,8 @@
>> #include "migration/vmstate.h"
>> #include "block/block.h"
>> #include "qapi/error.h"
>> +#include "qapi/clone-visitor.h"
>> +#include "qapi/qapi-visit-sockets.h"
>> #include "qapi/qapi-commands-migration.h"
>> #include "qapi/qapi-events-migration.h"
>> #include "qapi/qmp/qerror.h"
>> @@ -197,6 +199,11 @@ void migration_incoming_state_destroy(void)
>> }
>>
>> qemu_event_reset(&mis->main_thread_load_event);
>> +
>> + if (mis->socket_address) {
>> + qapi_free_SocketAddressList(mis->socket_address);
>> + mis->socket_address = NULL;
>> + }
>> }
>>
>> static void migrate_generate_event(int new_state)
>> @@ -312,6 +319,17 @@ void migration_incoming_enable_colo(void)
>> migration_colo_enabled = true;
>> }
>>
>> +void migrate_add_address(SocketAddress *address)
>> +{
>> + MigrationIncomingState *mis = migration_incoming_get_current();
>> + SocketAddressList *addrs;
>> +
>> + addrs = g_new0(SocketAddressList, 1);
>> + addrs->next = mis->socket_address;
>> + mis->socket_address = addrs;
>> + addrs->value = QAPI_CLONE(SocketAddress, address);
>> +}
>> +
>> void qemu_start_incoming_migration(const char *uri, Error **errp)
>> {
>> const char *p;
>> @@ -966,6 +984,12 @@ static void fill_destination_migration_info(MigrationInfo *info)
>> {
>> MigrationIncomingState *mis = migration_incoming_get_current();
>>
>> + if (mis->socket_address) {
>> + info->has_socket_address = true;
>> + info->socket_address =
>> + QAPI_CLONE(SocketAddressList, mis->socket_address);
>> + }
>> +
>> switch (mis->state) {
>> case MIGRATION_STATUS_NONE:
>> return;
>> diff --git a/migration/migration.h b/migration/migration.h
>> index dcd05d9f87..bd41b57af9 100644
>> --- a/migration/migration.h
>> +++ b/migration/migration.h
>> @@ -80,6 +80,9 @@ struct MigrationIncomingState {
>> bool postcopy_recover_triggered;
>> QemuSemaphore postcopy_pause_sem_dst;
>> QemuSemaphore postcopy_pause_sem_fault;
>> +
>> + /* List of listening socket addresses */
>> + SocketAddressList *socket_address;
>
> It's slightly confusing to have a list of addresses called
> 'socket_address'.
>
>> };
>>
>> MigrationIncomingState *migration_incoming_get_current(void);
>> @@ -300,6 +303,7 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
>>
>> void dirty_bitmap_mig_before_vm_start(void);
>> void init_dirty_bitmap_incoming_migration(void);
>> +void migrate_add_address(SocketAddress *address);
>>
>> #define qemu_ram_foreach_block \
>> #warning "Use qemu_ram_foreach_block_migratable in migration code"
>> diff --git a/migration/socket.c b/migration/socket.c
>> index f4c8174400..239527fb1f 100644
>> --- a/migration/socket.c
>> +++ b/migration/socket.c
>> @@ -15,6 +15,7 @@
>> */
>>
>> #include "qemu/osdep.h"
>> +#include "qemu/cutils.h"
>>
>> #include "qemu-common.h"
>> #include "qemu/error-report.h"
>> @@ -177,6 +178,7 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
>> Error **errp)
>> {
>> QIONetListener *listener = qio_net_listener_new();
>> + size_t i;
>>
>> qio_net_listener_set_name(listener, "migration-socket-listener");
>>
>> @@ -189,6 +191,15 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
>> socket_accept_incoming_migration,
>> NULL, NULL,
>> g_main_context_get_thread_default());
>> +
>> + for (i = 0; i < listener->nsioc; i++) {
>> + SocketAddress *address =
>> + qio_channel_socket_get_local_address(listener->sioc[i], errp);
>> + if (!address) {
>> + return;
>> + }
>> + migrate_add_address(address);
>> + }
>> }
>>
>> void tcp_start_incoming_migration(const char *host_port, Error **errp)
>> diff --git a/qapi/migration.json b/qapi/migration.json
>> index 7a795ecc16..b62947791f 100644
>> --- a/qapi/migration.json
>> +++ b/qapi/migration.json
>> @@ -6,6 +6,7 @@
>> ##
>>
>> { 'include': 'common.json' }
>> +{ 'include': 'sockets.json' }
>>
>> ##
>> # @MigrationStats:
>> @@ -199,6 +200,8 @@
>> # @compression: migration compression statistics, only returned if compression
>> # feature is on and status is 'active' or 'completed' (Since 3.1)
>> #
>> +# @socket-address: Only used for tcp, to know what the real port is (Since 4.0)
>> +#
>> # Since: 0.14.0
>> ##
>> { 'struct': 'MigrationInfo',
>> @@ -213,7 +216,8 @@
>> '*error-desc': 'str',
>> '*postcopy-blocktime' : 'uint32',
>> '*postcopy-vcpu-blocktime': ['uint32'],
>> - '*compression': 'CompressionStats'} }
>> + '*compression': 'CompressionStats',
>> + '*socket-address': ['SocketAddress'] } }
>>
>> ##
>> # @query-migrate:
>> diff --git a/qapi/sockets.json b/qapi/sockets.json
>> index fc81d8d5e8..d7f77984af 100644
>> --- a/qapi/sockets.json
>> +++ b/qapi/sockets.json
>> @@ -152,3 +152,16 @@
>> 'unix': 'UnixSocketAddress',
>> 'vsock': 'VsockSocketAddress',
>> 'fd': 'String' } }
>> +
>> +##
>> +# @DummyStruct:
>> +#
>> +# Both block-core and migration needs SocketAddressList
>> +# I am open to comments about how to share it
>> +#
>> +# @dummy-list: A dummy list
>> +#
>> +# Since: 3.1
>> +##
>> +{ 'struct': 'DummyStruct',
>> + 'data': { 'dummy-list': ['SocketAddress'] } }
>> --
>> 2.20.1
>
> All the above are minor, so:
>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter Juan Quintela
2019-02-06 19:56 ` Dr. David Alan Gilbert
@ 2019-02-20 13:49 ` Eric Blake
1 sibling, 0 replies; 7+ messages in thread
From: Eric Blake @ 2019-02-20 13:49 UTC (permalink / raw)
To: Juan Quintela, qemu-devel
Cc: Dr. David Alan Gilbert, Laurent Vivier, Daniel P. Berrangé,
Paolo Bonzini, Markus Armbruster, Thomas Huth, Gerd Hoffmann
On 2/6/19 6:36 AM, Juan Quintela wrote:
> It will be used to store the uri parameters. We want this only for
> tcp, so we don't set it for other uris. We need it to know what port
> is migration running.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
>
> --
>
> +++ b/qapi/sockets.json
> @@ -152,3 +152,16 @@
> 'unix': 'UnixSocketAddress',
> 'vsock': 'VsockSocketAddress',
> 'fd': 'String' } }
> +
> +##
> +# @DummyStruct:
> +#
> +# Both block-core and migration needs SocketAddressList
> +# I am open to comments about how to share it
> +#
> +# @dummy-list: A dummy list
> +#
> +# Since: 3.1
4.0, now. And do you actually need it, now that you also have
['SocketAddress'] in MigrationInfo, which is visible to introspection?
I would try dropping this hunk and see if things would still compile.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH v12 3/3] tests: Add basic migration precopy tcp test
2019-02-06 12:36 [Qemu-devel] [PATCH v12 0/3] Add make check tests for Migration Juan Quintela
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 1/3] tests: Add migration xbzrle test Juan Quintela
2019-02-06 12:36 ` [Qemu-devel] [PATCH v12 2/3] migration: Create socket-address parameter Juan Quintela
@ 2019-02-06 12:36 ` Juan Quintela
2 siblings, 0 replies; 7+ messages in thread
From: Juan Quintela @ 2019-02-06 12:36 UTC (permalink / raw)
To: qemu-devel
Cc: Dr. David Alan Gilbert, Juan Quintela, Laurent Vivier, Eric Blake,
Daniel P. Berrangé, Paolo Bonzini, Markus Armbruster,
Thomas Huth, Gerd Hoffmann, Peter Xu
Not sharing code from precopy/unix because we have to read back the
tcp parameter.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/migration-test.c | 109 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 104 insertions(+), 5 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index b0670efde7..a27f095b28 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -20,6 +20,9 @@
#include "qemu/sockets.h"
#include "chardev/char.h"
#include "sysemu/sysemu.h"
+#include "qapi/qapi-visit-sockets.h"
+#include "qapi/qobject-input-visitor.h"
+#include "qapi/qobject-output-visitor.h"
#include "migration/migration-test.h"
@@ -332,15 +335,67 @@ static void cleanup(const char *filename)
g_free(path);
}
+static char *SocketAddress_to_str(SocketAddress *addr)
+{
+ switch (addr->type) {
+ case SOCKET_ADDRESS_TYPE_INET:
+ return g_strdup_printf("tcp:%s:%s",
+ addr->u.inet.host,
+ addr->u.inet.port);
+ break;
+ case SOCKET_ADDRESS_TYPE_UNIX:
+ return g_strdup_printf("unix:%s",
+ addr->u.q_unix.path);
+ break;
+ case SOCKET_ADDRESS_TYPE_FD:
+ return g_strdup_printf("fd:%s", addr->u.fd.str);
+ break;
+ default:
+ abort();
+ }
+}
+
+static char *migrate_get_socket_address(QTestState *who, const char *parameter)
+{
+ QDict *rsp;
+ char *result;
+ Error *local_err = NULL;
+ SocketAddressList *addrs;
+ Visitor *iv = NULL;
+ QObject *object;
+
+ rsp = migrate_query(who);
+ object = qdict_get(rsp, parameter);
+
+ iv = qobject_input_visitor_new(object);
+ visit_type_SocketAddressList(iv, NULL, &addrs, &local_err);
+
+ /* we are only using a single address */
+ result = g_strdup_printf("%s", SocketAddress_to_str(addrs->value));
+
+ qapi_free_SocketAddressList(addrs);
+ qobject_unref(rsp);
+ return result;
+}
+
+static long long migrate_get_parameter(QTestState *who, const char *parameter)
+{
+ QDict *rsp;
+ long long result;
+
+ rsp = wait_command(who, "{ 'execute': 'query-migrate-parameters' }");
+ result = qdict_get_int(rsp, parameter);
+ qobject_unref(rsp);
+ return result;
+}
+
static void migrate_check_parameter(QTestState *who, const char *parameter,
long long value)
{
- QDict *rsp_return;
+ long long result;
- rsp_return = wait_command(who,
- "{ 'execute': 'query-migrate-parameters' }");
- g_assert_cmpint(qdict_get_int(rsp_return, parameter), ==, value);
- qobject_unref(rsp_return);
+ result = migrate_get_parameter(who, parameter);
+ g_assert_cmpint(result, ==, value);
}
static void migrate_set_parameter(QTestState *who, const char *parameter,
@@ -844,6 +899,49 @@ static void test_xbzrle_unix(void)
g_free(uri);
}
+static void test_precopy_tcp(void)
+{
+ char *uri;
+ QTestState *from, *to;
+
+ if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", false)) {
+ return;
+ }
+
+ /*
+ * We want to pick a speed slow enough that the test completes
+ * quickly, but that it doesn't complete precopy even on a slow
+ * machine, so also set the downtime.
+ */
+ /* 1 ms should make it not converge*/
+ migrate_set_parameter(from, "downtime-limit", 1);
+ /* 1GB/s */
+ migrate_set_parameter(from, "max-bandwidth", 1000000000);
+
+ /* Wait for the first serial output from the source */
+ wait_for_serial("src_serial");
+
+ uri = migrate_get_socket_address(to, "socket-address");
+
+ migrate(from, uri, "{}");
+
+ wait_for_migration_pass(from);
+
+ /* 300ms should converge */
+ migrate_set_parameter(from, "downtime-limit", 300);
+
+ if (!got_stop) {
+ qtest_qmp_eventwait(from, "STOP");
+ }
+ qtest_qmp_eventwait(to, "RESUME");
+
+ wait_for_serial("dest_serial");
+ wait_for_migration_complete(from);
+
+ test_migrate_end(from, to, true);
+ g_free(uri);
+}
+
int main(int argc, char **argv)
{
char template[] = "/tmp/migration-test-XXXXXX";
@@ -895,6 +993,7 @@ int main(int argc, char **argv)
qtest_add_func("/migration/deprecated", test_deprecated);
qtest_add_func("/migration/bad_dest", test_baddest);
qtest_add_func("/migration/precopy/unix", test_precopy_unix);
+ qtest_add_func("/migration/precopy/tcp", test_precopy_tcp);
qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix);
ret = g_test_run();
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread