| Message ID | 1496828798-27548-7-git-send-email-a.perevalov@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Alexey Perevalov <a.perevalov@samsung.com> wrote: > This patch adds request to kernel space for UFFD_FEATURE_THREAD_ID, > in case when this feature is provided by kernel. > I think this function is wrong > +static void migration_exit_cb(Notifier *n, void *data) > +{ > + PostcopyBlocktimeContext *ctx = container_of(n, PostcopyBlocktimeContext, > + exit_notifier); > + destroy_blocktime_context(ctx); > +} > + > +static struct PostcopyBlocktimeContext *blocktime_context_new(void) > +{ > + PostcopyBlocktimeContext *ctx = g_new0(PostcopyBlocktimeContext, 1); > + ctx->page_fault_vcpu_time = g_new0(int64_t, smp_cpus); > + ctx->vcpu_addr = g_new0(uint64_t, smp_cpus); > + ctx->vcpu_blocktime = g_new0(int64_t, smp_cpus); > + > + ctx->exit_notifier.notify = migration_exit_cb; > + qemu_add_exit_notifier(&ctx->exit_notifier); > + add_migration_state_change_notifier(&ctx->postcopy_notifier); Or you don't want to call it this awy. This will destroy the context at every migration state change. Or I am missing something here? Look at ui/spice-core.c to see how to use it only for some states (I guess you will need to do it for error/cleanup/completion changes only). Later, Juan. > + return ctx; > +} > > /** > * receive_ufd_features: check userfault fd features, to request only supported > @@ -155,6 +207,19 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis) > } > } > > +#ifdef UFFD_FEATURE_THREAD_ID > + if (migrate_postcopy_blocktime() && mis && > + UFFD_FEATURE_THREAD_ID & supported_features) { > + /* kernel supports that feature */ > + /* don't create blocktime_context if it exists */ > + if (!mis->blocktime_ctx) { > + mis->blocktime_ctx = blocktime_context_new(); > + } > + > + asked_features |= UFFD_FEATURE_THREAD_ID; > + } > +#endif > + > /* > * request features, even if asked_features is 0, due to > * kernel expects UFFD_API before UFFDIO_REGISTER, per
On 06/07/2017 03:43 PM, Juan Quintela wrote: > Alexey Perevalov <a.perevalov@samsung.com> wrote: >> This patch adds request to kernel space for UFFD_FEATURE_THREAD_ID, >> in case when this feature is provided by kernel. >> > I think this function is wrong migration_exit_cb will be called at QEMU exit, but see later > >> +static void migration_exit_cb(Notifier *n, void *data) >> +{ >> + PostcopyBlocktimeContext *ctx = container_of(n, PostcopyBlocktimeContext, >> + exit_notifier); >> + destroy_blocktime_context(ctx); >> +} >> + >> +static struct PostcopyBlocktimeContext *blocktime_context_new(void) >> +{ >> + PostcopyBlocktimeContext *ctx = g_new0(PostcopyBlocktimeContext, 1); >> + ctx->page_fault_vcpu_time = g_new0(int64_t, smp_cpus); >> + ctx->vcpu_addr = g_new0(uint64_t, smp_cpus); >> + ctx->vcpu_blocktime = g_new0(int64_t, smp_cpus); >> + >> + ctx->exit_notifier.notify = migration_exit_cb; >> + qemu_add_exit_notifier(&ctx->exit_notifier); >> + add_migration_state_change_notifier(&ctx->postcopy_notifier); > Or you don't want to call it this awy. > > This will destroy the context at every migration state change. > > Or I am missing something here? Look at ui/spice-core.c to see how to > use it only for some states (I guess you will need to do it for > error/cleanup/completion changes only). I forgot, to remove add_migration_state_change_notifier(&ctx->postcopy_notifier); in previous version, here was callback with migration state check. > > Later, Juan. > >> + return ctx; >> +} >> >> /** >> * receive_ufd_features: check userfault fd features, to request only supported >> @@ -155,6 +207,19 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis) >> } >> } >> >> +#ifdef UFFD_FEATURE_THREAD_ID >> + if (migrate_postcopy_blocktime() && mis && >> + UFFD_FEATURE_THREAD_ID & supported_features) { >> + /* kernel supports that feature */ >> + /* don't create blocktime_context if it exists */ >> + if (!mis->blocktime_ctx) { >> + mis->blocktime_ctx = blocktime_context_new(); >> + } >> + >> + asked_features |= UFFD_FEATURE_THREAD_ID; >> + } >> +#endif >> + >> /* >> * request features, even if asked_features is 0, due to >> * kernel expects UFFD_API before UFFDIO_REGISTER, per > >
diff --git a/include/migration/migration.h b/include/migration/migration.h index 2e61df5..766e802 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -49,6 +49,8 @@ enum mig_rp_message_type { MIG_RP_MSG_MAX }; +struct PostcopyBlocktimeContext; + /* State for the incoming migration */ struct MigrationIncomingState { QEMUFile *from_src_file; @@ -86,6 +88,12 @@ struct MigrationIncomingState { /* The coroutine we should enter (back) after failover */ Coroutine *migration_incoming_co; QemuSemaphore colo_incoming_sem; + + /* + * PostcopyBlocktimeContext to keep information for postcopy + * live migration, to calculate vCPU block time + * */ + struct PostcopyBlocktimeContext *blocktime_ctx; }; MigrationIncomingState *migration_incoming_get_current(void); diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index cbe8f9f..ade7f1c 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -63,6 +63,58 @@ struct PostcopyDiscardState { #include <sys/eventfd.h> #include <linux/userfaultfd.h> +typedef struct PostcopyBlocktimeContext { + /* time when page fault initiated per vCPU */ + int64_t *page_fault_vcpu_time; + /* page address per vCPU */ + uint64_t *vcpu_addr; + int64_t total_blocktime; + /* blocktime per vCPU */ + int64_t *vcpu_blocktime; + /* point in time when last page fault was initiated */ + int64_t last_begin; + /* number of vCPU are suspended */ + int smp_cpus_down; + + /* + * Handler for exit event, necessary for + * releasing whole blocktime_ctx + */ + Notifier exit_notifier; + /* + * Handler for postcopy event, necessary for + * releasing unnecessary part of blocktime_ctx + */ + Notifier postcopy_notifier; +} PostcopyBlocktimeContext; + +static void destroy_blocktime_context(struct PostcopyBlocktimeContext *ctx) +{ + g_free(ctx->page_fault_vcpu_time); + g_free(ctx->vcpu_addr); + g_free(ctx->vcpu_blocktime); + g_free(ctx); +} + +static void migration_exit_cb(Notifier *n, void *data) +{ + PostcopyBlocktimeContext *ctx = container_of(n, PostcopyBlocktimeContext, + exit_notifier); + destroy_blocktime_context(ctx); +} + +static struct PostcopyBlocktimeContext *blocktime_context_new(void) +{ + PostcopyBlocktimeContext *ctx = g_new0(PostcopyBlocktimeContext, 1); + ctx->page_fault_vcpu_time = g_new0(int64_t, smp_cpus); + ctx->vcpu_addr = g_new0(uint64_t, smp_cpus); + ctx->vcpu_blocktime = g_new0(int64_t, smp_cpus); + + ctx->exit_notifier.notify = migration_exit_cb; + qemu_add_exit_notifier(&ctx->exit_notifier); + add_migration_state_change_notifier(&ctx->postcopy_notifier); + return ctx; +} /** * receive_ufd_features: check userfault fd features, to request only supported @@ -155,6 +207,19 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis) } } +#ifdef UFFD_FEATURE_THREAD_ID + if (migrate_postcopy_blocktime() && mis && + UFFD_FEATURE_THREAD_ID & supported_features) { + /* kernel supports that feature */ + /* don't create blocktime_context if it exists */ + if (!mis->blocktime_ctx) { + mis->blocktime_ctx = blocktime_context_new(); + } + + asked_features |= UFFD_FEATURE_THREAD_ID; + } +#endif + /* * request features, even if asked_features is 0, due to * kernel expects UFFD_API before UFFDIO_REGISTER, per
This patch adds request to kernel space for UFFD_FEATURE_THREAD_ID, in case when this feature is provided by kernel. PostcopyBlocktimeContext is incapsulated inside postcopy-ram.c, due to it's postcopy only feature. Also it defines PostcopyBlocktimeContext's instance live time. Information from PostcopyBlocktimeContext instance will be provided much after postcopy migration end, instance of PostcopyBlocktimeContext will live till QEMU exit, but part of it (vcpu_addr, page_fault_vcpu_time) used only during calculation, will be released when postcopy ended or failed. To enable postcopy blocktime calculation on destination, need to request proper capabiltiy (Patch for documentation will be at the tail of the patch set). As an example following command enable that capability, assume QEMU was started with -chardev socket,id=charmonitor,path=/var/lib/migrate-vm-monitor.sock option to control it [root@host]#printf "{\"execute\" : \"qmp_capabilities\"}\r\n \ {\"execute\": \"migrate-set-capabilities\" , \"arguments\": { \"capabilities\": [ { \"capability\": \"postcopy-blocktime\", \"state\": true } ] } }" | nc -U /var/lib/migrate-vm-monitor.sock Or just with HMP (qemu) migrate_set_capability postcopy-blocktime on Signed-off-by: Alexey Perevalov <a.perevalov@samsung.com> --- include/migration/migration.h | 8 ++++++ migration/postcopy-ram.c | 65 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+)