From: Lei Li <lilei@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aarcange@redhat.com, Lei Li <lilei@linux.vnet.ibm.com>,
quintela@redhat.com, mrhines@linux.vnet.ibm.com,
aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com,
rcj@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load
Date: Fri, 29 Nov 2013 18:06:19 +0800 [thread overview]
Message-ID: <1385719584-21114-13-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com>
Override hook_ram_load to receive the pipe file descriptor
passed by source process and page address which will be
extracted to vmsplice the page data from pipe.
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
migration-local.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/migration-local.c b/migration-local.c
index 76ec306..b086f38 100644
--- a/migration-local.c
+++ b/migration-local.c
@@ -231,10 +231,69 @@ static size_t qemu_local_save_ram(QEMUFile *f, void *opaque,
return RAM_SAVE_CONTROL_NOT_SUPP;
}
+static int qemu_local_ram_load(QEMUFile *f, void *opaque,
+ ram_addr_t addr, uint64_t flags)
+{
+ QEMUFileLocal *s = opaque;
+ struct iovec iov;
+ ssize_t ret = -EINVAL;
+
+ if (!s->pipefd_received) {
+ /*
+ * send_pipefd was called at this point, and it wrote one
+ * byte to the stream.
+ */
+ qemu_get_byte(s->file);
+ s->pipefd_received = true;
+ }
+
+ if (s->pipefd_passed) {
+ void *host;
+ /*
+ * Extract the page address from the 8-byte record and
+ * read the page data from the pipe.
+ */
+ host = qemu_get_ram_ptr(addr);
+
+ iov.iov_base = host;
+ iov.iov_len = TARGET_PAGE_SIZE;
+
+ /*
+ * The flag SPLICE_F_MOVE is introduced in kernel for the page
+ * flipping feature in QEMU, which will movie pages rather than
+ * copying, previously unused.
+ *
+ * If a move is not possible the kernel will transparently falls
+ * back to copying data.
+ *
+ * For older kernels the SPLICE_F_MOVE would be ignored and a copy
+ * would occur.
+ */
+
+ ret = vmsplice(s->pipefd[0], &iov, 1, SPLICE_F_MOVE);
+ if (ret == -1) {
+ if (errno != EAGAIN && errno != EINTR) {
+ fprintf(stderr, "vmsplice() load error: %s", strerror(errno));
+ return ret;
+ }
+ DPRINTF("vmsplice load error\n");
+ } else if (ret == 0) {
+ DPRINTF(stderr, "load_page: zero read\n");
+ }
+
+ DPRINTF("vmsplice (read): %zu\n", ret);
+ return ret;
+ }
+
+ return -EINVAL;
+}
+
+
static const QEMUFileOps pipe_read_ops = {
.get_fd = qemu_local_get_sockfd,
.get_buffer = qemu_local_get_buffer,
.close = qemu_local_close,
+ .hook_ram_load = qemu_local_ram_load
};
static const QEMUFileOps pipe_write_ops = {
--
1.7.7.6
next prev parent reply other threads:[~2013-11-29 10:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-29 10:06 [Qemu-devel] [PATCH 0/17 v4] Localhost migration with side channel for ram Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 01/17] QAPI: introduce migration capability unix_page_flipping Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 02/17] migration: add migrate_unix_page_flipping() Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 03/17] qmp-command.hx: add missing docs for migration capabilites Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 05/17] migration-local: introduce qemu_fopen_socket_local() Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 06/17] migration-local: add send_pipefd() Lei Li
2013-11-29 11:14 ` Daniel P. Berrange
2013-12-02 9:13 ` Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 07/17] save_page: replace block_offset with a MemoryRegion Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 08/17] migration-local: override save_page for page transmit Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 09/17] savevm: adjust ram_control_save_page for page flipping Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 10/17] add unix_msgfd_lookup() to callback get_buffer Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 11/17] add argument ram_addr_t to hook_ram_load Lei Li
2013-11-29 10:06 ` Lei Li [this message]
2013-11-29 10:06 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_MEMORY_STALE Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 17/17] hmp: better format for info migrate_capabilities Lei Li
2013-11-29 10:26 ` [Qemu-devel] [PATCH 0/17 v4] Localhost migration with side channel for ram Paolo Bonzini
2013-12-02 9:16 ` Lei Li
-- strict thread matches above, loose matches on Subject: below --
2013-12-02 9:19 [Qemu-devel] [PATCH 0/17 v5] " Lei Li
2013-12-02 9:19 ` [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load Lei Li
2013-11-21 9:11 [Qemu-devel] [PATCH 0/17 v3] Localhost migration with side channel for ram Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load Lei Li
2013-11-26 11:25 ` Paolo Bonzini
2013-11-26 12:11 ` Lei Li
2013-10-22 3:25 [Qemu-devel] [PATCH 0/17 v2] Localhost migration with side channel for ram Lei Li
2013-10-22 3:25 ` [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load Lei Li
2013-10-24 14:06 ` Paolo Bonzini
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=1385719584-21114-13-git-send-email-lilei@linux.vnet.ibm.com \
--to=lilei@linux.vnet.ibm.com \
--cc=aarcange@redhat.com \
--cc=aliguori@amazon.com \
--cc=lagarcia@br.ibm.com \
--cc=mrhines@linux.vnet.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rcj@linux.vnet.ibm.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).