| Message ID | 20241125191128.9120-1-farosas@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | migration: Fix extra cleanup at postcopy listen | expand |
On Mon, Nov 25, 2024 at 04:11:28PM -0300, Fabiano Rosas wrote: > After fixing the loadvm cleanup race the qemu_loadvm_state_cleanup() > is now being called twice in the postcopy listen thread. > > Fixes: 4ce5622908 ("migration/multifd: Fix rb->receivedmap cleanup race") > Signed-off-by: Fabiano Rosas <farosas@suse.de> This is so far harmless, right? I think we can still queue this for 9.2, but I'd just like to double check.. > --- > migration/savevm.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index f4e4876f72..98821c8120 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2057,7 +2057,6 @@ static void *postcopy_ram_listen_thread(void *opaque) > * got a bad migration state). > */ > migration_incoming_state_destroy(); > - qemu_loadvm_state_cleanup(); > > rcu_unregister_thread(); > mis->have_listen_thread = false; > -- > 2.35.3 >
Peter Xu <peterx@redhat.com> writes: > On Mon, Nov 25, 2024 at 04:11:28PM -0300, Fabiano Rosas wrote: >> After fixing the loadvm cleanup race the qemu_loadvm_state_cleanup() >> is now being called twice in the postcopy listen thread. >> >> Fixes: 4ce5622908 ("migration/multifd: Fix rb->receivedmap cleanup race") >> Signed-off-by: Fabiano Rosas <farosas@suse.de> > > This is so far harmless, right? I think we can still queue this for 9.2, > but I'd just like to double check.. > I believe so, yes. >> --- >> migration/savevm.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/migration/savevm.c b/migration/savevm.c >> index f4e4876f72..98821c8120 100644 >> --- a/migration/savevm.c >> +++ b/migration/savevm.c >> @@ -2057,7 +2057,6 @@ static void *postcopy_ram_listen_thread(void *opaque) >> * got a bad migration state). >> */ >> migration_incoming_state_destroy(); >> - qemu_loadvm_state_cleanup(); >> >> rcu_unregister_thread(); >> mis->have_listen_thread = false; >> -- >> 2.35.3 >>
diff --git a/migration/savevm.c b/migration/savevm.c index f4e4876f72..98821c8120 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2057,7 +2057,6 @@ static void *postcopy_ram_listen_thread(void *opaque) * got a bad migration state). */ migration_incoming_state_destroy(); - qemu_loadvm_state_cleanup(); rcu_unregister_thread(); mis->have_listen_thread = false;
After fixing the loadvm cleanup race the qemu_loadvm_state_cleanup() is now being called twice in the postcopy listen thread. Fixes: 4ce5622908 ("migration/multifd: Fix rb->receivedmap cleanup race") Signed-off-by: Fabiano Rosas <farosas@suse.de> --- migration/savevm.c | 1 - 1 file changed, 1 deletion(-)