The bitmap setup during postcopy is incorrectly when the pgaes are huge
pages. Fix it.
Signed-off-by: Peter Xu <pet...@redhat.com>
---
migration/postcopy-ram.c | 2 +-
migration/ram.c | 8 ++++++++
migration/ram.h | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 276ce12..952b73a 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -578,7 +578,7 @@ static int qemu_ufd_copy_ioctl(int userfault_fd, void
*host_addr,
ret = ioctl(userfault_fd, UFFDIO_ZEROPAGE, &zero_struct);
}
if (!ret) {
- ramblock_recv_bitmap_set(host_addr, rb);
+ ramblock_recv_bitmap_set_range(rb, host_addr, pagesize /
getpagesize());
}
return ret;
}
diff --git a/migration/ram.c b/migration/ram.c
index 107ee9d..c93973c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -168,6 +168,14 @@ void ramblock_recv_bitmap_set(void *host_addr, RAMBlock
*rb)
set_bit_atomic(ramblock_recv_bitmap_offset(host_addr, rb),
rb->receivedmap);
}
+void ramblock_recv_bitmap_set_range(RAMBlock *rb, void *host_addr,
+ size_t len)
+{
+ bitmap_set(rb->receivedmap,
+ ramblock_recv_bitmap_offset(host_addr, rb),
+ len);
+}
+
void ramblock_recv_bitmap_clear(void *host_addr, RAMBlock *rb)
{
clear_bit(ramblock_recv_bitmap_offset(host_addr, rb), rb->receivedmap);
diff --git a/migration/ram.h b/migration/ram.h
index b711552..84e8623 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -55,6 +55,8 @@ void ram_handle_compressed(void *host, uint8_t ch, uint64_t
size);
int ramblock_recv_bitmap_test(void *host_addr, RAMBlock *rb);
void ramblock_recv_bitmap_set(void *host_addr, RAMBlock *rb);
+void ramblock_recv_bitmap_set_range(RAMBlock *rb, void *host_addr,
+ size_t len);
void ramblock_recv_bitmap_clear(void *host_addr, RAMBlock *rb);
#endif
--
2.7.4
