qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Lei Li <lilei@linux.vnet.ibm.com>
Cc: aarcange@redhat.com, quintela@redhat.com,
	mdroth@linux.vnet.ibm.com, mrhines@linux.vnet.ibm.com,
	qemu-devel@nongnu.org, aliguori@amazon.com, lagarcia@br.ibm.com,
	rcj@linux.vnet.ibm.com
Subject: Re: [Qemu-devel] [PATCH 10/17] migration-local: override save_page for page transmit
Date: Tue, 26 Nov 2013 12:22:15 +0100	[thread overview]
Message-ID: <52948467.8080604@redhat.com> (raw)
In-Reply-To: <1385025100-3191-11-git-send-email-lilei@linux.vnet.ibm.com>

Il 21/11/2013 10:11, Lei Li ha scritto:
> This patch implements save_page callback for the outside
> of page flipping. It will write the address of the page
> on the Unix socket and flip the page data on pipe by
> vmsplice(). Every page address would have a header flag
> RAM_SAVE_FLAG_HOOK, which will trigger the load hook to
> receive it in incoming side as well.
> 
> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
> ---
>  migration-local.c |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 54 insertions(+), 0 deletions(-)
> 
> diff --git a/migration-local.c b/migration-local.c
> index 0f0896b..14207e9 100644
> --- a/migration-local.c
> +++ b/migration-local.c
> @@ -200,6 +200,59 @@ static int qemu_local_send_pipefd(QEMUFile *f, void *opaque,
>      return 0;
>  }
>  
> +static size_t qemu_local_save_ram(QEMUFile *f, void *opaque,
> +                                  MemoryRegion *mr, ram_addr_t offset,
> +                                  size_t size, int *bytes_sent)
> +{
> +    QEMUFileLocal *s = opaque;
> +    ram_addr_t current_addr = mr->ram_addr + offset;
> +    void *ram_addr;
> +    ssize_t ret;
> +
> +    if (s->unix_page_flipping) {
> +        qemu_fflush(s->file);
> +        qemu_put_be64(s->file, RAM_SAVE_FLAG_HOOK);
> +
> +        /* Write page address to unix socket */
> +        qemu_put_be64(s->file, current_addr);
> +

You can write current_addr | RAM_SAVE_FLAG_HOOK.  The value will be in
the flags argument of the hook_ram_load, you can extract it with "flags
& ~RAM_SAVE_FLAG_HOOK".  This cuts by half the data written to the Unix
socket.

Paolo

> +        ram_addr = memory_region_get_ram_ptr(mr) + offset;
> +
> +        /* vmsplice page data to pipe */
> +        struct iovec iov = {
> +            .iov_base = ram_addr,
> +            .iov_len  = 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[1], &iov, 1, SPLICE_F_GIFT | SPLICE_F_MOVE);
> +        if (ret == -1) {
> +            if (errno != EAGAIN && errno != EINTR) {
> +                fprintf(stderr, "vmsplice save error: %s\n", strerror(errno));
> +                return ret;
> +            }
> +        } else {
> +            if (bytes_sent) {
> +                *bytes_sent = 1;
> +            }
> +            DPRINTF("block_offset: %lu, offset: %lu\n", block_offset, offset);
> +            return 0;
> +        }
> +    }
> +
> +    return RAM_SAVE_CONTROL_NOT_SUPP;
> +}
> +
>  static const QEMUFileOps pipe_read_ops = {
>      .get_fd        = qemu_local_get_sockfd,
>      .get_buffer    = qemu_local_get_buffer,
> @@ -211,6 +264,7 @@ static const QEMUFileOps pipe_write_ops = {
>      .writev_buffer      = qemu_local_writev_buffer,
>      .close              = qemu_local_close,
>      .before_ram_iterate = qemu_local_send_pipefd,
> +    .save_page          = qemu_local_save_ram
>  };
>  
>  QEMUFile *qemu_fopen_socket_local(int sockfd, const char *mode)
> 

  reply	other threads:[~2013-11-26 11:22 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 01/17] QAPI: introduce migration capability unix_page_flipping Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 02/17] migration: add migrate_unix_page_flipping() Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 03/17] qmp-command.hx: add missing docs for migration capabilites Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 05/17] migration-local: introduce qemu_fopen_socket_local() Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 06/17] migration-local: add send_pipefd() Lei Li
2013-11-26 11:26   ` Paolo Bonzini
2013-11-21  9:11 ` [Qemu-devel] [PATCH 07/17] migration-local: override before_ram_iterate to send pipefd Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 08/17] add unix_msgfd_lookup() to callback get_buffer Lei Li
2013-11-26 11:30   ` Lei Li
2013-11-26 11:31   ` Paolo Bonzini
2013-11-26 14:00     ` Lei Li
2013-11-26 14:14       ` Paolo Bonzini
2013-11-21  9:11 ` [Qemu-devel] [PATCH 09/17] save_page: replace block_offset with a MemoryRegion Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 10/17] migration-local: override save_page for page transmit Lei Li
2013-11-26 11:22   ` Paolo Bonzini [this message]
2013-11-26 12:10     ` Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 11/17] savevm: adjust ram_control_save_page for page flipping 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-11-21  9:11 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_MEMORY_STALE Lei Li
2013-11-26 12:28   ` Paolo Bonzini
2013-11-26 14:02     ` Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping Lei Li
2013-11-26 11:32   ` Paolo Bonzini
2013-11-26 12:03     ` Lei Li
2013-11-26 12:54       ` Paolo Bonzini
2013-11-26 13:53         ` Lei Li
2013-11-26 14:11           ` Paolo Bonzini
2013-11-28  8:19             ` Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 17/17] hmp: better format for info migrate_capabilities Lei Li
2013-11-21 10:19 ` [Qemu-devel] [PATCH 0/17 v3] Localhost migration with side channel for ram Daniel P. Berrange
2013-11-22 11:29   ` Lei Li
2013-11-22 11:36     ` Paolo Bonzini
2013-11-25  7:29       ` Lei Li
2013-11-25  9:48         ` Paolo Bonzini
2013-11-26 11:07           ` Lei Li
2013-11-26 11:17             ` Paolo Bonzini
2013-11-27 16:48               ` Andrea Arcangeli
2013-11-22 11:36     ` Daniel P. Berrange
  -- strict thread matches above, loose matches on Subject: below --
2013-10-22  3:25 [Qemu-devel] [PATCH 0/17 v2] " Lei Li
2013-10-22  3:25 ` [Qemu-devel] [PATCH 10/17] migration-local: override save_page for page transmit Lei Li

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=52948467.8080604@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=aarcange@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=lagarcia@br.ibm.com \
    --cc=lilei@linux.vnet.ibm.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=mrhines@linux.vnet.ibm.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).