On Tue, Oct 03, 2023 at 01:55:35AM +0300, Michael Tokarev wrote: > 18.09.2023 20:28, Fabiano Rosas wrote: > > This series contains fixes for the two currently know failures that > > show up in migration tests plus a set of fixes for some theoretical > > race conditions around QEMUFile handling. > > > > Patch 1 addresses the issue found in the postcopy/preempt/plain test: > > https://gitlab.com/qemu-project/qemu/-/issues/1886 > > > > Patch 7 fixes a rare crash during the postocpy/preempt/recovery/plain test: > > > > Thread 7 "return path" received signal SIGSEGV, Segmentation fault. > > 0x00005555560e4893 in qemu_file_get_error_obj (f=0x0, errp=0x0) at > > ../migration/qemu-file.c:154 > > 154 return f->last_error; > > > > CI run: https://gitlab.com/farosas/qemu/-/pipelines/1008652837 > > > > Fabiano Rosas (7): > > migration: Fix possible race when setting rp_state.error > > migration: Fix possible races when shutting down the return path > > migration: Fix possible race when shutting down to_dst_file > > migration: Remove redundant cleanup of postcopy_qemufile_src > > migration: Consolidate return path closing code > > migration: Replace the return path retry logic > > migration: Move return path cleanup to main migration thread > > > > Peter Xu (1): > > migration: Fix race that dest preempt thread close too early > > > > migration/migration.c | 145 +++++++++++++++------------------------ > > migration/migration.h | 14 +++- > > migration/postcopy-ram.c | 38 +++++++++- > > 3 files changed, 106 insertions(+), 91 deletions(-) > > What can be done for -stable? > > At least the whole thing applies cleanly to 8.1.
It seems v8.0.5 needs at least a few conflict resolutions. I'd say we go apply those to 8.1.1, and we can skip 8.0 unless someone requests for it. Thanks, -- Peter Xu
