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

parasite: save thread registers in parasite_thread_ctl

Browse Source 
Now we restore thread registers immediately after a command,
but when we will execute a parasite, it will be impossible.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin 2013-05-24 16:20:09 +04:00 committed by Pavel Emelyanov
parent 3f48f35bfd
commit b21dd2bc0f
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/crtools.c
View File

@ -63,7 +63,7 @@ int syscall_seized(struct parasite_ctl *ctl, int nr, unsigned long *ret,
unsigned long arg5, unsigned long arg5,
unsigned long arg6) unsigned long arg6)
{ {
user_regs_struct_t regs = ctl->regs_orig; user_regs_struct_t regs = ctl->threads[0].regs_orig;
int err; int err;
regs.ARM_r7 = (unsigned long)nr; regs.ARM_r7 = (unsigned long)nr;

2
arch/x86/crtools.c
View File

@ -87,7 +87,7 @@ int syscall_seized(struct parasite_ctl *ctl, int nr, unsigned long *ret,
unsigned long arg5, unsigned long arg5,
unsigned long arg6) unsigned long arg6)
{ {
user_regs_struct_t regs = ctl->regs_orig; user_regs_struct_t regs = ctl->threads[0].regs_orig;
int err; int err;
regs.ax = (unsigned long)nr; regs.ax = (unsigned long)nr;

2
include/parasite-syscall.h
View File

@ -8,6 +8,7 @@
struct parasite_thread_ctl struct parasite_thread_ctl
{ {
pid_t tid; pid_t tid;
user_regs_struct_t regs_orig; /* original registers */
}; };
/* parasite control block */ /* parasite control block */
@ -18,7 +19,6 @@ struct parasite_ctl {
unsigned long map_length; unsigned long map_length;
unsigned long parasite_ip; /* service routine start ip */ unsigned long parasite_ip; /* service routine start ip */
user_regs_struct_t regs_orig; /* original registers */
unsigned long syscall_ip; /* entry point of infection */ unsigned long syscall_ip; /* entry point of infection */
u8 code_orig[BUILTIN_SYSCALL_SIZE]; u8 code_orig[BUILTIN_SYSCALL_SIZE];

30
parasite-syscall.c
View File

@ -128,7 +128,7 @@ retry_signal:
* and retry. * and retry.
*/ */
if (ptrace(PTRACE_SETREGS, pid, NULL, &ctl->regs_orig)) { if (ptrace(PTRACE_SETREGS, pid, NULL, &ctl->threads[0].regs_orig)) {
pr_perror("Can't set registers (pid: %d)", pid); pr_perror("Can't set registers (pid: %d)", pid);
goto err; goto err;
} }
@ -171,7 +171,7 @@ retry_signal:
pr_perror("Can't obtain registers (pid: %d)", pid); pr_perror("Can't obtain registers (pid: %d)", pid);
goto err; goto err;
} }
ctl->regs_orig = r; ctl->threads[0].regs_orig = r;
} }
goto again; goto again;
@ -200,19 +200,9 @@ void *parasite_args_s(struct parasite_ctl *ctl, int args_size)
static int parasite_execute_by_id(unsigned int cmd, struct parasite_ctl *ctl, int id) static int parasite_execute_by_id(unsigned int cmd, struct parasite_ctl *ctl, int id)
{ {
struct parasite_thread_ctl *thread = &ctl->threads[id]; struct parasite_thread_ctl *thread = &ctl->threads[id];
user_regs_struct_t regs = thread->regs_orig;
pid_t pid = thread->tid; pid_t pid = thread->tid;
int ret; int ret;
user_regs_struct_t regs_orig, regs;
if (ctl->pid.real == pid)
regs = ctl->regs_orig;
else {
if (ptrace(PTRACE_GETREGS, pid, NULL, &regs_orig)) {
pr_perror("Can't obtain registers (pid: %d)", pid);
return -1;
}
regs = regs_orig;
}
*ctl->addr_cmd = cmd; *ctl->addr_cmd = cmd;
@ -226,7 +216,7 @@ static int parasite_execute_by_id(unsigned int cmd, struct parasite_ctl *ctl, in
pr_err("Parasite exited with %d\n", ret); pr_err("Parasite exited with %d\n", ret);
if (ctl->pid.real != pid) if (ctl->pid.real != pid)
if (ptrace(PTRACE_SETREGS, pid, NULL, &regs_orig)) { if (ptrace(PTRACE_SETREGS, pid, NULL, &thread->regs_orig)) {
pr_perror("Can't restore registers (pid: %d)", pid); pr_perror("Can't restore registers (pid: %d)", pid);
return -1; return -1;
} }
@ -664,12 +654,18 @@ int parasite_init_threads_seized(struct parasite_ctl *ctl, struct pstree_item *i
for (i = 1; i < item->nr_threads; i++) { for (i = 1; i < item->nr_threads; i++) {
pid_t tid = item->threads[i].real; pid_t tid = item->threads[i].real;
user_regs_struct_t *regs_orig = &ctl->threads[i].regs_orig;
ctl->threads[i].tid = tid; ctl->threads[i].tid = tid;
ctl->nr_threads++; ctl->nr_threads++;
args->id = i; args->id = i;
ret = ptrace(PTRACE_GETREGS, tid, NULL, regs_orig);
if (ret) {
pr_perror("Can't obtain registers (pid: %d)", tid);
break;
}
ret = parasite_execute_by_id(PARASITE_CMD_INIT_THREAD, ctl, i); ret = parasite_execute_by_id(PARASITE_CMD_INIT_THREAD, ctl, i);
if (ret) { if (ret) {
@ -750,7 +746,7 @@ int parasite_cure_remote(struct parasite_ctl *ctl)
ret = -1; ret = -1;
} }
if (ptrace(PTRACE_SETREGS, ctl->pid.real, NULL, &ctl->regs_orig)) { if (ptrace(PTRACE_SETREGS, ctl->pid.real, NULL, &ctl->threads[0].regs_orig)) {
pr_err("Can't restore registers (pid: %d)\n", ctl->pid.real); pr_err("Can't restore registers (pid: %d)\n", ctl->pid.real);
ret = -1; ret = -1;
} }
@ -807,12 +803,12 @@ struct parasite_ctl *parasite_prep_ctl(pid_t pid, struct vm_area_list *vma_area_
ctl->nr_threads = 1; ctl->nr_threads = 1;
ctl->threads[0].tid = pid; ctl->threads[0].tid = pid;
if (ptrace(PTRACE_GETREGS, pid, NULL, &ctl->regs_orig)) { if (ptrace(PTRACE_GETREGS, pid, NULL, &ctl->threads[0].regs_orig)) {
pr_err("Can't obtain registers (pid: %d)\n", pid); pr_err("Can't obtain registers (pid: %d)\n", pid);
goto err; goto err;
} }
vma_area = get_vma_by_ip(&vma_area_list->h, REG_IP(ctl->regs_orig)); vma_area = get_vma_by_ip(&vma_area_list->h, REG_IP(ctl->threads[0].regs_orig));
if (!vma_area) { if (!vma_area) {
pr_err("No suitable VMA found to run parasite " pr_err("No suitable VMA found to run parasite "
"bootstrap code (pid: %d)\n", pid); "bootstrap code (pid: %d)\n", pid);