OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Rename RDMA structures to make destination clear

Browse Source 
RDMA has two data types that are named confusingly;
   RDMALocalBlock (pointed to indirectly by local_ram_blocks)
   RDMARemoteBlock (pointed to by block in RDMAContext)

RDMALocalBlocks, as the name suggests is a data strucuture that
represents the RDMAable RAM Blocks on the current side of the migration
whichever that is.

RDMARemoteBlocks is always the shape of the RAMBlocks on the
destination, even on the destination.

Rename:
     RDMARemoteBlock -> RDMADestBlock
     context->'block' -> context->dest_blocks

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2015-04-20 16:57:16 +01:00 committed by Juan Quintela
parent 73d9a7961a
commit a97270ad5d
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
migration/rdma.c
View File

@ -236,13 +236,13 @@ typedef struct RDMALocalBlock {
* corresponding RDMALocalBlock with * corresponding RDMALocalBlock with
* the information needed to perform the actual RDMA. * the information needed to perform the actual RDMA.
*/ */
typedef struct QEMU_PACKED RDMARemoteBlock { typedef struct QEMU_PACKED RDMADestBlock {
uint64_t remote_host_addr; uint64_t remote_host_addr;
uint64_t offset; uint64_t offset;
uint64_t length; uint64_t length;
uint32_t remote_rkey; uint32_t remote_rkey;
uint32_t padding; uint32_t padding;
} RDMARemoteBlock; } RDMADestBlock;
static uint64_t htonll(uint64_t v) static uint64_t htonll(uint64_t v)
{ {
@ -258,20 +258,20 @@ static uint64_t ntohll(uint64_t v) {
return ((uint64_t)ntohl(u.lv[0]) << 32) | (uint64_t) ntohl(u.lv[1]); return ((uint64_t)ntohl(u.lv[0]) << 32) | (uint64_t) ntohl(u.lv[1]);
} }
static void remote_block_to_network(RDMARemoteBlock *rb) static void dest_block_to_network(RDMADestBlock *db)
{ {
rb->remote_host_addr = htonll(rb->remote_host_addr); db->remote_host_addr = htonll(db->remote_host_addr);
rb->offset = htonll(rb->offset); db->offset = htonll(db->offset);
rb->length = htonll(rb->length); db->length = htonll(db->length);
rb->remote_rkey = htonl(rb->remote_rkey); db->remote_rkey = htonl(db->remote_rkey);
} }
static void network_to_remote_block(RDMARemoteBlock *rb) static void network_to_dest_block(RDMADestBlock *db)
{ {
rb->remote_host_addr = ntohll(rb->remote_host_addr); db->remote_host_addr = ntohll(db->remote_host_addr);
rb->offset = ntohll(rb->offset); db->offset = ntohll(db->offset);
rb->length = ntohll(rb->length); db->length = ntohll(db->length);
rb->remote_rkey = ntohl(rb->remote_rkey); db->remote_rkey = ntohl(db->remote_rkey);
} }
/* /*
@ -350,7 +350,7 @@ typedef struct RDMAContext {
* Description of ram blocks used throughout the code. * Description of ram blocks used throughout the code.
*/ */
RDMALocalBlocks local_ram_blocks; RDMALocalBlocks local_ram_blocks;
RDMARemoteBlock *block; RDMADestBlock *dest_blocks;
/* /*
* Migration on *destination* started. * Migration on *destination* started.
@ -590,7 +590,7 @@ static int qemu_rdma_init_ram_blocks(RDMAContext *rdma)
memset(local, 0, sizeof *local); memset(local, 0, sizeof *local);
qemu_ram_foreach_block(qemu_rdma_init_one_block, rdma); qemu_ram_foreach_block(qemu_rdma_init_one_block, rdma);
trace_qemu_rdma_init_ram_blocks(local->nb_blocks); trace_qemu_rdma_init_ram_blocks(local->nb_blocks);
rdma->block = (RDMARemoteBlock *) g_malloc0(sizeof(RDMARemoteBlock) * rdma->dest_blocks = (RDMADestBlock *) g_malloc0(sizeof(RDMADestBlock) *
rdma->local_ram_blocks.nb_blocks); rdma->local_ram_blocks.nb_blocks);
local->init = true; local->init = true;
return 0; return 0;
@ -2184,8 +2184,8 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
rdma->connected = false; rdma->connected = false;
} }
g_free(rdma->block); g_free(rdma->dest_blocks);
rdma->block = NULL; rdma->dest_blocks = NULL;
for (idx = 0; idx < RDMA_WRID_MAX; idx++) { for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
if (rdma->wr_data[idx].control_mr) { if (rdma->wr_data[idx].control_mr) {
@ -2974,25 +2974,25 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque,
* their "local" descriptions with what was sent. * their "local" descriptions with what was sent.
*/ */
for (i = 0; i < local->nb_blocks; i++) { for (i = 0; i < local->nb_blocks; i++) {
rdma->block[i].remote_host_addr = rdma->dest_blocks[i].remote_host_addr =
(uintptr_t)(local->block[i].local_host_addr); (uintptr_t)(local->block[i].local_host_addr);
if (rdma->pin_all) { if (rdma->pin_all) {
rdma->block[i].remote_rkey = local->block[i].mr->rkey; rdma->dest_blocks[i].remote_rkey = local->block[i].mr->rkey;
} }
rdma->block[i].offset = local->block[i].offset; rdma->dest_blocks[i].offset = local->block[i].offset;
rdma->block[i].length = local->block[i].length; rdma->dest_blocks[i].length = local->block[i].length;
remote_block_to_network(&rdma->block[i]); dest_block_to_network(&rdma->dest_blocks[i]);
} }
blocks.len = rdma->local_ram_blocks.nb_blocks blocks.len = rdma->local_ram_blocks.nb_blocks
* sizeof(RDMARemoteBlock); * sizeof(RDMADestBlock);
ret = qemu_rdma_post_send_control(rdma, ret = qemu_rdma_post_send_control(rdma,
(uint8_t *) rdma->block, &blocks); (uint8_t *) rdma->dest_blocks, &blocks);
if (ret < 0) { if (ret < 0) {
error_report("rdma migration: error sending remote info"); error_report("rdma migration: error sending remote info");
@ -3148,7 +3148,7 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque,
if (flags == RAM_CONTROL_SETUP) { if (flags == RAM_CONTROL_SETUP) {
RDMAControlHeader resp = {.type = RDMA_CONTROL_RAM_BLOCKS_RESULT }; RDMAControlHeader resp = {.type = RDMA_CONTROL_RAM_BLOCKS_RESULT };
RDMALocalBlocks *local = &rdma->local_ram_blocks; RDMALocalBlocks *local = &rdma->local_ram_blocks;
int reg_result_idx, i, j, nb_remote_blocks; int reg_result_idx, i, j, nb_dest_blocks;
head.type = RDMA_CONTROL_RAM_BLOCKS_REQUEST; head.type = RDMA_CONTROL_RAM_BLOCKS_REQUEST;
trace_qemu_rdma_registration_stop_ram(); trace_qemu_rdma_registration_stop_ram();
@ -3169,7 +3169,7 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque,
return ret; return ret;
} }
nb_remote_blocks = resp.len / sizeof(RDMARemoteBlock); nb_dest_blocks = resp.len / sizeof(RDMADestBlock);
/* /*
* The protocol uses two different sets of rkeys (mutually exclusive): * The protocol uses two different sets of rkeys (mutually exclusive):
@ -3183,7 +3183,7 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque,
* and then propagates the remote ram block descriptions to his local copy. * and then propagates the remote ram block descriptions to his local copy.
*/ */
if (local->nb_blocks != nb_remote_blocks) { if (local->nb_blocks != nb_dest_blocks) {
ERROR(errp, "ram blocks mismatch #1! " ERROR(errp, "ram blocks mismatch #1! "
"Your QEMU command line parameters are probably " "Your QEMU command line parameters are probably "
"not identical on both the source and destination."); "not identical on both the source and destination.");
@ -3191,26 +3191,26 @@ static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque,
} }
qemu_rdma_move_header(rdma, reg_result_idx, &resp); qemu_rdma_move_header(rdma, reg_result_idx, &resp);
memcpy(rdma->block, memcpy(rdma->dest_blocks,
rdma->wr_data[reg_result_idx].control_curr, resp.len); rdma->wr_data[reg_result_idx].control_curr, resp.len);
for (i = 0; i < nb_remote_blocks; i++) { for (i = 0; i < nb_dest_blocks; i++) {
network_to_remote_block(&rdma->block[i]); network_to_dest_block(&rdma->dest_blocks[i]);
/* search local ram blocks */ /* search local ram blocks */
for (j = 0; j < local->nb_blocks; j++) { for (j = 0; j < local->nb_blocks; j++) {
if (rdma->block[i].offset != local->block[j].offset) { if (rdma->dest_blocks[i].offset != local->block[j].offset) {
continue; continue;
} }
if (rdma->block[i].length != local->block[j].length) { if (rdma->dest_blocks[i].length != local->block[j].length) {
ERROR(errp, "ram blocks mismatch #2! " ERROR(errp, "ram blocks mismatch #2! "
"Your QEMU command line parameters are probably " "Your QEMU command line parameters are probably "
"not identical on both the source and destination."); "not identical on both the source and destination.");
return -EINVAL; return -EINVAL;
} }
local->block[j].remote_host_addr = local->block[j].remote_host_addr =
rdma->block[i].remote_host_addr; rdma->dest_blocks[i].remote_host_addr;
local->block[j].remote_rkey = rdma->block[i].remote_rkey; local->block[j].remote_rkey = rdma->dest_blocks[i].remote_rkey;
break; break;
} }