From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Peter Xu <peterx@redhat.com>
Cc: Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
qemu-devel@nongnu.org, Juan Quintela <quintela@redhat.com>
Subject: Re: [PATCH 19/20] migration: Postcopy recover with preempt enabled
Date: Wed, 23 Feb 2022 18:53:17 +0000 [thread overview]
Message-ID: <YhaCndY58Xlt7OFN@work-vm> (raw)
In-Reply-To: <YhYzN3upm62HEnTm@xz-m1.local>
* Peter Xu (peterx@redhat.com) wrote:
> On Wed, Feb 23, 2022 at 09:52:08AM +0000, Dr. David Alan Gilbert wrote:
> > * Peter Xu (peterx@redhat.com) wrote:
> > > On Tue, Feb 22, 2022 at 11:32:10AM +0000, Dr. David Alan Gilbert wrote:
> > > > * Peter Xu (peterx@redhat.com) wrote:
> > > > > To allow postcopy recovery, the ram fast load (preempt-only) dest QEMU thread
> > > > > needs similar handling on fault tolerance. When ram_load_postcopy() fails,
> > > > > instead of stopping the thread it halts with a semaphore, preparing to be
> > > > > kicked again when recovery is detected.
> > > > >
> > > > > A mutex is introduced to make sure there's no concurrent operation upon the
> > > > > socket. To make it simple, the fast ram load thread will take the mutex during
> > > > > its whole procedure, and only release it if it's paused. The fast-path socket
> > > > > will be properly released by the main loading thread safely when there's
> > > > > network failures during postcopy with that mutex held.
> > > >
> > > > I *think* this is mostly OK; but I worry I don't understand all the
> > > > cases; e.g.
> > > > a) If the postcopy channel errors first
> > > > b) If the main channel errors first
> > >
> > > Ah right, I don't think I handled all the cases. Sorry.
> > >
> > > We always check the main channel, but if the postcopy channel got faulted,
> > > we may not fall into paused mode as expected.
> > >
> > > I'll fix that up.
> >
> > Thanks.
> >
> > > >
> > > > Can you add some docs to walk through those and explain the locking ?
> > >
> > > Sure.
> > >
> > > The sem is mentioned in the last sentence of paragraph 1, where it's purely
> > > used for a way to yield the fast ram load thread so that when something
> > > wrong happens it can sleep on that semaphore. Then when we recover we'll
> > > post to the semaphore to kick it up. We used it like that in many places,
> > > e.g. postcopy_pause_sem_dst to yield the main load thread.
> > >
> > > The 2nd paragraph above was for explaining why we need the mutex; it's
> > > basically the same as rp_mutex protecting to_src_file, so that we won't
> > > accidentally close() the qemufile during some other thread using it. So
> > > the fast ram load thread needs to take that new mutex for mostly the whole
> > > lifecycle of itself (because it's loading from that qemufile), meanwhile
> > > only drop the mutex when it prepares to sleep. Then the main load thread
> > > can recycle the postcopy channel using qemu_fclose() safely.
> >
> > Yes, that feels like it needs to go in the code somewhere.
>
> Sure, I'll further squash below comment update into the same patch. I
> reworded some places but mostly it should be telling the same thing:
>
> ---8<---
> diff --git a/migration/migration.h b/migration/migration.h
> index 945088064a..91f845e9e4 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -118,7 +118,17 @@ struct MigrationIncomingState {
> /* Postcopy priority thread is used to receive postcopy requested pages */
> QemuThread postcopy_prio_thread;
> bool postcopy_prio_thread_created;
> - /* Used to sync with the prio thread */
> + /*
> + * Used to sync between the ram load main thread and the fast ram load
> + * thread. It protects postcopy_qemufile_dst, which is the postcopy
> + * fast channel.
> + *
> + * The ram fast load thread will take it mostly for the whole lifecycle
> + * because it needs to continuously read data from the channel, and
> + * it'll only release this mutex if postcopy is interrupted, so that
> + * the ram load main thread will take this mutex over and properly
> + * release the broken channel.
> + */
> QemuMutex postcopy_prio_thread_mutex;
> /*
> * An array of temp host huge pages to be used, one for each postcopy
> @@ -149,6 +159,12 @@ struct MigrationIncomingState {
> /* notify PAUSED postcopy incoming migrations to try to continue */
> QemuSemaphore postcopy_pause_sem_dst;
> QemuSemaphore postcopy_pause_sem_fault;
> + /*
> + * This semaphore is used to allow the ram fast load thread (only when
> + * postcopy preempt is enabled) fall into sleep when there's network
> + * interruption detected. When the recovery is done, the main load
> + * thread will kick the fast ram load thread using this semaphore.
> + */
> QemuSemaphore postcopy_pause_sem_fast_load;
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> /* List of listening socket addresses */
> ---8<---
>
> >
> > > [...]
> > >
> > > > > @@ -3466,6 +3468,17 @@ static MigThrError postcopy_pause(MigrationState *s)
> > > > > qemu_file_shutdown(file);
> > > > > qemu_fclose(file);
> > > > >
> > > > > + /*
> > > > > + * Do the same to postcopy fast path socket too if there is. No
> > > > > + * locking needed because no racer as long as we do this before setting
> > > > > + * status to paused.
> > > > > + */
> > > > > + if (s->postcopy_qemufile_src) {
> > > > > + migration_ioc_unregister_yank_from_file(s->postcopy_qemufile_src);
> > > >
> > > > Shouldn't this do a qemu_file_shutdown on here first?
> > >
> > > Yes I probably should.
> > >
> > > With all above, I plan to squash below changes into this patch:
> > >
> > > ---8<---
> > > diff --git a/migration/migration.c b/migration/migration.c
> > > index c68a281406..69778cab23 100644
> > > --- a/migration/migration.c
> > > +++ b/migration/migration.c
> > > @@ -3475,6 +3475,7 @@ static MigThrError postcopy_pause(MigrationState *s)
> > > */
> > > if (s->postcopy_qemufile_src) {
> > > migration_ioc_unregister_yank_from_file(s->postcopy_qemufile_src);
> > > + qemu_file_shutdown(s->postcopy_qemufile_src);
> > > qemu_fclose(s->postcopy_qemufile_src);
> > > s->postcopy_qemufile_src = NULL;
> > > }
> > > @@ -3534,8 +3535,13 @@ static MigThrError migration_detect_error(MigrationState *s)
> > > return MIG_THR_ERR_FATAL;
> > > }
> > >
> > > - /* Try to detect any file errors */
> > > - ret = qemu_file_get_error_obj(s->to_dst_file, &local_error);
> > > + /*
> > > + * Try to detect any file errors. Note that postcopy_qemufile_src will
> > > + * be NULL when postcopy preempt is not enabled.
> > > + */
> > > + ret = qemu_file_get_error_obj_any(s->to_dst_file,
> > > + s->postcopy_qemufile_src,
> > > + &local_error);
> > > if (!ret) {
> > > /* Everything is fine */
> > > assert(!local_error);
> > > diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> > > index 1479cddad9..397652f0ba 100644
> > > --- a/migration/qemu-file.c
> > > +++ b/migration/qemu-file.c
> > > @@ -139,6 +139,33 @@ int qemu_file_get_error_obj(QEMUFile *f, Error **errp)
> > > return f->last_error;
> > > }
> > >
> > > +/*
> > > + * Get last error for either stream f1 or f2 with optional Error*.
> > > + * The error returned (non-zero) can be either from f1 or f2.
> > > + *
> > > + * If any of the qemufile* is NULL, then skip the check on that file.
> > > + *
> > > + * When there is no error on both qemufile, zero is returned.
> > > + */
> > > +int qemu_file_get_error_obj_any(QEMUFile *f1, QEMUFile *f2, Error **errp)
> > > +{
> > > + int ret = 0;
> > > +
> > > + if (f1) {
> > > + ret = qemu_file_get_error_obj(f1, errp);
> > > + /* If there's already error detected, return */
> > > + if (ret) {
> > > + return ret;
> > > + }
> > > + }
> > > +
> > > + if (f2) {
> > > + ret = qemu_file_get_error_obj(f2, errp);
> > > + }
> > > +
> > > + return ret;
> > > +}
> > > +
> > > /*
> > > * Set the last error for stream f with optional Error*
> > > */
> > > diff --git a/migration/qemu-file.h b/migration/qemu-file.h
> > > index 3f36d4dc8c..2564e5e1c7 100644
> > > --- a/migration/qemu-file.h
> > > +++ b/migration/qemu-file.h
> > > @@ -156,6 +156,7 @@ void qemu_file_update_transfer(QEMUFile *f, int64_t len);
> > > void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
> > > int64_t qemu_file_get_rate_limit(QEMUFile *f);
> > > int qemu_file_get_error_obj(QEMUFile *f, Error **errp);
> > > +int qemu_file_get_error_obj_any(QEMUFile *f1, QEMUFile *f2, Error **errp);
> > > void qemu_file_set_error_obj(QEMUFile *f, int ret, Error *err);
> > > void qemu_file_set_error(QEMUFile *f, int ret);
> > > int qemu_file_shutdown(QEMUFile *f);
> > > diff --git a/migration/savevm.c b/migration/savevm.c
> > > index 2d32340d28..24b69a1008 100644
> > > --- a/migration/savevm.c
> > > +++ b/migration/savevm.c
> > > @@ -2651,8 +2651,8 @@ retry:
> > > while (true) {
> > > section_type = qemu_get_byte(f);
> > >
> > > - if (qemu_file_get_error(f)) {
> > > - ret = qemu_file_get_error(f);
> > > + ret = qemu_file_get_error_obj_any(f, mis->postcopy_qemufile_dst, NULL);
> > > + if (ret) {
> > > break;
> > > }
> > > ---8<---
> > >
> > > Does it look sane? Let me know if there's still things missing.
> >
> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> Thanks!
>
> --
> Peter Xu
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2022-02-23 18:55 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 6:27 [PATCH 00/20] migration: Postcopy Preemption Peter Xu
2022-02-16 6:27 ` [PATCH 01/20] migration: Dump sub-cmd name in loadvm_process_command tp Peter Xu
2022-02-16 15:42 ` Dr. David Alan Gilbert
2022-02-16 6:27 ` [PATCH 02/20] migration: Finer grained tracepoints for POSTCOPY_LISTEN Peter Xu
2022-02-16 15:43 ` Dr. David Alan Gilbert
2022-02-16 6:27 ` [PATCH 03/20] migration: Tracepoint change in postcopy-run bottom half Peter Xu
2022-02-16 19:00 ` Dr. David Alan Gilbert
2022-02-16 6:27 ` [PATCH 04/20] migration: Introduce postcopy channels on dest node Peter Xu
2022-02-21 15:49 ` Dr. David Alan Gilbert
2022-02-16 6:27 ` [PATCH 05/20] migration: Dump ramblock and offset too when non-same-page detected Peter Xu
2022-02-16 6:27 ` [PATCH 06/20] migration: Add postcopy_thread_create() Peter Xu
2022-02-21 16:00 ` Dr. David Alan Gilbert
2022-02-16 6:27 ` [PATCH 07/20] migration: Move static var in ram_block_from_stream() into global Peter Xu
2022-02-16 6:27 ` [PATCH 08/20] migration: Add pss.postcopy_requested status Peter Xu
2022-02-16 6:27 ` [PATCH 09/20] migration: Move migrate_allow_multifd and helpers into migration.c Peter Xu
2022-02-16 6:27 ` [PATCH 10/20] migration: Enlarge postcopy recovery to capture !-EIO too Peter Xu
2022-02-21 16:15 ` Dr. David Alan Gilbert
2022-02-16 6:28 ` [PATCH 11/20] migration: postcopy_pause_fault_thread() never fails Peter Xu
2022-02-21 16:16 ` Dr. David Alan Gilbert
2022-02-16 6:28 ` [PATCH 12/20] migration: Export ram_load_postcopy() Peter Xu
2022-02-21 16:17 ` Dr. David Alan Gilbert
2022-02-16 6:28 ` [PATCH 13/20] migration: Move channel setup out of postcopy_try_recover() Peter Xu
2022-02-22 10:57 ` Dr. David Alan Gilbert
2022-02-23 6:40 ` Peter Xu
2022-02-23 9:47 ` Dr. David Alan Gilbert
2022-02-23 12:55 ` Peter Xu
2022-02-16 6:28 ` [PATCH 14/20] migration: Add migration_incoming_transport_cleanup() Peter Xu
2022-02-21 16:56 ` Dr. David Alan Gilbert
2022-02-16 6:28 ` [PATCH 15/20] migration: Allow migrate-recover to run multiple times Peter Xu
2022-02-21 17:03 ` Dr. David Alan Gilbert
2022-02-22 2:51 ` Peter Xu
2022-02-16 6:28 ` [PATCH 16/20] migration: Add postcopy-preempt capability Peter Xu
2022-02-16 6:28 ` [PATCH 17/20] migration: Postcopy preemption preparation on channel creation Peter Xu
2022-02-21 18:39 ` Dr. David Alan Gilbert
2022-02-22 8:34 ` Peter Xu
2022-02-22 10:19 ` Dr. David Alan Gilbert
2022-02-16 6:28 ` [PATCH 18/20] migration: Postcopy preemption enablement Peter Xu
2022-02-22 10:52 ` Dr. David Alan Gilbert
2022-02-23 7:01 ` Peter Xu
2022-02-23 9:56 ` Dr. David Alan Gilbert
2022-02-23 13:05 ` Peter Xu
2022-02-16 6:28 ` [PATCH 19/20] migration: Postcopy recover with preempt enabled Peter Xu
2022-02-22 11:32 ` Dr. David Alan Gilbert
2022-02-23 7:45 ` Peter Xu
2022-02-23 9:52 ` Dr. David Alan Gilbert
2022-02-23 13:14 ` Peter Xu
2022-02-23 18:53 ` Dr. David Alan Gilbert [this message]
2022-02-16 6:28 ` [PATCH 20/20] tests: Add postcopy preempt test Peter Xu
2022-02-22 12:51 ` Dr. David Alan Gilbert
2022-02-23 7:50 ` Peter Xu
2022-03-01 5:34 ` Peter Xu
2022-03-01 17:00 ` Dr. David Alan Gilbert
2022-03-02 6:41 ` Peter Xu
2022-02-16 9:28 ` [PATCH 00/20] migration: Postcopy Preemption Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YhaCndY58Xlt7OFN@work-vm \
--to=dgilbert@redhat.com \
--cc=lsoaresp@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).