From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YumMC-0000oo-Qb for qemu-devel@nongnu.org; Tue, 19 May 2015 14:35:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YumM8-00065M-Ed for qemu-devel@nongnu.org; Tue, 19 May 2015 14:35:12 -0400 Received: from e17.ny.us.ibm.com ([129.33.205.207]:43435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YumM8-000657-B0 for qemu-devel@nongnu.org; Tue, 19 May 2015 14:35:08 -0400 Received: from /spool/local by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 May 2015 14:35:08 -0400 Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 5EA6D6E803F for ; Tue, 19 May 2015 14:26:53 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t4JIZ5CF55509210 for ; Tue, 19 May 2015 18:35:05 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t4JIZ4GL009415 for ; Tue, 19 May 2015 14:35:05 -0400 Message-ID: <555B8262.7040805@linux.vnet.ibm.com> Date: Tue, 19 May 2015 13:35:14 -0500 From: "Michael R. Hines" MIME-Version: 1.0 References: <1429545445-28216-1-git-send-email-dgilbert@redhat.com> <1429545445-28216-6-git-send-email-dgilbert@redhat.com> In-Reply-To: <1429545445-28216-6-git-send-email-dgilbert@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/10] Rework ram_control_load_hook to hook during block load List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" , qemu-devel@nongnu.org Cc: amit.shah@redhat.com, arei.gonglei@huawei.com, mrhines@us.ibm.com, quintela@redhat.com On 04/20/2015 10:57 AM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > We need the names of RAMBlocks as they're loaded for RDMA, > reuse an existing QEMUFile hook with some small mods. > > Signed-off-by: Dr. David Alan Gilbert > --- > arch_init.c | 4 +++- > include/migration/migration.h | 2 +- > include/migration/qemu-file.h | 14 +++++++++----- > migration/qemu-file.c | 8 ++++---- > migration/rdma.c | 28 ++++++++++++++++++++++------ > trace-events | 2 +- > 6 files changed, 40 insertions(+), 18 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 4c8fcee..6c0b355 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -1164,6 +1164,8 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > error_report_err(local_err); > } > } > + ram_control_load_hook(f, RAM_CONTROL_BLOCK_REG, > + block->idstr); > break; > } > } > @@ -1215,7 +1217,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > break; > default: > if (flags & RAM_SAVE_FLAG_HOOK) { > - ram_control_load_hook(f, flags); > + ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL); > } else { > error_report("Unknown combination of migration flags: %#x", > flags); > diff --git a/include/migration/migration.h b/include/migration/migration.h > index bf09968..3c2f91a 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -154,7 +154,7 @@ int64_t xbzrle_cache_resize(int64_t new_size); > > void ram_control_before_iterate(QEMUFile *f, uint64_t flags); > void ram_control_after_iterate(QEMUFile *f, uint64_t flags); > -void ram_control_load_hook(QEMUFile *f, uint64_t flags); > +void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data); > > /* Whenever this is found in the data stream, the flags > * will be passed to ram_control_load_hook in the incoming-migration > diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h > index 745a850..a3ceb3b 100644 > --- a/include/migration/qemu-file.h > +++ b/include/migration/qemu-file.h > @@ -63,16 +63,20 @@ typedef ssize_t (QEMUFileWritevBufferFunc)(void *opaque, struct iovec *iov, > /* > * This function provides hooks around different > * stages of RAM migration. > + * 'opaque' is the backend specific data in QEMUFile > + * 'data' is call specific data associated with the 'flags' value > */ What data is this exactly? > -typedef int (QEMURamHookFunc)(QEMUFile *f, void *opaque, uint64_t flags); > +typedef int (QEMURamHookFunc)(QEMUFile *f, void *opaque, uint64_t flags, > + void *data); > > /* > * Constants used by ram_control_* hooks > */ > -#define RAM_CONTROL_SETUP 0 > -#define RAM_CONTROL_ROUND 1 > -#define RAM_CONTROL_HOOK 2 > -#define RAM_CONTROL_FINISH 3 > +#define RAM_CONTROL_SETUP 0 > +#define RAM_CONTROL_ROUND 1 > +#define RAM_CONTROL_HOOK 2 > +#define RAM_CONTROL_FINISH 3 > +#define RAM_CONTROL_BLOCK_REG 4 > > /* > * This function allows override of where the RAM page > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > index 1a4f986..4986e05 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -127,7 +127,7 @@ void ram_control_before_iterate(QEMUFile *f, uint64_t flags) > int ret = 0; > > if (f->ops->before_ram_iterate) { > - ret = f->ops->before_ram_iterate(f, f->opaque, flags); > + ret = f->ops->before_ram_iterate(f, f->opaque, flags, NULL); > if (ret < 0) { > qemu_file_set_error(f, ret); > } > @@ -139,19 +139,19 @@ void ram_control_after_iterate(QEMUFile *f, uint64_t flags) > int ret = 0; > > if (f->ops->after_ram_iterate) { > - ret = f->ops->after_ram_iterate(f, f->opaque, flags); > + ret = f->ops->after_ram_iterate(f, f->opaque, flags, NULL); > if (ret < 0) { > qemu_file_set_error(f, ret); > } > } > } > > -void ram_control_load_hook(QEMUFile *f, uint64_t flags) > +void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data) > { > int ret = -EINVAL; > > if (f->ops->hook_ram_load) { > - ret = f->ops->hook_ram_load(f, f->opaque, flags); > + ret = f->ops->hook_ram_load(f, f->opaque, flags, data); > if (ret < 0) { > qemu_file_set_error(f, ret); > } > diff --git a/migration/rdma.c b/migration/rdma.c > index 2c0d11b..e43fae4 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -2906,8 +2906,7 @@ err_rdma_dest_wait: > * > * Keep doing this until the source tells us to stop. > */ > -static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque, > - uint64_t flags) > +static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque) > { > RDMAControlHeader reg_resp = { .len = sizeof(RDMARegisterResult), > .type = RDMA_CONTROL_REGISTER_RESULT, > @@ -2937,7 +2936,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque, > CHECK_ERROR_STATE(); > > do { > - trace_qemu_rdma_registration_handle_wait(flags); > + trace_qemu_rdma_registration_handle_wait(); > > ret = qemu_rdma_exchange_recv(rdma, &head, RDMA_CONTROL_NONE); > > @@ -3125,8 +3124,25 @@ out: > return ret; > } > > +static int rdma_load_hook(QEMUFile *f, void *opaque, uint64_t flags, void *data) > +{ > + switch (flags) { > + case RAM_CONTROL_BLOCK_REG: > + /* TODO A later patch */ > + return -1; > + break; > + > + case RAM_CONTROL_HOOK: > + return qemu_rdma_registration_handle(f, opaque); > + > + default: > + /* Shouldn't be called with any other values */ > + abort(); > + } > +} > + Rename this to qemu_rdma_load_hook() > static int qemu_rdma_registration_start(QEMUFile *f, void *opaque, > - uint64_t flags) > + uint64_t flags, void *data) > { > QEMUFileRDMA *rfile = opaque; > RDMAContext *rdma = rfile->rdma; > @@ -3145,7 +3161,7 @@ static int qemu_rdma_registration_start(QEMUFile *f, void *opaque, > * First, flush writes, if any. > */ > static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque, > - uint64_t flags) > + uint64_t flags, void *data) > { > Error *local_err = NULL, **errp = &local_err; > QEMUFileRDMA *rfile = opaque; > @@ -3267,7 +3283,7 @@ static const QEMUFileOps rdma_read_ops = { > .get_buffer = qemu_rdma_get_buffer, > .get_fd = qemu_rdma_get_fd, > .close = qemu_rdma_close, > - .hook_ram_load = qemu_rdma_registration_handle, > + .hook_ram_load = rdma_load_hook, > }; > > static const QEMUFileOps rdma_write_ops = { > diff --git a/trace-events b/trace-events > index 07f15da..baf8647 100644 > --- a/trace-events > +++ b/trace-events > @@ -1416,7 +1416,7 @@ qemu_rdma_registration_handle_register_rkey(int rkey) "%x" > qemu_rdma_registration_handle_unregister(int requests) "%d requests" > qemu_rdma_registration_handle_unregister_loop(int count, int index, uint64_t chunk) "Unregistration request (%d): index %d, chunk %" PRIu64 > qemu_rdma_registration_handle_unregister_success(uint64_t chunk) "%" PRIu64 > -qemu_rdma_registration_handle_wait(uint64_t flags) "Waiting for next request %" PRIu64 > +qemu_rdma_registration_handle_wait(void) "" > qemu_rdma_registration_start(uint64_t flags) "%" PRIu64 > qemu_rdma_registration_stop(uint64_t flags) "%" PRIu64 > qemu_rdma_registration_stop_ram(void) ""