Commit 20d7eb4c authored by Mike Rapoport's avatar Mike Rapoport Committed by Andrei Vagin

criu: lazy-pages: copy remaining IOVs in chunks

travis-ci: success for uffd: A new set of improvements
Signed-off-by: 's avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 0d5d286f
...@@ -595,22 +595,17 @@ static int uffd_handle_pages(struct lazy_pages_info *lpi, __u64 address, int nr) ...@@ -595,22 +595,17 @@ static int uffd_handle_pages(struct lazy_pages_info *lpi, __u64 address, int nr)
static int handle_remaining_pages(struct lazy_pages_info *lpi) static int handle_remaining_pages(struct lazy_pages_info *lpi)
{ {
struct lazy_iovec *lazy_iov; struct lazy_iovec *lazy_iov;
int nr_pages, i, err; int nr_pages, err;
unsigned long addr;
lpi->pr.reset(&lpi->pr); lpi->pr.reset(&lpi->pr);
list_for_each_entry(lazy_iov, &lpi->iovs, l) { list_for_each_entry(lazy_iov, &lpi->iovs, l) {
nr_pages = lazy_iov->len / PAGE_SIZE; nr_pages = lazy_iov->len / PAGE_SIZE;
for (i = 0; i < nr_pages; i++) { err = uffd_handle_pages(lpi, lazy_iov->base, nr_pages);
addr = lazy_iov->base + i * PAGE_SIZE; if (err < 0) {
pr_err("Error during UFFD copy\n");
err = uffd_handle_pages(lpi, addr, 1); return -1;
if (err < 0) {
pr_err("Error during UFFD copy\n");
return -1;
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment