[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/26] Rework ram block hash
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 10/26] Rework ram block hash |
Date: |
Wed, 1 Jul 2015 12:39:34 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
RDMA uses a hash from block offset->RAM Block; this isn't needed
on the destination, and it becomes harder to maintain after the next
patch in the series that sorts the block list.
Split the hash so that it's only generated on the source.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/rdma.c | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 347d380..a652e67 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -534,23 +534,22 @@ static int rdma_add_block(RDMAContext *rdma, const char
*block_name,
ram_addr_t block_offset, uint64_t length)
{
RDMALocalBlocks *local = &rdma->local_ram_blocks;
- RDMALocalBlock *block = g_hash_table_lookup(rdma->blockmap,
- (void *)(uintptr_t)block_offset);
+ RDMALocalBlock *block;
RDMALocalBlock *old = local->block;
- assert(block == NULL);
-
local->block = g_malloc0(sizeof(RDMALocalBlock) * (local->nb_blocks + 1));
if (local->nb_blocks) {
int x;
- for (x = 0; x < local->nb_blocks; x++) {
- g_hash_table_remove(rdma->blockmap,
- (void *)(uintptr_t)old[x].offset);
- g_hash_table_insert(rdma->blockmap,
- (void *)(uintptr_t)old[x].offset,
- &local->block[x]);
+ if (rdma->blockmap) {
+ for (x = 0; x < local->nb_blocks; x++) {
+ g_hash_table_remove(rdma->blockmap,
+ (void *)(uintptr_t)old[x].offset);
+ g_hash_table_insert(rdma->blockmap,
+ (void *)(uintptr_t)old[x].offset,
+ &local->block[x]);
+ }
}
memcpy(local->block, old, sizeof(RDMALocalBlock) * local->nb_blocks);
g_free(old);
@@ -572,7 +571,9 @@ static int rdma_add_block(RDMAContext *rdma, const char
*block_name,
block->is_ram_block = local->init ? false : true;
- g_hash_table_insert(rdma->blockmap, (void *) block_offset, block);
+ if (rdma->blockmap) {
+ g_hash_table_insert(rdma->blockmap, (void *) block_offset, block);
+ }
trace_rdma_add_block(block_name, local->nb_blocks,
(uintptr_t) block->local_host_addr,
@@ -608,7 +609,6 @@ static int qemu_rdma_init_ram_blocks(RDMAContext *rdma)
RDMALocalBlocks *local = &rdma->local_ram_blocks;
assert(rdma->blockmap == NULL);
- rdma->blockmap = g_hash_table_new(g_direct_hash, g_direct_equal);
memset(local, 0, sizeof *local);
qemu_ram_foreach_block(qemu_rdma_init_one_block, rdma);
trace_qemu_rdma_init_ram_blocks(local->nb_blocks);
@@ -2300,6 +2300,14 @@ static int qemu_rdma_source_init(RDMAContext *rdma,
Error **errp, bool pin_all)
goto err_rdma_source_init;
}
+ /* Build the hash that maps from offset to RAMBlock */
+ rdma->blockmap = g_hash_table_new(g_direct_hash, g_direct_equal);
+ for (idx = 0; idx < rdma->local_ram_blocks.nb_blocks; idx++) {
+ g_hash_table_insert(rdma->blockmap,
+ (void *)(uintptr_t)rdma->local_ram_blocks.block[idx].offset,
+ &rdma->local_ram_blocks.block[idx]);
+ }
+
for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
ret = qemu_rdma_reg_control(rdma, idx);
if (ret) {
--
2.4.3
- [Qemu-devel] [PULL 02/26] migration: extend migration_bitmap, (continued)
- [Qemu-devel] [PULL 02/26] migration: extend migration_bitmap, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 03/26] rdma: fix memory leak, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 04/26] Only try and read a VMDescription if it should be there, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 06/26] Store block name in local blocks structure, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 07/26] Translate offsets to destination address space, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 05/26] rdma typos, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 09/26] Allow rdma_delete_block to work without the hash, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 08/26] Rework ram_control_load_hook to hook during block load, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 11/26] Sort destination RAMBlocks to be the same as the source, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 12/26] Sanity check RDMA remote data, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 10/26] Rework ram block hash,
Juan Quintela <=
- [Qemu-devel] [PULL 14/26] Fix older machine type compatibility on power with section footers, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 15/26] runstate: Add runstate store, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 16/26] runstate: migration allows more transitions now, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 13/26] Fail more cleanly in mismatched RAM cases, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 17/26] migration: create new section to store global state, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 18/26] global_state: Make section optional, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 20/26] migration: Add configuration section, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 21/26] migration: Use cmpxchg correctly, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 19/26] vmstate: Create optional sections, Juan Quintela, 2015/07/01
- [Qemu-devel] [PULL 22/26] migration: ensure we start in NONE state, Juan Quintela, 2015/07/01