Re: [Qemu-devel] [RFC v2 22/33] migration: new message MIG_RP_MSG_RESUME_ACK

[Dr. David Alan Gilbert]

* Peter Xu (address@hidden) wrote:
> Creating new message to reply for MIG_CMD_POSTCOPY_RESUME. One uint32_t
> is used as payload to let the source know whether destination is ready
> to continue the migration.
> 
> Signed-off-by: Peter Xu <address@hidden>

Acked-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/migration.c  | 37 +++++++++++++++++++++++++++++++++++++
>  migration/migration.h  |  3 +++
>  migration/savevm.c     |  3 ++-
>  migration/trace-events |  1 +
>  4 files changed, 43 insertions(+), 1 deletion(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 625f19a..4dc564a 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -93,6 +93,7 @@ enum mig_rp_message_type {
>      MIG_RP_MSG_REQ_PAGES_ID, /* data (start: be64, len: be32, id: string) */
>      MIG_RP_MSG_REQ_PAGES,    /* data (start: be64, len: be32) */
>      MIG_RP_MSG_RECV_BITMAP,  /* send recved_bitmap back to source */
> +    MIG_RP_MSG_RESUME_ACK,   /* tell source that we are ready to resume */
>  
>      MIG_RP_MSG_MAX
>  };
> @@ -489,6 +490,14 @@ void migrate_send_rp_recv_bitmap(MigrationIncomingState 
> *mis,
>      trace_migrate_send_rp_recv_bitmap(block_name, res);
>  }
>  
> +void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)
> +{
> +    uint32_t buf;
> +
> +    buf = cpu_to_be32(value);
> +    migrate_send_rp_message(mis, MIG_RP_MSG_RESUME_ACK, sizeof(buf), &buf);
> +}
> +
>  MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
>  {
>      MigrationCapabilityStatusList *head = NULL;
> @@ -1613,6 +1622,7 @@ static struct rp_cmd_args {
>      [MIG_RP_MSG_REQ_PAGES]      = { .len = 12, .name = "REQ_PAGES" },
>      [MIG_RP_MSG_REQ_PAGES_ID]   = { .len = -1, .name = "REQ_PAGES_ID" },
>      [MIG_RP_MSG_RECV_BITMAP]    = { .len = -1, .name = "RECV_BITMAP" },
> +    [MIG_RP_MSG_RESUME_ACK]     = { .len =  4, .name = "RESUME_ACK" },
>      [MIG_RP_MSG_MAX]            = { .len = -1, .name = "MAX" },
>  };
>  
> @@ -1670,6 +1680,25 @@ static int 
> migrate_handle_rp_recv_bitmap(MigrationState *s, char *block_name)
>      return ram_dirty_bitmap_reload(s, block);
>  }
>  
> +static int migrate_handle_rp_resume_ack(MigrationState *s, uint32_t value)
> +{
> +    trace_source_return_path_thread_resume_ack(value);
> +
> +    if (value != MIGRATION_RESUME_ACK_VALUE) {
> +        error_report("%s: illegal resume_ack value %"PRIu32,
> +                     __func__, value);
> +        return -1;
> +    }
> +
> +    /* Now both sides are active. */
> +    migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER,
> +                      MIGRATION_STATUS_POSTCOPY_ACTIVE);
> +
> +    /* TODO: notify send thread that time to continue send pages */
> +
> +    return 0;
> +}
> +
>  /*
>   * Handles messages sent on the return path towards the source VM
>   *
> @@ -1789,6 +1818,14 @@ retry:
>              }
>              break;
>  
> +        case MIG_RP_MSG_RESUME_ACK:
> +            tmp32 = ldl_be_p(buf);
> +            if (migrate_handle_rp_resume_ack(ms, tmp32)) {
> +                mark_source_rp_bad(ms);
> +                goto out;
> +            }
> +            break;
> +
>          default:
>              break;
>          }
> diff --git a/migration/migration.h b/migration/migration.h
> index 4051379..a3a0582 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -21,6 +21,8 @@
>  #include "qemu/coroutine_int.h"
>  #include "hw/qdev.h"
>  
> +#define  MIGRATION_RESUME_ACK_VALUE  (1)
> +
>  /* State for the incoming migration */
>  struct MigrationIncomingState {
>      QEMUFile *from_src_file;
> @@ -204,5 +206,6 @@ int migrate_send_rp_req_pages(MigrationIncomingState 
> *mis, const char* rbname,
>                                ram_addr_t start, size_t len);
>  void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis,
>                                   char *block_name);
> +void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
>  
>  #endif
> diff --git a/migration/savevm.c b/migration/savevm.c
> index e914346..7fd5390 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1707,7 +1707,8 @@ static int 
> loadvm_postcopy_handle_resume(MigrationIncomingState *mis)
>                        MIGRATION_STATUS_POSTCOPY_ACTIVE);
>      qemu_sem_post(&mis->postcopy_pause_sem_fault);
>  
> -    /* TODO: Tell source that "we are ready" */
> +    /* Tell source that "we are ready" */
> +    migrate_send_rp_resume_ack(mis, MIGRATION_RESUME_ACK_VALUE);
>  
>      return 0;
>  }
> diff --git a/migration/trace-events b/migration/trace-events
> index 0a1c302..a929bc7 100644
> --- a/migration/trace-events
> +++ b/migration/trace-events
> @@ -117,6 +117,7 @@ source_return_path_thread_entry(void) ""
>  source_return_path_thread_loop_top(void) ""
>  source_return_path_thread_pong(uint32_t val) "0x%x"
>  source_return_path_thread_shut(uint32_t val) "0x%x"
> +source_return_path_thread_resume_ack(uint32_t v) "%"PRIu32
>  migrate_global_state_post_load(const char *state) "loaded state: %s"
>  migrate_global_state_pre_save(const char *state) "saved state: %s"
>  migration_thread_low_pending(uint64_t pending) "%" PRIu64
> -- 
> 2.7.4
> 
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK