Skip to content

Commit

Permalink
Add error logging to kerndat init
Browse files Browse the repository at this point in the history 
CRIU sometimes returns 1 from main() with no explanation.
These changes add additional logging for initialization errors in kerndat.

Signed-off-by: Angie Ni <[email protected]>
  • Loading branch information
@avagin
Angie Ni authored and avagin committed Jul 9, 2020
1 parent 620668e commit 483792d
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 67 deletions.
202 changes: 137 additions & 65 deletions criu/kerndat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,10 @@ static int init_zero_page_pfn(void)
ret = vaddr_to_pfn(-1, (unsigned long)addr, &kdat.zero_page_pfn);
munmap(addr, PAGE_SIZE);

if (kdat.zero_page_pfn == 0)
if (kdat.zero_page_pfn == 0) {
pr_err("vaddr_to_pfn succeeded but kdat.zero_page_pfn is invalid.\n");
ret = -1;

}
return ret;
}

Expand Down Expand Up @@ -577,8 +578,10 @@ int kerndat_tcp_repair(void)
}

if (setsockopt(clnt, SOL_TCP, TCP_REPAIR, &yes, sizeof(yes))) {
if (errno != EPERM)
if (errno != EPERM) {
pr_perror("Unable to set TCP_REPAIR with setsockopt");
goto err;
}
kdat.has_tcp_half_closed = false;
} else
kdat.has_tcp_half_closed = true;
Expand Down Expand Up @@ -617,8 +620,10 @@ static int kerndat_compat_restore(void)
int ret;

ret = kdat_can_map_vdso();
if (ret < 0)
if (ret < 0) {
pr_err("kdat_can_map_vdso failed\n");
return ret;
}
kdat.can_map_vdso = !!ret;

/* depends on kdat.can_map_vdso result */
Expand Down Expand Up @@ -653,6 +658,7 @@ static int kerndat_detect_stack_guard_gap(void)

maps = fopen("/proc/self/maps", "r");
if (maps == NULL) {
pr_perror("Could not open /proc/self/maps");
munmap(mem, 4096);
return -1;
}
Expand Down Expand Up @@ -807,8 +813,10 @@ static int kerndat_x86_has_ptrace_fpu_xsave_bug(void)
{
int ret = kdat_x86_has_ptrace_fpu_xsave_bug();

if (ret < 0)
if (ret < 0) {
pr_err("kdat_x86_has_ptrace_fpu_xsave_bug failed\n");
return ret;
}

kdat.x86_has_ptrace_fpu_xsave_bug = !!ret;
return 0;
Expand Down Expand Up @@ -936,8 +944,10 @@ int kerndat_has_thp_disable(void)
bool vma_match = false;

if (prctl(PR_SET_THP_DISABLE, 1, 0, 0, 0)) {
if (errno != EINVAL)
if (errno != EINVAL) {
pr_perror("prctl PR_SET_THP_DISABLE failed");
return -1;
}
pr_info("PR_SET_THP_DISABLE is not available\n");
return 0;
}
Expand All @@ -949,8 +959,10 @@ int kerndat_has_thp_disable(void)
return -1;
}

if (prctl(PR_SET_THP_DISABLE, 0, 0, 0, 0))
return -1;
if (prctl(PR_SET_THP_DISABLE, 0, 0, 0, 0)) {
pr_perror("prctl PR_SET_THP_DISABLE failed");
goto out_unmap;
}

f.fd = open("/proc/self/smaps", O_RDONLY);
if (f.fd < 0) {
Expand Down Expand Up @@ -1047,72 +1059,132 @@ int kerndat_init(void)
ret = kerndat_try_load_cache();
if (ret <= 0)
return ret;
ret = 0;

/* kerndat_try_load_cache can leave some trash in kdat */
memset(&kdat, 0, sizeof(kdat));

preload_socket_modules();
preload_netfilter_modules();

ret = check_pagemap();
if (!ret)
ret = kerndat_get_shmemdev();
if (!ret)
ret = kerndat_get_dirty_track();
if (!ret)
ret = init_zero_page_pfn();
if (!ret)
ret = get_last_cap();
if (!ret)
ret = kerndat_fdinfo_has_lock();
if (!ret)
ret = get_task_size();
if (!ret)
ret = get_ipv6();
if (!ret)
ret = kerndat_loginuid();
if (!ret)
ret = kerndat_iptables_has_xtlocks();
if (!ret)
ret = kerndat_tcp_repair();
if (!ret)
ret = kerndat_compat_restore();
if (!ret)
ret = kerndat_tun_netns();
if (!ret)
ret = kerndat_socket_unix_file();
if (!ret)
ret = kerndat_nsid();
if (!ret)
ret = kerndat_link_nsid();
if (!ret)
ret = kerndat_has_memfd_create();
if (!ret)
ret = kerndat_detect_stack_guard_gap();
if (!ret)
ret = kerndat_uffd();
if (!ret)
ret = kerndat_has_thp_disable();
if (check_pagemap()) {
pr_err("check_pagemap failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_get_shmemdev()) {
pr_err("kerndat_get_shmemdev failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_get_dirty_track()) {
pr_err("kerndat_get_dirty_track failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && init_zero_page_pfn()) {
pr_err("init_zero_page_pfn failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && get_last_cap()) {
pr_err("get_last_cap failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_fdinfo_has_lock()) {
pr_err("kerndat_fdinfo_has_lock failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && get_task_size()) {
pr_err("get_task_size failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && get_ipv6()) {
pr_err("get_ipv6 failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_loginuid()) {
pr_err("kerndat_loginuid failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_iptables_has_xtlocks()) {
pr_err("kerndat_iptables_has_xtlocks failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_tcp_repair()) {
pr_err("kerndat_tcp_repair failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_compat_restore()) {
pr_err("kerndat_compat_restore failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_tun_netns()) {
pr_err("kerndat_tun_netns failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_socket_unix_file()) {
pr_err("kerndat_socket_unix_file failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_nsid()) {
pr_err("kerndat_nsid failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_link_nsid()) {
pr_err("kerndat_link_nsid failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_has_memfd_create()) {
pr_err("kerndat_has_memfd_create failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_detect_stack_guard_gap()) {
pr_err("kerndat_detect_stack_guard_gap failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_uffd()) {
pr_err("kerndat_uffd failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_has_thp_disable()) {
pr_err("kerndat_has_thp_disable failed when initializing kerndat.\n");
ret = -1;
}
/* Needs kdat.compat_cr filled before */
if (!ret)
ret = kerndat_vdso_fill_symtable();
if (!ret && kerndat_vdso_fill_symtable()) {
pr_err("kerndat_vdso_fill_symtable failed when initializing kerndat.\n");
ret = -1;
}
/* Depends on kerndat_vdso_fill_symtable() */
if (!ret)
ret = kerndat_vdso_preserves_hint();
if (!ret)
ret = kerndat_socket_netns();
if (!ret)
ret = kerndat_x86_has_ptrace_fpu_xsave_bug();
if (!ret)
ret = kerndat_has_inotify_setnextwd();
if (!ret)
ret = has_kcmp_epoll_tfd();
if (!ret)
ret = kerndat_has_fsopen();
if (!ret)
ret = kerndat_has_clone3_set_tid();
if (!ret)
ret = has_time_namespace();
if (!ret && kerndat_vdso_preserves_hint()) {
pr_err("kerndat_vdso_preserves_hint failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_socket_netns()) {
pr_err("kerndat_socket_netns failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_x86_has_ptrace_fpu_xsave_bug()) {
pr_err("kerndat_x86_has_ptrace_fpu_xsave_bug failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_has_inotify_setnextwd()) {
pr_err("kerndat_has_inotify_setnextwd failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && has_kcmp_epoll_tfd()) {
pr_err("has_kcmp_epoll_tfd failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_has_fsopen()) {
pr_err("kerndat_has_fsopen failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && kerndat_has_clone3_set_tid()) {
pr_err("kerndat_has_clone3_set_tid failed when initializing kerndat.\n");
ret = -1;
}
if (!ret && has_time_namespace()) {
pr_err("has_time_namespace failed when initializing kerndat.\n");
ret = -1;
}

kerndat_lsm();
kerndat_mmap_min_addr();
Expand Down
8 changes: 6 additions & 2 deletions criu/net.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3484,11 +3484,15 @@ int kerndat_link_nsid(void)
}

has_link_nsid = false;
if (check_link_nsid(sk, &has_link_nsid))
if (check_link_nsid(sk, &has_link_nsid)) {
pr_err("check_link_nsid failed\n");
exit(1);
}

if (!has_link_nsid)
if (!has_link_nsid) {
pr_err("check_link_nsid succeeded but has_link_nsid is false\n");
exit(5);
}

close(sk);

Expand Down

0 comments on commit 483792d

Please sign in to comment.