mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 22:35:33 +00:00
Code Issues Releases Wiki Activity

criu: lazy-pages: simplify intialization of lazy pages list

Browse Source 
Instead of creating mm-related parts of restore info in process tree we
can directly use MmEntry for VMA traversals.

Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Mike Rapoport
2016-11-13 11:52:36 +02:00
committed by Andrei Vagin
parent c00dd3459f
commit fe53a87f70
1 changed files with 11 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
criu/uffd.c
View File

@@ -295,22 +295,16 @@ struct uffd_pages_struct {
int flags; int flags;
}; };
static int collect_uffd_pages(struct page_read *pr, struct lazy_pages_info *lpi) static int collect_uffd_pages(struct lazy_pages_info *lpi, MmEntry *mm)
{ {
unsigned long base; unsigned long base;
int i; int i, j;
struct iovec iov; struct iovec iov;
unsigned long nr_pages; unsigned long nr_pages;
unsigned long ps; unsigned long ps;
int rc; int rc;
struct uffd_pages_struct *uffd_pages; struct uffd_pages_struct *uffd_pages;
struct vma_area *vma; struct page_read *pr = &lpi->pr;
struct vm_area_list *vmas;
struct pstree_item *item = pstree_item_by_virt(lpi->pid);
BUG_ON(!item);
vmas = &rsti(item)->vmas;
rc = pr->get_pagemap(pr, &iov); rc = pr->get_pagemap(pr, &iov);
if (rc <= 0) if (rc <= 0)
@@ -329,13 +323,14 @@ static int collect_uffd_pages(struct page_read *pr, struct lazy_pages_info *lpi)
* are relevant for userfaultfd handling. * are relevant for userfaultfd handling.
* Loop over all VMAs to see if the flags matching. * Loop over all VMAs to see if the flags matching.
*/ */
list_for_each_entry(vma, &vmas->h, list) { for (j = 0; j < mm->n_vmas; j++) {
VmaEntry *vma = mm->vmas[j];
/* /*
* This loop assumes that base can actually be found * This loop assumes that base can actually be found
* in the VMA list. * in the VMA list.
*/ */
if (base >= vma->e->start && base < vma->e->end) { if (base >= vma->start && base < vma->end) {
if (vma_entry_can_be_lazy(vma->e)) { if (vma_entry_can_be_lazy(vma)) {
if(!pagemap_in_parent(pr->pe)) if(!pagemap_in_parent(pr->pe))
uffd_page = true; uffd_page = true;
break; break;
@@ -366,53 +361,18 @@ static int find_vmas(struct lazy_pages_info *lpi)
{ {
struct cr_img *img; struct cr_img *img;
int ret; int ret;
struct vm_area_list vmas; MmEntry *mm;
int vn = 0;
struct rst_info *ri;
struct uffd_pages_struct *uffd_pages; struct uffd_pages_struct *uffd_pages;
struct pstree_item *item = pstree_item_by_virt(lpi->pid);
BUG_ON(!item);
vm_area_list_init(&vmas);
ri = rsti(item);
if (!ri)
return -1;
img = open_image(CR_FD_MM, O_RSTR, lpi->pid); img = open_image(CR_FD_MM, O_RSTR, lpi->pid);
if (!img) if (!img)
return -1; return -1;
ret = pb_read_one_eof(img, &ri->mm, PB_MM); ret = pb_read_one_eof(img, &mm, PB_MM);
close_image(img); close_image(img);
if (ret == -1) if (ret == -1)
return -1; return -1;
pr_debug("Found %zd VMAs in image\n", mm->n_vmas);
pr_debug("Found %zd VMAs in image\n", ri->mm->n_vmas);
while (vn < ri->mm->n_vmas) {
struct vma_area *vma;
ret = -1;
vma = alloc_vma_area();
if (!vma)
goto out;
ret = 0;
ri->vmas.nr++;
vma->e = ri->mm->vmas[vn++];
list_add_tail(&vma->list, &ri->vmas.h);
if (vma_area_is_private(vma, kdat.task_size)) {
vmas.priv_size += vma_area_len(vma);
if (vma->e->flags & MAP_GROWSDOWN)
vmas.priv_size += PAGE_SIZE;
}
pr_info("vma 0x%"PRIx64" 0x%"PRIx64"\n", vma->e->start, vma->e->end);
}
ret = open_page_read(lpi->pid, &lpi->pr, PR_TASK); ret = open_page_read(lpi->pid, &lpi->pr, PR_TASK);
if (ret <= 0) { if (ret <= 0) {
@@ -426,7 +386,7 @@ static int find_vmas(struct lazy_pages_info *lpi)
* pushed into the process using userfaultfd. * pushed into the process using userfaultfd.
*/ */
do { do {
ret = collect_uffd_pages(&lpi->pr, lpi); ret = collect_uffd_pages(lpi, mm);
if (ret == -1) { if (ret == -1) {
goto out; goto out;
} }