mirror of https://gitlab.com/qemu-project/qemu
rdma: introduce qemu_update_position()
RDMA writes happen asynchronously, and thus the performance accounting also needs to be able to occur asynchronously. This allows anybody to call into savevm.c to update both f->pos as well as into arch_init.c to update the acct_info structure with up-to-date values when the RDMA transfer actually completes. Reviewed-by: Juan Quintela <quintela@redhat.com> Tested-by: Chegu Vinod <chegu_vinod@hp.com> Tested-by: Michael R. Hines <mrhines@us.ibm.com> Signed-off-by: Michael R. Hines <mrhines@us.ibm.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
f4abc9d621
commit
2b0ce0797d
12
arch_init.c
12
arch_init.c
|
@ -493,6 +493,18 @@ static int ram_save_block(QEMUFile *f, bool last_stage)
|
||||||
|
|
||||||
static uint64_t bytes_transferred;
|
static uint64_t bytes_transferred;
|
||||||
|
|
||||||
|
void acct_update_position(QEMUFile *f, size_t size, bool zero)
|
||||||
|
{
|
||||||
|
uint64_t pages = size / TARGET_PAGE_SIZE;
|
||||||
|
if (zero) {
|
||||||
|
acct_info.dup_pages += pages;
|
||||||
|
} else {
|
||||||
|
acct_info.norm_pages += pages;
|
||||||
|
bytes_transferred += size;
|
||||||
|
qemu_update_position(f, size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static ram_addr_t ram_save_remaining(void)
|
static ram_addr_t ram_save_remaining(void)
|
||||||
{
|
{
|
||||||
return migration_dirty_pages;
|
return migration_dirty_pages;
|
||||||
|
|
|
@ -92,6 +92,8 @@ uint64_t ram_bytes_remaining(void);
|
||||||
uint64_t ram_bytes_transferred(void);
|
uint64_t ram_bytes_transferred(void);
|
||||||
uint64_t ram_bytes_total(void);
|
uint64_t ram_bytes_total(void);
|
||||||
|
|
||||||
|
void acct_update_position(QEMUFile *f, size_t size, bool zero);
|
||||||
|
|
||||||
extern SaveVMHandlers savevm_ram_handlers;
|
extern SaveVMHandlers savevm_ram_handlers;
|
||||||
|
|
||||||
uint64_t dup_mig_bytes_transferred(void);
|
uint64_t dup_mig_bytes_transferred(void);
|
||||||
|
|
|
@ -93,6 +93,7 @@ void qemu_put_be32(QEMUFile *f, unsigned int v);
|
||||||
void qemu_put_be64(QEMUFile *f, uint64_t v);
|
void qemu_put_be64(QEMUFile *f, uint64_t v);
|
||||||
int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size);
|
int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size);
|
||||||
int qemu_get_byte(QEMUFile *f);
|
int qemu_get_byte(QEMUFile *f);
|
||||||
|
void qemu_update_position(QEMUFile *f, size_t size);
|
||||||
|
|
||||||
static inline unsigned int qemu_get_ubyte(QEMUFile *f)
|
static inline unsigned int qemu_get_ubyte(QEMUFile *f)
|
||||||
{
|
{
|
||||||
|
|
5
savevm.c
5
savevm.c
|
@ -671,6 +671,11 @@ int qemu_get_fd(QEMUFile *f)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void qemu_update_position(QEMUFile *f, size_t size)
|
||||||
|
{
|
||||||
|
f->pos += size;
|
||||||
|
}
|
||||||
|
|
||||||
/** Closes the file
|
/** Closes the file
|
||||||
*
|
*
|
||||||
* Returns negative error value if any error happened on previous operations or
|
* Returns negative error value if any error happened on previous operations or
|
||||||
|
|
Loading…
Reference in New Issue