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

migration/multifd: Rewrite multifd_queue_page() 

The current multifd_queue_page() is not easy to read and follow.  It is not
good with a few reasons:

  - No helper at all to show what exactly does a condition mean; in short,
  readability is low.

  - Rely on pages->ramblock being cleared to detect an empty queue.  It's
  slightly an overload of the ramblock pointer, per Fabiano [1], which I
  also agree.

  - Contains a self recursion, even if not necessary..

Rewrite this function.  We add some comments to make it even clearer on
what it does.

[1] https://lore.kernel.org/r/87wmrpjzew.fsf@suse.de

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240202102857.110210-19-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Peter Xu 2024-02-02 18:28:52 +08:00
parent 3b40964a86
commit f88f86c4ee
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
migration/multifd.c
View File

@ -506,35 +506,53 @@ static bool multifd_send_pages(void)
return true; return true;
} }
static inline bool multifd_queue_empty(MultiFDPages_t *pages)
{
return pages->num == 0;
}
static inline bool multifd_queue_full(MultiFDPages_t *pages)
{
return pages->num == pages->allocated;
}
static inline void multifd_enqueue(MultiFDPages_t *pages, ram_addr_t offset)
{
pages->offset[pages->num++] = offset;
}
/* Returns true if enqueue successful, false otherwise */ /* Returns true if enqueue successful, false otherwise */
bool multifd_queue_page(RAMBlock *block, ram_addr_t offset) bool multifd_queue_page(RAMBlock *block, ram_addr_t offset)
{ {
MultiFDPages_t *pages = multifd_send_state->pages; MultiFDPages_t *pages;
bool changed = false;
if (!pages->block) { retry:
pages = multifd_send_state->pages;
/* If the queue is empty, we can already enqueue now */
if (multifd_queue_empty(pages)) {
pages->block = block; pages->block = block;
multifd_enqueue(pages, offset);
return true;
} }
if (pages->block == block) { /*
pages->offset[pages->num] = offset; * Not empty, meanwhile we need a flush. It can because of either:
pages->num++; *
* (1) The page is not on the same ramblock of previous ones, or,
if (pages->num < pages->allocated) { * (2) The queue is full.
return true; *
* After flush, always retry.
*/
if (pages->block != block || multifd_queue_full(pages)) {
if (!multifd_send_pages()) {
return false;
} }
} else { goto retry;
changed = true;
}
if (!multifd_send_pages()) {
return false;
}
if (changed) {
return multifd_queue_page(block, offset);
} }
/* Not empty, and we still have space, do it! */
multifd_enqueue(pages, offset);
return true; return true;
} }