[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/10] migration: Pass incoming state into qemu_ufd_copy_ioctl()
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 05/10] migration: Pass incoming state into qemu_ufd_copy_ioctl() |
Date: |
Thu, 8 Oct 2020 20:10:41 +0100 |
From: Peter Xu <peterx@redhat.com>
It'll be used in follow up patches to access more fields out of it. Meanwhile
fetch the userfaultfd inside the function.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20201002175336.30858-2-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/postcopy-ram.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 0a2f88a87d..722034dc01 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -1128,10 +1128,12 @@ int postcopy_ram_incoming_setup(MigrationIncomingState
*mis)
return 0;
}
-static int qemu_ufd_copy_ioctl(int userfault_fd, void *host_addr,
+static int qemu_ufd_copy_ioctl(MigrationIncomingState *mis, void *host_addr,
void *from_addr, uint64_t pagesize, RAMBlock
*rb)
{
+ int userfault_fd = mis->userfault_fd;
int ret;
+
if (from_addr) {
struct uffdio_copy copy_struct;
copy_struct.dst = (uint64_t)(uintptr_t)host_addr;
@@ -1185,7 +1187,7 @@ int postcopy_place_page(MigrationIncomingState *mis, void
*host, void *from,
* which would be slightly cheaper, but we'd have to be careful
* of the order of updating our page state.
*/
- if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, from, pagesize, rb)) {
+ if (qemu_ufd_copy_ioctl(mis, host, from, pagesize, rb)) {
int e = errno;
error_report("%s: %s copy host: %p from: %p (size: %zd)",
__func__, strerror(e), host, from, pagesize);
@@ -1212,7 +1214,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mis,
void *host,
* but it's not available for everything (e.g. hugetlbpages)
*/
if (qemu_ram_is_uf_zeroable(rb)) {
- if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, NULL, pagesize, rb)) {
+ if (qemu_ufd_copy_ioctl(mis, host, NULL, pagesize, rb)) {
int e = errno;
error_report("%s: %s zero host: %p",
__func__, strerror(e), host);
--
2.28.0
- Re: [PULL 00/10] migration queue, (continued)
- [PULL 00/10] migration queue, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 01/10] virtiofsd: Silence gcc warning, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 02/10] tools/virtiofsd: add support for --socket-group, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 03/10] virtiofsd: Call qemu_init_exec_dir, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 04/10] virtiofsd: avoid /proc/self/fd tempdir, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 05/10] migration: Pass incoming state into qemu_ufd_copy_ioctl(),
Dr. David Alan Gilbert (git) <=
- [PULL 06/10] migration: Introduce migrate_send_rp_message_req_pages(), Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 07/10] migration: Maintain postcopy faulted addresses, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 08/10] migration: Sync requested pages after postcopy recovery, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 09/10] migration/dirtyrate: record start_time and calc_time while at the measuring state, Dr. David Alan Gilbert (git), 2020/10/08
- [PULL 10/10] migration/dirtyrate: present dirty rate only when querying the rate has completed, Dr. David Alan Gilbert (git), 2020/10/08
- Re: [PULL 00/10] migration queue, Peter Maydell, 2020/10/11