mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

restorer: Make task- and thread- args go one-by-one

Browse Source 
Currently we have task args page-aligned, then there go
thread args. This is waste of memory. Let's put them in
one row.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2013-11-08 17:29:55 +04:00
parent d52e000152
commit ec7e483e8b
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cr-restore.c
View File

@@ -2169,9 +2169,6 @@ void __gcov_flush(void) {}
static int sigreturn_restore(pid_t pid, CoreEntry *core) static int sigreturn_restore(pid_t pid, CoreEntry *core)
{ {
long restore_task_vma_len;
long restore_thread_vma_len;
void *mem = MAP_FAILED; void *mem = MAP_FAILED;
void *restore_thread_exec_start; void *restore_thread_exec_start;
void *restore_task_exec_start; void *restore_task_exec_start;
@@ -2183,6 +2180,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
struct task_restore_core_args *task_args; struct task_restore_core_args *task_args;
struct thread_restore_args *thread_args; struct thread_restore_args *thread_args;
long args_len;
struct vma_area *vma; struct vma_area *vma;
unsigned long tgt_vmas; unsigned long tgt_vmas;
@@ -2205,12 +2203,9 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
BUILD_BUG_ON(sizeof(struct thread_restore_args) & 1); BUILD_BUG_ON(sizeof(struct thread_restore_args) & 1);
BUILD_BUG_ON(TASK_ENTRIES_SIZE % PAGE_SIZE); BUILD_BUG_ON(TASK_ENTRIES_SIZE % PAGE_SIZE);
restore_task_vma_len = round_up(sizeof(*task_args), PAGE_SIZE); args_len = round_up(sizeof(*task_args) + sizeof(*thread_args) * current->nr_threads, PAGE_SIZE);
restore_thread_vma_len = round_up(sizeof(*thread_args) * current->nr_threads, PAGE_SIZE);
pr_info("%d threads require %ldK of memory\n", pr_info("%d threads require %ldK of memory\n",
current->nr_threads, current->nr_threads, KBYTES(args_len));
KBYTES(restore_thread_vma_len));
/* /*
* Copy VMAs to private rst memory so that it's able to * Copy VMAs to private rst memory so that it's able to
@@ -2251,9 +2246,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
if (ret < 0) if (ret < 0)
goto err; goto err;
restore_bootstrap_len = restorer_len + restore_bootstrap_len = restorer_len + args_len +
restore_task_vma_len +
restore_thread_vma_len +
TASK_ENTRIES_SIZE + TASK_ENTRIES_SIZE +
rst_mem_remap_size(); rst_mem_remap_size();
@@ -2305,8 +2298,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
exec_mem_hint += restorer_len; exec_mem_hint += restorer_len;
/* VMA we need to run task_restore code */ /* VMA we need to run task_restore code */
mem = mmap((void *)exec_mem_hint, mem = mmap((void *)exec_mem_hint, args_len,
restore_task_vma_len + restore_thread_vma_len,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON | MAP_FIXED, 0, 0); MAP_PRIVATE | MAP_ANON | MAP_FIXED, 0, 0);
if (mem != (void *)exec_mem_hint) { if (mem != (void *)exec_mem_hint) {
@@ -2314,9 +2306,9 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
goto err; goto err;
} }
memzero(mem, restore_task_vma_len + restore_thread_vma_len); memzero(mem, args_len);
task_args = mem; task_args = mem;
thread_args = mem + restore_task_vma_len; thread_args = (struct thread_restore_args *)(task_args + 1);
task_args->bootstrap_start = (void *)exec_mem_hint - restorer_len; task_args->bootstrap_start = (void *)exec_mem_hint - restorer_len;
task_args->bootstrap_len = restore_bootstrap_len; task_args->bootstrap_len = restore_bootstrap_len;
@@ -2333,7 +2325,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
* address. * address.
*/ */
mem += restore_task_vma_len + restore_thread_vma_len; mem += args_len;
ret = shmem_remap(task_entries, mem, TASK_ENTRIES_SIZE); ret = shmem_remap(task_entries, mem, TASK_ENTRIES_SIZE);
if (ret < 0) if (ret < 0)
goto err; goto err;

11
include/restorer.h
View File

@@ -64,7 +64,12 @@ struct restore_posix_timer {
struct task_restore_core_args; struct task_restore_core_args;
/* Make sure it's pow2 in size */ /*
* We should be able to construct fpu sigframe in sigreturn_prep_fpu_frame,
* so the mem_zone.rt_sigframe should be 64-bytes aligned. To make things
* simpler, force both _args alignment be 64 bytes.
*/
struct thread_restore_args { struct thread_restore_args {
struct restore_mem_zone mem_zone; struct restore_mem_zone mem_zone;
@@ -84,7 +89,7 @@ struct thread_restore_args {
siginfo_t *siginfo; siginfo_t *siginfo;
unsigned int siginfo_nr; unsigned int siginfo_nr;
} __aligned(sizeof(long)); } __aligned(64);
struct task_restore_core_args { struct task_restore_core_args {
struct thread_restore_args *t; /* thread group leader */ struct thread_restore_args *t; /* thread group leader */
@@ -142,7 +147,7 @@ struct task_restore_core_args {
struct vdso_symtable vdso_sym_rt; /* runtime vdso symbols */ struct vdso_symtable vdso_sym_rt; /* runtime vdso symbols */
unsigned long vdso_rt_parked_at; /* safe place to keep vdso */ unsigned long vdso_rt_parked_at; /* safe place to keep vdso */
} __aligned(sizeof(long)); } __aligned(64);
#define RESTORE_ALIGN_STACK(start, size) \ #define RESTORE_ALIGN_STACK(start, size) \
(ALIGN((start) + (size) - sizeof(long), sizeof(long))) (ALIGN((start) + (size) - sizeof(long), sizeof(long)))