* [PATCH V5 1/2] migration: file URI
2023-09-08 14:22 [PATCH V5 0/2] migration file URI Steve Sistare
@ 2023-09-08 14:22 ` Steve Sistare
2023-09-08 14:28 ` Daniel P. Berrangé
2023-10-04 11:01 ` Juan Quintela
2023-09-08 14:22 ` [PATCH V5 2/2] migration: file URI offset Steve Sistare
2023-09-13 13:05 ` [PATCH V5 0/2] migration file URI Claudio Fontana
2 siblings, 2 replies; 8+ messages in thread
From: Steve Sistare @ 2023-09-08 14:22 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Juan Quintela, Daniel P. Berrange, Fabiano Rosas,
Claudio Fontana, Steve Sistare
Extend the migration URI to support file:<filename>. This can be used for
any migration scenario that does not require a reverse path. It can be
used as an alternative to 'exec:cat > file' in minimized containers that
do not contain /bin/sh, and it is easier to use than the fd:<fdname> URI.
It can be used in HMP commands, and as a qemu command-line parameter.
For best performance, guest ram should be shared and x-ignore-shared
should be true, so guest pages are not written to the file, in which case
the guest may remain running. If ram is not so configured, then the user
is advised to stop the guest first. Otherwise, a busy guest may re-dirty
the same page, causing it to be appended to the file multiple times,
and the file may grow unboundedly. That issue is being addressed in the
"fixed-ram" patch series.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Tested-by: Michael Galaxy <mgalaxy@akamai.com>
Reviewed-by: Michael Galaxy <mgalaxy@akamai.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
migration/file.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
migration/file.h | 14 ++++++++++++
migration/meson.build | 1 +
migration/migration.c | 5 ++++
migration/trace-events | 4 ++++
qemu-options.hx | 6 ++++-
6 files changed, 91 insertions(+), 1 deletion(-)
create mode 100644 migration/file.c
create mode 100644 migration/file.h
diff --git a/migration/file.c b/migration/file.c
new file mode 100644
index 0000000..0a65c43
--- /dev/null
+++ b/migration/file.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021-2023 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "channel.h"
+#include "file.h"
+#include "migration.h"
+#include "io/channel-file.h"
+#include "io/channel-util.h"
+#include "trace.h"
+
+void file_start_outgoing_migration(MigrationState *s, const char *filename,
+ Error **errp)
+{
+ g_autoptr(QIOChannelFile) fioc = NULL;
+ QIOChannel *ioc;
+
+ trace_migration_file_outgoing(filename);
+
+ fioc = qio_channel_file_new_path(filename, O_CREAT | O_WRONLY | O_TRUNC,
+ 0600, errp);
+ if (!fioc) {
+ return;
+ }
+
+ ioc = QIO_CHANNEL(fioc);
+ qio_channel_set_name(ioc, "migration-file-outgoing");
+ migration_channel_connect(s, ioc, NULL, NULL);
+}
+
+static gboolean file_accept_incoming_migration(QIOChannel *ioc,
+ GIOCondition condition,
+ gpointer opaque)
+{
+ migration_channel_process_incoming(ioc);
+ object_unref(OBJECT(ioc));
+ return G_SOURCE_REMOVE;
+}
+
+void file_start_incoming_migration(const char *filename, Error **errp)
+{
+ QIOChannelFile *fioc = NULL;
+ QIOChannel *ioc;
+
+ trace_migration_file_incoming(filename);
+
+ fioc = qio_channel_file_new_path(filename, O_RDONLY, 0, errp);
+ if (!fioc) {
+ return;
+ }
+
+ ioc = QIO_CHANNEL(fioc);
+ qio_channel_set_name(QIO_CHANNEL(ioc), "migration-file-incoming");
+ qio_channel_add_watch_full(ioc, G_IO_IN,
+ file_accept_incoming_migration,
+ NULL, NULL,
+ g_main_context_get_thread_default());
+}
diff --git a/migration/file.h b/migration/file.h
new file mode 100644
index 0000000..90fa484
--- /dev/null
+++ b/migration/file.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2021-2023 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef QEMU_MIGRATION_FILE_H
+#define QEMU_MIGRATION_FILE_H
+void file_start_incoming_migration(const char *filename, Error **errp);
+
+void file_start_outgoing_migration(MigrationState *s, const char *filename,
+ Error **errp);
+#endif
diff --git a/migration/meson.build b/migration/meson.build
index 1ae2852..92b1cc4 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -16,6 +16,7 @@ system_ss.add(files(
'dirtyrate.c',
'exec.c',
'fd.c',
+ 'file.c',
'global_state.c',
'migration-hmp-cmds.c',
'migration.c',
diff --git a/migration/migration.c b/migration/migration.c
index 096e819..c612ec1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -20,6 +20,7 @@
#include "migration/blocker.h"
#include "exec.h"
#include "fd.h"
+#include "file.h"
#include "socket.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
@@ -443,6 +444,8 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
exec_start_incoming_migration(p, errp);
} else if (strstart(uri, "fd:", &p)) {
fd_start_incoming_migration(p, errp);
+ } else if (strstart(uri, "file:", &p)) {
+ file_start_incoming_migration(p, errp);
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
}
@@ -1670,6 +1673,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
exec_start_outgoing_migration(s, p, &local_err);
} else if (strstart(uri, "fd:", &p)) {
fd_start_outgoing_migration(s, p, &local_err);
+ } else if (strstart(uri, "file:", &p)) {
+ file_start_outgoing_migration(s, p, &local_err);
} else {
if (!(has_resume && resume)) {
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
diff --git a/migration/trace-events b/migration/trace-events
index 5259c10..1d70dcf 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -310,6 +310,10 @@ migration_exec_incoming(const char *cmd) "cmd=%s"
migration_fd_outgoing(int fd) "fd=%d"
migration_fd_incoming(int fd) "fd=%d"
+# file.c
+migration_file_outgoing(const char *filename) "filename=%s"
+migration_file_incoming(const char *filename) "filename=%s"
+
# socket.c
migration_socket_incoming_accepted(void) ""
migration_socket_outgoing_connected(const char *hostname) "hostname=%s"
diff --git a/qemu-options.hx b/qemu-options.hx
index 3a6c7d3..54e28c1 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4626,6 +4626,7 @@ DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
" prepare for incoming migration, listen on\n" \
" specified protocol and socket address\n" \
"-incoming fd:fd\n" \
+ "-incoming file:filename\n" \
"-incoming exec:cmdline\n" \
" accept incoming migration on given file descriptor\n" \
" or from given external command\n" \
@@ -4642,7 +4643,10 @@ SRST
Prepare for incoming migration, listen on a given unix socket.
``-incoming fd:fd``
- Accept incoming migration from a given filedescriptor.
+ Accept incoming migration from a given file descriptor.
+
+``-incoming file:filename``
+ Accept incoming migration from a given file.
``-incoming exec:cmdline``
Accept incoming migration as an output from specified external
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH V5 2/2] migration: file URI offset
2023-09-08 14:22 [PATCH V5 0/2] migration file URI Steve Sistare
2023-09-08 14:22 ` [PATCH V5 1/2] migration: " Steve Sistare
@ 2023-09-08 14:22 ` Steve Sistare
2023-09-08 14:27 ` Daniel P. Berrangé
2023-10-04 11:17 ` Juan Quintela
2023-09-13 13:05 ` [PATCH V5 0/2] migration file URI Claudio Fontana
2 siblings, 2 replies; 8+ messages in thread
From: Steve Sistare @ 2023-09-08 14:22 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Juan Quintela, Daniel P. Berrange, Fabiano Rosas,
Claudio Fontana, Steve Sistare
Allow an offset option to be specified as part of the file URI, in
the form "file:filename,offset=offset", where offset accepts the common
size suffixes, or the 0x prefix, but not both. Migration data is written
to and read from the file starting at offset. If unspecified, it defaults
to 0.
This is needed by libvirt to store its own data at the head of the file.
Suggested-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
migration/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
qemu-options.hx | 7 ++++---
2 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/migration/file.c b/migration/file.c
index 0a65c43..cf5b1bf 100644
--- a/migration/file.c
+++ b/migration/file.c
@@ -6,6 +6,8 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
+#include "qapi/error.h"
#include "channel.h"
#include "file.h"
#include "migration.h"
@@ -13,14 +15,41 @@
#include "io/channel-util.h"
#include "trace.h"
-void file_start_outgoing_migration(MigrationState *s, const char *filename,
+#define OFFSET_OPTION ",offset="
+
+/* Remove the offset option from @filespec and return it in @offsetp. */
+
+static int file_parse_offset(char *filespec, uint64_t *offsetp, Error **errp)
+{
+ char *option = strstr(filespec, OFFSET_OPTION);
+ int ret;
+
+ if (option) {
+ *option = 0;
+ option += sizeof(OFFSET_OPTION) - 1;
+ ret = qemu_strtosz(option, NULL, offsetp);
+ if (ret) {
+ error_setg_errno(errp, -ret, "file URI has bad offset %s", option);
+ return -1;
+ }
+ }
+ return 0;
+}
+
+void file_start_outgoing_migration(MigrationState *s, const char *filespec,
Error **errp)
{
+ g_autofree char *filename = g_strdup(filespec);
g_autoptr(QIOChannelFile) fioc = NULL;
+ uint64_t offset = 0;
QIOChannel *ioc;
trace_migration_file_outgoing(filename);
+ if (file_parse_offset(filename, &offset, errp)) {
+ return;
+ }
+
fioc = qio_channel_file_new_path(filename, O_CREAT | O_WRONLY | O_TRUNC,
0600, errp);
if (!fioc) {
@@ -28,6 +57,9 @@ void file_start_outgoing_migration(MigrationState *s, const char *filename,
}
ioc = QIO_CHANNEL(fioc);
+ if (offset && qio_channel_io_seek(ioc, offset, SEEK_SET, errp) < 0) {
+ return;
+ }
qio_channel_set_name(ioc, "migration-file-outgoing");
migration_channel_connect(s, ioc, NULL, NULL);
}
@@ -41,19 +73,28 @@ static gboolean file_accept_incoming_migration(QIOChannel *ioc,
return G_SOURCE_REMOVE;
}
-void file_start_incoming_migration(const char *filename, Error **errp)
+void file_start_incoming_migration(const char *filespec, Error **errp)
{
+ g_autofree char *filename = g_strdup(filespec);
QIOChannelFile *fioc = NULL;
+ uint64_t offset = 0;
QIOChannel *ioc;
trace_migration_file_incoming(filename);
+ if (file_parse_offset(filename, &offset, errp)) {
+ return;
+ }
+
fioc = qio_channel_file_new_path(filename, O_RDONLY, 0, errp);
if (!fioc) {
return;
}
ioc = QIO_CHANNEL(fioc);
+ if (offset && qio_channel_io_seek(ioc, offset, SEEK_SET, errp) < 0) {
+ return;
+ }
qio_channel_set_name(QIO_CHANNEL(ioc), "migration-file-incoming");
qio_channel_add_watch_full(ioc, G_IO_IN,
file_accept_incoming_migration,
diff --git a/qemu-options.hx b/qemu-options.hx
index 54e28c1..2f62672 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4626,7 +4626,7 @@ DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
" prepare for incoming migration, listen on\n" \
" specified protocol and socket address\n" \
"-incoming fd:fd\n" \
- "-incoming file:filename\n" \
+ "-incoming file:filename[,offset=offset]\n" \
"-incoming exec:cmdline\n" \
" accept incoming migration on given file descriptor\n" \
" or from given external command\n" \
@@ -4645,8 +4645,9 @@ SRST
``-incoming fd:fd``
Accept incoming migration from a given file descriptor.
-``-incoming file:filename``
- Accept incoming migration from a given file.
+``-incoming file:filename[,offset=offset]``
+ Accept incoming migration from a given file starting at offset.
+ offset allows the common size suffixes, or a 0x prefix, but not both.
``-incoming exec:cmdline``
Accept incoming migration as an output from specified external
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread