Re: [Qemu-devel] [PATCH v6 12/19] migration: Create ram_multifd_page
On Tue, Aug 08, 2017 at 06:26:22PM +0200, Juan Quintela wrote:
> The function still don't use multifd, but we have simplified
> ram_save_page, xbzrle and RDMA stuff is gone. We have added a new
> counter and a new flag for this type of pages.
>
> Signed-off-by: Juan Quintela
>
> --
> Add last_page parameter
> Add commets for done and address
> ---
> hmp.c | 2 ++
> migration/migration.c | 1 +
> migration/ram.c | 94
> ++-
> qapi-schema.json | 5 ++-
> 4 files changed, 100 insertions(+), 2 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index a52035a..bc2b071 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -234,6 +234,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
> monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",
> info->ram->postcopy_requests);
> }
> +monitor_printf(mon, "multifd: %" PRIu64 " pages\n",
> + info->ram->multifd);
> }
>
> if (info->has_disk) {
> diff --git a/migration/migration.c b/migration/migration.c
> index 944d6e2..8e9505a 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -549,6 +549,7 @@ static void populate_ram_info(MigrationInfo *info,
> MigrationState *s)
> info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
> info->ram->postcopy_requests = ram_counters.postcopy_requests;
> info->ram->page_size = qemu_target_page_size();
> +info->ram->multifd = ram_counters.multifd;
>
> if (migrate_use_xbzrle()) {
> info->has_xbzrle_cache = true;
> diff --git a/migration/ram.c b/migration/ram.c
> index e9fa556..03f3427 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -68,6 +68,7 @@
> #define RAM_SAVE_FLAG_XBZRLE 0x40
> /* 0x80 is reserved in migration.h start with 0x100 next */
> #define RAM_SAVE_FLAG_COMPRESS_PAGE0x100
> +#define RAM_SAVE_FLAG_MULTIFD_PAGE 0x200
>
> static inline bool is_zero_range(uint8_t *p, uint64_t size)
> {
> @@ -362,12 +363,22 @@ static void compress_threads_save_setup(void)
> /* Multiple fd's */
>
> struct MultiFDSendParams {
> +/* not changed */
> uint8_t id;
> QemuThread thread;
> QIOChannel *c;
> QemuSemaphore sem;
> QemuMutex mutex;
> +/* protected by param mutex */
> bool quit;
> +/* This is a temp field. We are using it now to transmit
> + something the address of the page. Later in the series, we
> + change it for the real page.
> +*/
> +uint8_t *address;
> +/* protected by multifd mutex */
> +/* has the thread finish the last submitted job */
> +bool done;
> };
> typedef struct MultiFDSendParams MultiFDSendParams;
>
> @@ -375,6 +386,8 @@ struct {
> MultiFDSendParams *params;
> /* number of created threads */
> int count;
> +QemuMutex mutex;
> +QemuSemaphore sem;
> } *multifd_send_state;
>
> static void terminate_multifd_send_threads(void)
> @@ -433,6 +446,7 @@ static void *multifd_send_thread(void *opaque)
> g_free(string_uuid);
> qio_channel_write(p->c, string, MULTIFD_UUID_MSG, &error_abort);
> g_free(string);
> +qemu_sem_post(&multifd_send_state->sem);
>
> while (true) {
> qemu_mutex_lock(&p->mutex);
> @@ -440,6 +454,15 @@ static void *multifd_send_thread(void *opaque)
> qemu_mutex_unlock(&p->mutex);
> break;
> }
> +if (p->address) {
> +p->address = 0;
> +qemu_mutex_unlock(&p->mutex);
> +qemu_mutex_lock(&multifd_send_state->mutex);
> +p->done = true;
> +qemu_mutex_unlock(&multifd_send_state->mutex);
> +qemu_sem_post(&multifd_send_state->sem);
> +continue;
> +}
> qemu_mutex_unlock(&p->mutex);
> qemu_sem_wait(&p->sem);
> }
> @@ -459,6 +482,8 @@ int multifd_save_setup(void)
> multifd_send_state = g_malloc0(sizeof(*multifd_send_state));
> multifd_send_state->params = g_new0(MultiFDSendParams, thread_count);
> multifd_send_state->count = 0;
> +qemu_mutex_init(&multifd_send_state->mutex);
> +qemu_sem_init(&multifd_send_state->sem, 0);
> for (i = 0; i < thread_count; i++) {
> char thread_name[16];
> MultiFDSendParams *p = &multifd_send_state->params[i];
> @@ -467,6 +492,8 @@ int multifd_save_setup(void)
> qemu_sem_init(&p->sem, 0);
> p->quit = false;
> p->id = i;
> +p->done = true;
> +p->address = 0;
> p->c = socket_send_channel_create();
> if (!p->c) {
> error_report("Error creating a send channel");
> @@ -481,6 +508,30 @@ int multifd_save_setup(void)
> return 0;
> }
>
> +static uint16_t multifd_send_page(uint8_t *address, bool last_page)
> +{
> +int i;
> +MultiFDSendParams *p = NULL; /* make happy gcc */
> +
> +qemu_sem_wait(&multifd_send_state->sem);
[Qemu-devel] [PATCH v6 12/19] migration: Create ram_multifd_page
The function still don't use multifd, but we have simplified
ram_save_page, xbzrle and RDMA stuff is gone. We have added a new
counter and a new flag for this type of pages.
Signed-off-by: Juan Quintela
--
Add last_page parameter
Add commets for done and address
---
hmp.c | 2 ++
migration/migration.c | 1 +
migration/ram.c | 94 ++-
qapi-schema.json | 5 ++-
4 files changed, 100 insertions(+), 2 deletions(-)
diff --git a/hmp.c b/hmp.c
index a52035a..bc2b071 100644
--- a/hmp.c
+++ b/hmp.c
@@ -234,6 +234,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",
info->ram->postcopy_requests);
}
+monitor_printf(mon, "multifd: %" PRIu64 " pages\n",
+ info->ram->multifd);
}
if (info->has_disk) {
diff --git a/migration/migration.c b/migration/migration.c
index 944d6e2..8e9505a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -549,6 +549,7 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
info->ram->postcopy_requests = ram_counters.postcopy_requests;
info->ram->page_size = qemu_target_page_size();
+info->ram->multifd = ram_counters.multifd;
if (migrate_use_xbzrle()) {
info->has_xbzrle_cache = true;
diff --git a/migration/ram.c b/migration/ram.c
index e9fa556..03f3427 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -68,6 +68,7 @@
#define RAM_SAVE_FLAG_XBZRLE 0x40
/* 0x80 is reserved in migration.h start with 0x100 next */
#define RAM_SAVE_FLAG_COMPRESS_PAGE0x100
+#define RAM_SAVE_FLAG_MULTIFD_PAGE 0x200
static inline bool is_zero_range(uint8_t *p, uint64_t size)
{
@@ -362,12 +363,22 @@ static void compress_threads_save_setup(void)
/* Multiple fd's */
struct MultiFDSendParams {
+/* not changed */
uint8_t id;
QemuThread thread;
QIOChannel *c;
QemuSemaphore sem;
QemuMutex mutex;
+/* protected by param mutex */
bool quit;
+/* This is a temp field. We are using it now to transmit
+ something the address of the page. Later in the series, we
+ change it for the real page.
+*/
+uint8_t *address;
+/* protected by multifd mutex */
+/* has the thread finish the last submitted job */
+bool done;
};
typedef struct MultiFDSendParams MultiFDSendParams;
@@ -375,6 +386,8 @@ struct {
MultiFDSendParams *params;
/* number of created threads */
int count;
+QemuMutex mutex;
+QemuSemaphore sem;
} *multifd_send_state;
static void terminate_multifd_send_threads(void)
@@ -433,6 +446,7 @@ static void *multifd_send_thread(void *opaque)
g_free(string_uuid);
qio_channel_write(p->c, string, MULTIFD_UUID_MSG, &error_abort);
g_free(string);
+qemu_sem_post(&multifd_send_state->sem);
while (true) {
qemu_mutex_lock(&p->mutex);
@@ -440,6 +454,15 @@ static void *multifd_send_thread(void *opaque)
qemu_mutex_unlock(&p->mutex);
break;
}
+if (p->address) {
+p->address = 0;
+qemu_mutex_unlock(&p->mutex);
+qemu_mutex_lock(&multifd_send_state->mutex);
+p->done = true;
+qemu_mutex_unlock(&multifd_send_state->mutex);
+qemu_sem_post(&multifd_send_state->sem);
+continue;
+}
qemu_mutex_unlock(&p->mutex);
qemu_sem_wait(&p->sem);
}
@@ -459,6 +482,8 @@ int multifd_save_setup(void)
multifd_send_state = g_malloc0(sizeof(*multifd_send_state));
multifd_send_state->params = g_new0(MultiFDSendParams, thread_count);
multifd_send_state->count = 0;
+qemu_mutex_init(&multifd_send_state->mutex);
+qemu_sem_init(&multifd_send_state->sem, 0);
for (i = 0; i < thread_count; i++) {
char thread_name[16];
MultiFDSendParams *p = &multifd_send_state->params[i];
@@ -467,6 +492,8 @@ int multifd_save_setup(void)
qemu_sem_init(&p->sem, 0);
p->quit = false;
p->id = i;
+p->done = true;
+p->address = 0;
p->c = socket_send_channel_create();
if (!p->c) {
error_report("Error creating a send channel");
@@ -481,6 +508,30 @@ int multifd_save_setup(void)
return 0;
}
+static uint16_t multifd_send_page(uint8_t *address, bool last_page)
+{
+int i;
+MultiFDSendParams *p = NULL; /* make happy gcc */
+
+qemu_sem_wait(&multifd_send_state->sem);
+qemu_mutex_lock(&multifd_send_state->mutex);
+for (i = 0; i < multifd_send_state->count; i++) {
+p = &multifd_send_state->params[i];
+
+if (p->done) {
+p->done = false;
+break;
+}
+}
+qemu_mutex_unlock(&multifd_send_state->mutex);
+qemu_mutex_lock(&p->mutex);
+p->addr
[Qemu-devel] [PATCH v6 12/19] migration: Create ram_multifd_page
The function still don't use multifd, but we have simplified
ram_save_page, xbzrle and RDMA stuff is gone. We have added a new
counter and a new flag for this type of pages.
Signed-off-by: Juan Quintela
--
Add last_page parameter
Add commets for done and address
---
hmp.c | 2 ++
migration/migration.c | 1 +
migration/ram.c | 94 ++-
qapi-schema.json | 5 ++-
4 files changed, 100 insertions(+), 2 deletions(-)
diff --git a/hmp.c b/hmp.c
index a52035a..bc2b071 100644
--- a/hmp.c
+++ b/hmp.c
@@ -234,6 +234,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",
info->ram->postcopy_requests);
}
+monitor_printf(mon, "multifd: %" PRIu64 " pages\n",
+ info->ram->multifd);
}
if (info->has_disk) {
diff --git a/migration/migration.c b/migration/migration.c
index 944d6e2..8e9505a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -549,6 +549,7 @@ static void populate_ram_info(MigrationInfo *info,
MigrationState *s)
info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
info->ram->postcopy_requests = ram_counters.postcopy_requests;
info->ram->page_size = qemu_target_page_size();
+info->ram->multifd = ram_counters.multifd;
if (migrate_use_xbzrle()) {
info->has_xbzrle_cache = true;
diff --git a/migration/ram.c b/migration/ram.c
index e9fa556..03f3427 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -68,6 +68,7 @@
#define RAM_SAVE_FLAG_XBZRLE 0x40
/* 0x80 is reserved in migration.h start with 0x100 next */
#define RAM_SAVE_FLAG_COMPRESS_PAGE0x100
+#define RAM_SAVE_FLAG_MULTIFD_PAGE 0x200
static inline bool is_zero_range(uint8_t *p, uint64_t size)
{
@@ -362,12 +363,22 @@ static void compress_threads_save_setup(void)
/* Multiple fd's */
struct MultiFDSendParams {
+/* not changed */
uint8_t id;
QemuThread thread;
QIOChannel *c;
QemuSemaphore sem;
QemuMutex mutex;
+/* protected by param mutex */
bool quit;
+/* This is a temp field. We are using it now to transmit
+ something the address of the page. Later in the series, we
+ change it for the real page.
+*/
+uint8_t *address;
+/* protected by multifd mutex */
+/* has the thread finish the last submitted job */
+bool done;
};
typedef struct MultiFDSendParams MultiFDSendParams;
@@ -375,6 +386,8 @@ struct {
MultiFDSendParams *params;
/* number of created threads */
int count;
+QemuMutex mutex;
+QemuSemaphore sem;
} *multifd_send_state;
static void terminate_multifd_send_threads(void)
@@ -433,6 +446,7 @@ static void *multifd_send_thread(void *opaque)
g_free(string_uuid);
qio_channel_write(p->c, string, MULTIFD_UUID_MSG, &error_abort);
g_free(string);
+qemu_sem_post(&multifd_send_state->sem);
while (true) {
qemu_mutex_lock(&p->mutex);
@@ -440,6 +454,15 @@ static void *multifd_send_thread(void *opaque)
qemu_mutex_unlock(&p->mutex);
break;
}
+if (p->address) {
+p->address = 0;
+qemu_mutex_unlock(&p->mutex);
+qemu_mutex_lock(&multifd_send_state->mutex);
+p->done = true;
+qemu_mutex_unlock(&multifd_send_state->mutex);
+qemu_sem_post(&multifd_send_state->sem);
+continue;
+}
qemu_mutex_unlock(&p->mutex);
qemu_sem_wait(&p->sem);
}
@@ -459,6 +482,8 @@ int multifd_save_setup(void)
multifd_send_state = g_malloc0(sizeof(*multifd_send_state));
multifd_send_state->params = g_new0(MultiFDSendParams, thread_count);
multifd_send_state->count = 0;
+qemu_mutex_init(&multifd_send_state->mutex);
+qemu_sem_init(&multifd_send_state->sem, 0);
for (i = 0; i < thread_count; i++) {
char thread_name[16];
MultiFDSendParams *p = &multifd_send_state->params[i];
@@ -467,6 +492,8 @@ int multifd_save_setup(void)
qemu_sem_init(&p->sem, 0);
p->quit = false;
p->id = i;
+p->done = true;
+p->address = 0;
p->c = socket_send_channel_create();
if (!p->c) {
error_report("Error creating a send channel");
@@ -481,6 +508,30 @@ int multifd_save_setup(void)
return 0;
}
+static uint16_t multifd_send_page(uint8_t *address, bool last_page)
+{
+int i;
+MultiFDSendParams *p = NULL; /* make happy gcc */
+
+qemu_sem_wait(&multifd_send_state->sem);
+qemu_mutex_lock(&multifd_send_state->mutex);
+for (i = 0; i < multifd_send_state->count; i++) {
+p = &multifd_send_state->params[i];
+
+if (p->done) {
+p->done = false;
+break;
+}
+}
+qemu_mutex_unlock(&multifd_send_state->mutex);
+qemu_mutex_lock(&p->mutex);
+p->addr
