Commit 50f712e9 authored by Pavel Emelyanov's avatar Pavel Emelyanov

sig: Optimize sigactions restore

Most of the sigactions are the same across the tasks in the image.
Nonetheless existing code always calls a syscall to restore them
and spends 64 calls per-task.

Let's restore signals before forking children and let them inherit
sigactions. Tune one only if it differs from the parent's.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
parent bf0d4c4b
...@@ -616,6 +616,22 @@ static int open_vmas(int pid) ...@@ -616,6 +616,22 @@ static int open_vmas(int pid)
} }
static rt_sigaction_t sigchld_act; static rt_sigaction_t sigchld_act;
static rt_sigaction_t parent_act[SIGMAX];
static bool sa_inherited(int sig, rt_sigaction_t *sa)
{
rt_sigaction_t *pa;
if (current == root_item)
return false; /* XXX -- inherit from CRIU? */
pa = &parent_act[sig];
return pa->rt_sa_handler == sa->rt_sa_handler &&
pa->rt_sa_flags == sa->rt_sa_flags &&
pa->rt_sa_restorer == sa->rt_sa_restorer &&
pa->rt_sa_mask.sig[0] == sa->rt_sa_mask.sig[0];
}
static int prepare_sigactions(void) static int prepare_sigactions(void)
{ {
int pid = current->pid.virt; int pid = current->pid.virt;
...@@ -623,7 +639,7 @@ static int prepare_sigactions(void) ...@@ -623,7 +639,7 @@ static int prepare_sigactions(void)
int fd_sigact; int fd_sigact;
SaEntry *e; SaEntry *e;
int sig; int sig;
int ret = -1; int ret = 0;
fd_sigact = open_image(CR_FD_SIGACT, O_RSTR, pid); fd_sigact = open_image(CR_FD_SIGACT, O_RSTR, pid);
if (fd_sigact < 0) if (fd_sigact < 0)
...@@ -657,6 +673,10 @@ static int prepare_sigactions(void) ...@@ -657,6 +673,10 @@ static int prepare_sigactions(void)
sigchld_act = act; sigchld_act = act;
continue; continue;
} }
if (sa_inherited(sig, &act))
continue;
/* /*
* A pure syscall is used, because glibc * A pure syscall is used, because glibc
* sigaction overwrites se_restorer. * sigaction overwrites se_restorer.
...@@ -666,6 +686,8 @@ static int prepare_sigactions(void) ...@@ -666,6 +686,8 @@ static int prepare_sigactions(void)
pr_err("%d: Can't restore sigaction: %m\n", pid); pr_err("%d: Can't restore sigaction: %m\n", pid);
goto err; goto err;
} }
parent_act[sig] = act;
} }
err: err:
...@@ -718,9 +740,6 @@ static int restore_one_alive_task(int pid, CoreEntry *core) ...@@ -718,9 +740,6 @@ static int restore_one_alive_task(int pid, CoreEntry *core)
if (prepare_file_locks(pid)) if (prepare_file_locks(pid))
return -1; return -1;
if (prepare_sigactions())
return -1;
if (open_vmas(pid)) if (open_vmas(pid))
return -1; return -1;
...@@ -1351,6 +1370,9 @@ static int restore_task_with_children(void *_arg) ...@@ -1351,6 +1370,9 @@ static int restore_task_with_children(void *_arg)
if (prepare_task_cgroup(current) < 0) if (prepare_task_cgroup(current) < 0)
return -1; return -1;
if (prepare_sigactions() < 0)
return -1;
if (create_children_and_session()) if (create_children_and_session())
goto err; goto err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment