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

dump: do not fail dump when robust_lists are disabled

Browse Source 
Robust lists may be disabled, for example if the "futex_cmpxchg_enabled"
variable in the kernel is unset.

Detect that case by checking that both "get_robust_list" and "set_robust_list"
syscalls return ENOSYS and do not make criu dump fail in that case, but simply
assume an empty list, which is consistent with the syscalls not being
available.

Tested: Successfully ran the zdtm test suite on a kernel where the
"get_robust_list" and "set_robust_list" syscalls are disabled.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Filipe Brandenburger
2014-06-25 19:35:00 +04:00
committed by Pavel Emelyanov
parent bbb3299f03
commit 64dc66c29f
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cr-dump.c
View File

@@ -539,15 +539,35 @@ static int get_task_futex_robust_list(pid_t pid, ThreadCoreEntry *info)
int ret; int ret;
ret = sys_get_robust_list(pid, &head, &len); ret = sys_get_robust_list(pid, &head, &len);
if (ret) { if (ret == -ENOSYS) {
pr_err("Failed obtaining futex robust list on %d\n", pid); /*
return -1; * If the kernel says get_robust_list is not implemented, then
* check whether set_robust_list is also not implemented, in
* that case we can assume it is empty, since set_robust_list
* is the only way to populate it. This case is possible when
* "futex_cmpxchg_enabled" is unset in the kernel.
*
* The following system call should always fail, even if it is
* implemented, in which case it will return -EINVAL because
* len should be greater than zero.
*/
if (sys_set_robust_list(NULL, 0) != -ENOSYS)
goto err;
head = NULL;
len = 0;
} else if (ret) {
goto err;
} }
info->futex_rla = encode_pointer(head); info->futex_rla = encode_pointer(head);
info->futex_rla_len = (u32)len; info->futex_rla_len = (u32)len;
return 0; return 0;
err:
pr_err("Failed obtaining futex robust list on %d\n", pid);
return -1;
} }
static int get_task_personality(pid_t pid, u32 *personality) static int get_task_personality(pid_t pid, u32 *personality)