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

dump: Let task handle signals on seize

Browse Source 
When seizing a task and waiting for it to stop, we can receive an event
from kernel, that the task didn't stop, but caught a signal. Don't treat
this as an error, let the victim handle it and proceed.

The transition/fork test should work OK now.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Pavel Emelyanov 2012-03-01 20:25:39 +04:00 committed by Cyrill Gorcunov
parent 1e98f53cca
commit cb0eb0b31e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ptrace.c
View File

@ -70,7 +70,7 @@ int seize_task(pid_t pid, pid_t ppid)
pid, ppid, ps.ppid); pid, ppid, ps.ppid);
goto err; goto err;
} }
try_again:
ret = ptrace(PTRACE_INTERRUPT, pid, NULL, NULL); ret = ptrace(PTRACE_INTERRUPT, pid, NULL, NULL);
if (ret < 0) { if (ret < 0) {
pr_perror("SEIZE %d: can't interrupt task", pid); pr_perror("SEIZE %d: can't interrupt task", pid);
@ -100,9 +100,19 @@ int seize_task(pid_t pid, pid_t ppid)
} }
if ((si.si_code >> 8) != PTRACE_EVENT_STOP) { if ((si.si_code >> 8) != PTRACE_EVENT_STOP) {
pr_err("SEIZE %d: wrong stop event received 0x%x\n", pid, /*
(unsigned int)si.si_code); * Kernel notifies us about the task being seized received some
goto err; * event other than the STOP, i.e. -- a signal. Let the task
* handle one and repeat.
*/
if (ptrace(PTRACE_CONT, pid, NULL,
(void *)(unsigned long)si.si_signo)) {
pr_perror("Can't continue signal handling. Aborting.");
goto err;
}
goto try_again;
} }
if (si.si_signo == SIGTRAP) if (si.si_signo == SIGTRAP)