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

Pass task_size to vma_area_is_private()

Browse Source 
If we want one CRIU binary to work across all AArch64 kernel
configurations, a single task size value cannot be hard coded. Since
vma_area_is_private() is used by both restorer blob code and non
restorer blob code, which must use different variables for recording
the task size, make task_size a function argument and modify the call
sites accordingly. This fixes the following error on AArch64 kernels
with CONFIG_ARM64_64K_PAGES=y.

  pie: Error (pie/restorer.c:929): Can't restore 0x3ffb7e70000 mapping w>
  pie: ith 0xfffffffffffffff7

Signed-off-by: Christopher Covington <cov@codeaurora.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Christopher Covington 2015-07-31 10:36:26 -04:00 committed by Pavel Emelyanov
parent 7451fc7d23
commit 1438f013a2
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cr-restore.c
View File

@ -269,7 +269,7 @@ static int map_private_vma(struct vma_area *vma, void **tgt_addr,
if (p->e->start > vma->e->start)
break;
if (!vma_area_is_private(p))
if (!vma_area_is_private(p, kdat.task_size))
continue;
if (p->e->end != vma->e->end ||
@ -381,7 +381,7 @@ static int premap_priv_vmas(struct vm_area_list *vmas, void *at)
}
pstart = vma->e->start;
if (!vma_area_is_private(vma))
if (!vma_area_is_private(vma, kdat.task_size))
continue;
ret = map_private_vma(vma, &at, &pvma, parent_vmas);
@ -447,7 +447,7 @@ static int restore_priv_vma_content(void)
*/
if (va < vma->e->start)
goto err_addr;
else if (unlikely(!vma_area_is_private(vma))) {
else if (unlikely(!vma_area_is_private(vma, kdat.task_size))) {
pr_err("Trying to restore page for non-private VMA\n");
goto err_addr;
}
@ -590,7 +590,7 @@ static int unmap_guard_pages()
struct list_head *vmas = &rsti(current)->vmas.h;
list_for_each_entry(vma, vmas, list) {
if (!vma_area_is_private(vma))
if (!vma_area_is_private(vma, kdat.task_size))
continue;
if (vma->e->flags & MAP_GROWSDOWN) {
@ -2713,7 +2713,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
*vme = *vma->e;
if (vma_area_is_private(vma))
if (vma_area_is_private(vma, kdat.task_size))
vma_premmaped_start(vme) = vma->premmaped_addr;
}

10
include/vma.h
View File

@ -92,17 +92,19 @@ static inline int in_vma_area(struct vma_area *vma, unsigned long addr)
addr < (unsigned long)vma->e->end;
}
static inline bool vma_entry_is_private(VmaEntry *entry)
static inline bool vma_entry_is_private(VmaEntry *entry,
unsigned long task_size)
{
return vma_entry_is(entry, VMA_AREA_REGULAR) &&
(vma_entry_is(entry, VMA_ANON_PRIVATE) ||
vma_entry_is(entry, VMA_FILE_PRIVATE)) &&
(entry->end <= TASK_SIZE);
(entry->end <= task_size);
}
static inline bool vma_area_is_private(struct vma_area *vma)
static inline bool vma_area_is_private(struct vma_area *vma,
unsigned long task_size)
{
return vma_entry_is_private(vma->e);
return vma_entry_is_private(vma->e, task_size);
}
#endif /* __CR_VMA_H__ */

6
mem.c
View File

@ -178,7 +178,7 @@ static struct parasite_dump_pages_args *prep_dump_pages_args(struct parasite_ctl
args->nr_vmas = 0;
list_for_each_entry(vma, &vma_area_list->h, list) {
if (!vma_area_is_private(vma))
if (!vma_area_is_private(vma, kdat.task_size))
continue;
if (vma->e->prot & PROT_READ)
continue;
@ -293,7 +293,7 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl,
u64 off = 0;
u64 *map;
if (!vma_area_is_private(vma_area))
if (!vma_area_is_private(vma_area, kdat.task_size))
continue;
map = pmc_get_map(&pmc, vma_area);
@ -441,7 +441,7 @@ int prepare_mm_pid(struct pstree_item *i)
}
list_add_tail(&vma->list, &ri->vmas.h);
if (vma_area_is_private(vma)) {
if (vma_area_is_private(vma, kdat.task_size)) {
ri->vmas.priv_size += vma_area_len(vma);
if (vma->e->flags & MAP_GROWSDOWN)
ri->vmas.priv_size += PAGE_SIZE;

6
pie/restorer.c
View File

@ -878,7 +878,7 @@ long __export_restore_task(struct task_restore_args *args)
for (i = 0; i < args->vmas_n; i++) {
vma_entry = args->vmas + i;
if (!vma_entry_is_private(vma_entry))
if (!vma_entry_is_private(vma_entry, args->task_size))
continue;
if (vma_entry->end >= args->task_size)
@ -896,7 +896,7 @@ long __export_restore_task(struct task_restore_args *args)
for (i = args->vmas_n - 1; i >= 0; i--) {
vma_entry = args->vmas + i;
if (!vma_entry_is_private(vma_entry))
if (!vma_entry_is_private(vma_entry, args->task_size))
continue;
if (vma_entry->start > args->task_size)
@ -919,7 +919,7 @@ long __export_restore_task(struct task_restore_args *args)
if (!vma_entry_is(vma_entry, VMA_AREA_REGULAR))
continue;
if (vma_entry_is_private(vma_entry))
if (vma_entry_is_private(vma_entry, args->task_size))
continue;
va = restore_mapping(vma_entry);

2
proc_parse.c
View File

@ -473,7 +473,7 @@ static int vma_list_add(struct vma_area *vma_area,
list_add_tail(&vma_area->list, &vma_area_list->h);
vma_area_list->nr++;
if (vma_area_is_private(vma_area)) {
if (vma_area_is_private(vma_area, kdat.task_size)) {
unsigned long pages;
pages = vma_area_len(vma_area) / PAGE_SIZE;