ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/rdma: Remove all uses of RAM_CONTROL_HOOK 

Instead of going through ram_control_load_hook(), call
qemu_rdma_registration_handle() directly.

Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231011203527.9061-5-quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-10-11 22:35:18 +02:00
parent 5f5b8858dc
commit f6d6c089b7
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
migration/qemu-file.h
View File

@ -41,7 +41,6 @@ typedef int (QEMURamHookFunc)(QEMUFile *f, uint64_t flags, void *data);
*/ */
#define RAM_CONTROL_SETUP 0 #define RAM_CONTROL_SETUP 0
#define RAM_CONTROL_ROUND 1 #define RAM_CONTROL_ROUND 1
#define RAM_CONTROL_HOOK 2
#define RAM_CONTROL_FINISH 3 #define RAM_CONTROL_FINISH 3
#define RAM_CONTROL_BLOCK_REG 4 #define RAM_CONTROL_BLOCK_REG 4

5
migration/ram.c
View File

@ -4075,7 +4075,10 @@ static int ram_load_precopy(QEMUFile *f)
} }
break; break;
case RAM_SAVE_FLAG_HOOK: case RAM_SAVE_FLAG_HOOK:
ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL); ret = qemu_rdma_registration_handle(f);
if (ret < 0) {
qemu_file_set_error(f, ret);
}
break; break;
default: default:
error_report("Unknown combination of migration flags: 0x%x", flags); error_report("Unknown combination of migration flags: 0x%x", flags);

12
migration/rdma.c
View File

@ -3522,7 +3522,7 @@ static int dest_ram_sort_func(const void *a, const void *b)
* *
* Keep doing this until the source tells us to stop. * Keep doing this until the source tells us to stop.
*/ */
static int qemu_rdma_registration_handle(QEMUFile *f) int qemu_rdma_registration_handle(QEMUFile *f)
{ {
RDMAControlHeader reg_resp = { .len = sizeof(RDMARegisterResult), RDMAControlHeader reg_resp = { .len = sizeof(RDMARegisterResult),
.type = RDMA_CONTROL_REGISTER_RESULT, .type = RDMA_CONTROL_REGISTER_RESULT,
@ -3534,7 +3534,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f)
}; };
RDMAControlHeader blocks = { .type = RDMA_CONTROL_RAM_BLOCKS_RESULT, RDMAControlHeader blocks = { .type = RDMA_CONTROL_RAM_BLOCKS_RESULT,
.repeat = 1 }; .repeat = 1 };
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f)); QIOChannelRDMA *rioc;
Error *err = NULL; Error *err = NULL;
RDMAContext *rdma; RDMAContext *rdma;
RDMALocalBlocks *local; RDMALocalBlocks *local;
@ -3550,7 +3550,12 @@ static int qemu_rdma_registration_handle(QEMUFile *f)
int count = 0; int count = 0;
int i = 0; int i = 0;
if (!migrate_rdma()) {
return 0;
}
RCU_READ_LOCK_GUARD(); RCU_READ_LOCK_GUARD();
rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
rdma = qatomic_rcu_read(&rioc->rdmain); rdma = qatomic_rcu_read(&rioc->rdmain);
if (!rdma) { if (!rdma) {
@ -3841,9 +3846,6 @@ static int rdma_load_hook(QEMUFile *f, uint64_t flags, void *data)
case RAM_CONTROL_BLOCK_REG: case RAM_CONTROL_BLOCK_REG:
return rdma_block_notification_handle(f, data); return rdma_block_notification_handle(f, data);
case RAM_CONTROL_HOOK:
return qemu_rdma_registration_handle(f);
default: default:
/* Shouldn't be called with any other values */ /* Shouldn't be called with any other values */
abort(); abort();

3
migration/rdma.h
View File

@ -24,10 +24,13 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp);
#ifdef CONFIG_RDMA #ifdef CONFIG_RDMA
int qemu_rdma_registration_handle(QEMUFile *f);
int qemu_rdma_registration_start(QEMUFile *f, uint64_t flags); int qemu_rdma_registration_start(QEMUFile *f, uint64_t flags);
int qemu_rdma_registration_stop(QEMUFile *f, uint64_t flags); int qemu_rdma_registration_stop(QEMUFile *f, uint64_t flags);
#else #else
static inline static inline
int qemu_rdma_registration_handle(QEMUFile *f) { return 0; }
static inline
int qemu_rdma_registration_start(QEMUFile *f, uint64_t flags) { return 0; } int qemu_rdma_registration_start(QEMUFile *f, uint64_t flags) { return 0; }
static inline static inline
int qemu_rdma_registration_stop(QEMUFile *f, uint64_t flags) { return 0; } int qemu_rdma_registration_stop(QEMUFile *f, uint64_t flags) { return 0; }