Re: [PULL 00/17] migration queue
On 5/16/22 08:37, Dr. David Alan Gilbert (git) wrote: From: "Dr. David Alan Gilbert" The following changes since commit 10c2a0c5e7d48e590d945c017b5b8af5b4c89a3c: Merge tag 'or1k-pull-request-20220515' of https://github.com/stffrdhrn/qemu into staging (2022-05-15 16:56:27 -0700) are available in the Git repository at: https://gitlab.com/dagrh/qemu.git tags/pull-migration-20220516a for you to fetch changes up to 5b1d9bab2da4fca3a3caee97c430e5709cb32b7b: multifd: Implement zero copy write in multifd migration (multifd-zero-copy) (2022-05-16 13:56:24 +0100) Migration pull 2022-05-16 (This replaces the 28th April through 10th May sets) Compared to that last set it just has the Alpine uring check that Leo has added; although that's also now fixed upstream in Alpine. It contains: TLS test fixes from Dan Zerocopy migration feature from Leo Signed-off-by: Dr. David Alan Gilbert Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate. r~ Daniel P. Berrangé (9): tests: fix encoding of IP addresses in x509 certs tests: add more helper macros for creating TLS x509 certs tests: add migration tests of TLS with PSK credentials tests: add migration tests of TLS with x509 credentials tests: convert XBZRLE migration test to use common helper tests: convert multifd migration tests to use common helper tests: add multifd migration tests of TLS with PSK credentials tests: add multifd migration tests of TLS with x509 credentials tests: ensure migration status isn't reported as failed Leonardo Bras (8): meson.build: Fix docker-test-build@alpine when including linux/errqueue.h QIOChannel: Add flags on io_writev and introduce io_flush callback QIOChannelSocket: Implement io_writev zero copy flag & io_flush for CONFIG_LINUX migration: Add zero-copy-send parameter for QMP/HMP for Linux migration: Add migrate_use_tls() helper multifd: multifd_send_sync_main now returns negative on error multifd: Send header packet without flags if zero-copy-send is enabled multifd: Implement zero copy write in multifd migration (multifd-zero-copy) chardev/char-io.c| 2 +- hw/remote/mpqemu-link.c | 2 +- include/io/channel-socket.h | 2 + include/io/channel.h | 38 +- io/channel-buffer.c | 1 + io/channel-command.c | 1 + io/channel-file.c| 1 + io/channel-socket.c | 118 - io/channel-tls.c | 1 + io/channel-websock.c | 1 + io/channel.c | 49 +- meson.build | 12 + migration/channel.c | 3 +- migration/migration.c| 52 ++- migration/migration.h| 6 + migration/multifd.c | 74 ++- migration/multifd.h | 4 +- migration/ram.c | 29 +- migration/rdma.c | 1 + migration/socket.c | 12 +- monitor/hmp-cmds.c | 6 + qapi/migration.json | 24 + scsi/pr-manager-helper.c | 2 +- tests/qtest/meson.build | 12 +- tests/qtest/migration-helpers.c | 13 + tests/qtest/migration-helpers.h | 1 + tests/qtest/migration-test.c | 867 +++ tests/unit/crypto-tls-psk-helpers.c | 18 +- tests/unit/crypto-tls-psk-helpers.h | 1 + tests/unit/crypto-tls-x509-helpers.c | 16 +- tests/unit/crypto-tls-x509-helpers.h | 53 +++ tests/unit/test-crypto-tlssession.c | 11 +- tests/unit/test-io-channel-socket.c | 1 + 33 files changed, 1295 insertions(+), 139 deletions(-)
Re: [PULL 00/17] migration queue
On Thu, 13 May 2021 at 18:37, Dr. David Alan Gilbert (git) wrote: > > From: "Dr. David Alan Gilbert" > > The following changes since commit dab59ce031228066eb95a9c518846fcacfb0dbbf: > > Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210511' into > staging (2021-05-13 14:45:38 +0100) > > are available in the Git repository at: > > git://github.com/dagrh/qemu.git tags/pull-migration-20210513a > > for you to fetch changes up to 1c3baa1ac4dee2b52837fda89d1d9deeb5da512e: > > tests/migration: introduce multifd into guestperf (2021-05-13 18:21:14 > +0100) > > > Migration pull 2021-05-13 > > Fix of the 2021-05-11 version, with a fix to build on the armhf > cross. > > The largest change in this set is David's changes for ram block size > changing; then there's a pile of other cleanups and fixes. > > Signed-off-by: Dr. David Alan Gilbert Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1 for any user-visible changes. -- PMM
Re: [PULL 00/17] migration queue
* Peter Maydell (peter.mayd...@linaro.org) wrote: > On Tue, 11 May 2021 at 16:08, Dr. David Alan Gilbert (git) > wrote: > > > > From: "Dr. David Alan Gilbert" > > > > The following changes since commit e4f3ede95ce813d5705c65e1c0e1c80c70739ebb: > > > > Merge remote-tracking branch > > 'remotes/kraxel/tags/usb-20210505-pull-request' into staging (2021-05-10 > > 19:55:06 +0100) > > > > are available in the Git repository at: > > > > git://github.com/dagrh/qemu.git tags/pull-migration-20210511a > > > > for you to fetch changes up to 872df23afc70985af5a458e0c4bd2b984559015c: > > > > tests/migration: introduce multifd into guestperf (2021-05-11 11:26:19 > > +0100) > > > > > > Migration pull 2021-05-11 > > > > The largest change in this set is David's changes for ram block size > > changing; then there's a pile of other cleanups and fixes. > > > > Signed-off-by: Dr. David Alan Gilbert > > > > Fails to build on the gitlab cross build job: > https://gitlab.com/qemu-project/qemu/-/jobs/1258047823 > > ../migration/ram.c: In function 'host_page_from_ram_block_offset': > ../migration/ram.c:3092:12: error: cast to pointer from integer of > different size [-Werror=int-to-pointer-cast] > return (void *)QEMU_ALIGN_DOWN((uintptr_t)block->host + offset, > ^ OK, resent with a pair of brackets around the (block->host + offset), so that the result ends up as the uintptr_t. Seems to work for me in the docker test that otherwise failed. Dave > > thanks > -- PMM > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
Re: [PULL 00/17] migration queue
On Thu, 13 May 2021 at 14:17, Dr. David Alan Gilbert wrote: > > * Peter Maydell (peter.mayd...@linaro.org) wrote: > > Fails to build on the gitlab cross build job: > > https://gitlab.com/qemu-project/qemu/-/jobs/1258047823 > > > > ../migration/ram.c: In function 'host_page_from_ram_block_offset': > > ../migration/ram.c:3092:12: error: cast to pointer from integer of > > different size [-Werror=int-to-pointer-cast] > > return (void *)QEMU_ALIGN_DOWN((uintptr_t)block->host + offset, > > ^ > > Interesting; it's compiling fine on my i686 debian chroot I normally use > to find 32bit-isms. Yeah, it was ok on the 32-bit machine I use too. It's maybe a bit of code that's hidden by ifdefs or whatever on my setup but exposed on the gitlab builder. -- PMM
Re: [PULL 00/17] migration queue
* Peter Maydell (peter.mayd...@linaro.org) wrote: > On Tue, 11 May 2021 at 16:08, Dr. David Alan Gilbert (git) > wrote: > > > > From: "Dr. David Alan Gilbert" > > > > The following changes since commit e4f3ede95ce813d5705c65e1c0e1c80c70739ebb: > > > > Merge remote-tracking branch > > 'remotes/kraxel/tags/usb-20210505-pull-request' into staging (2021-05-10 > > 19:55:06 +0100) > > > > are available in the Git repository at: > > > > git://github.com/dagrh/qemu.git tags/pull-migration-20210511a > > > > for you to fetch changes up to 872df23afc70985af5a458e0c4bd2b984559015c: > > > > tests/migration: introduce multifd into guestperf (2021-05-11 11:26:19 > > +0100) > > > > > > Migration pull 2021-05-11 > > > > The largest change in this set is David's changes for ram block size > > changing; then there's a pile of other cleanups and fixes. > > > > Signed-off-by: Dr. David Alan Gilbert > > > > Fails to build on the gitlab cross build job: > https://gitlab.com/qemu-project/qemu/-/jobs/1258047823 > > ../migration/ram.c: In function 'host_page_from_ram_block_offset': > ../migration/ram.c:3092:12: error: cast to pointer from integer of > different size [-Werror=int-to-pointer-cast] > return (void *)QEMU_ALIGN_DOWN((uintptr_t)block->host + offset, > ^ Interesting; it's compiling fine on my i686 debian chroot I normally use to find 32bit-isms. I'll have a look. Dave > thanks > -- PMM > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
Re: [PULL 00/17] migration queue
On Tue, 11 May 2021 at 16:08, Dr. David Alan Gilbert (git) wrote: > > From: "Dr. David Alan Gilbert" > > The following changes since commit e4f3ede95ce813d5705c65e1c0e1c80c70739ebb: > > Merge remote-tracking branch > 'remotes/kraxel/tags/usb-20210505-pull-request' into staging (2021-05-10 > 19:55:06 +0100) > > are available in the Git repository at: > > git://github.com/dagrh/qemu.git tags/pull-migration-20210511a > > for you to fetch changes up to 872df23afc70985af5a458e0c4bd2b984559015c: > > tests/migration: introduce multifd into guestperf (2021-05-11 11:26:19 > +0100) > > > Migration pull 2021-05-11 > > The largest change in this set is David's changes for ram block size > changing; then there's a pile of other cleanups and fixes. > > Signed-off-by: Dr. David Alan Gilbert > Fails to build on the gitlab cross build job: https://gitlab.com/qemu-project/qemu/-/jobs/1258047823 ../migration/ram.c: In function 'host_page_from_ram_block_offset': ../migration/ram.c:3092:12: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] return (void *)QEMU_ALIGN_DOWN((uintptr_t)block->host + offset, ^ thanks -- PMM
