mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-27 04:18:27 +00:00
ffa54cfb1d
At now we pretend that all threads are sharing seccomp chains and at checkpoint moment we test seccomp modes to make sure if this assumption is valid refusing to dump otherwise. Still the kernel tacks seccomp filter chains per each thread and now we've faced applications (such as java) where per-thread chains are actively used. Thus we need to bring support of handling filters via per-thread basis. In this a bit intrusive patch the restore engine is lifted up to treat each thread separately. Here what is done: - Image core file is modified to keep seccomp filters inside thread_core_entry. For backward compatibility former seccomp_mode and seccomp_filter members in task_core_entry are renamed to have old_ prefix and on restore we test if we're dealing with old images. Since per-thread dump is not yet implemeneted the dumping procedure continue operating with old_ members. - In pie restorer code memory containing filters are addressed from inside thread_restore_args structure which now contains seccomp mode itself and chain attributes (number of filters and etc). Reading of per-thread data is done in seccomp_prepare_threads helper -- we take one pstree_item and walks over every thread inside to allocate pie memory and pin data there. Because of PIE specific, before jumping into pie code we have to relocate this memory into new place and for this seccomp_rst_reloc is served. In restorer itself we check if thread_restore_args provides us enabled seccomp mode (strict or filter passed) and call for restore_seccomp_filter if needed. - To unify names we start using seccomp_ prefix for all related stuff involved into this change (prepare_seccomp_filters renamed to seccomp_read_image because it only reads image and nothing more, image handler is renamed to seccomp_img_entry instead of too short 'se'. With this change we're now allowed to start collecting and dumping seccomp filters per each thread, which will be done in next patch. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
121 lines
2.8 KiB
Protocol Buffer
121 lines
2.8 KiB
Protocol Buffer
syntax = "proto2";
|
|
|
|
import "core-x86.proto";
|
|
import "core-arm.proto";
|
|
import "core-aarch64.proto";
|
|
import "core-ppc64.proto";
|
|
import "core-s390.proto";
|
|
|
|
import "rlimit.proto";
|
|
import "timer.proto";
|
|
import "creds.proto";
|
|
import "sa.proto";
|
|
import "siginfo.proto";
|
|
|
|
import "opts.proto";
|
|
|
|
/*
|
|
* These match the SECCOMP_MODE_* flags from <linux/seccomp.h>.
|
|
*/
|
|
enum seccomp_mode {
|
|
disabled = 0;
|
|
strict = 1;
|
|
filter = 2;
|
|
};
|
|
|
|
message task_core_entry {
|
|
required uint32 task_state = 1 [(criu).dict = "gen"];
|
|
required uint32 exit_code = 2;
|
|
|
|
required uint32 personality = 3;
|
|
required uint32 flags = 4;
|
|
required uint64 blk_sigset = 5[(criu).hex = true];
|
|
|
|
required string comm = 6;
|
|
|
|
optional task_timers_entry timers = 7;
|
|
optional task_rlimits_entry rlimits = 8;
|
|
|
|
optional uint32 cg_set = 9;
|
|
|
|
optional signal_queue_entry signals_s = 10;
|
|
|
|
/* These two are deprecated, should be per-thread */
|
|
optional seccomp_mode old_seccomp_mode = 11;
|
|
optional uint32 old_seccomp_filter = 12;
|
|
|
|
optional uint32 loginuid = 13;
|
|
|
|
optional int32 oom_score_adj = 14;
|
|
repeated sa_entry sigactions = 15;
|
|
|
|
// Reserved for TTY inheritance handling
|
|
// optional int32 tty_nr = 16;
|
|
// optional int32 tty_pgrp = 17;
|
|
}
|
|
|
|
message task_kobj_ids_entry {
|
|
required uint32 vm_id = 1;
|
|
required uint32 files_id = 2;
|
|
required uint32 fs_id = 3;
|
|
required uint32 sighand_id = 4;
|
|
|
|
optional uint32 pid_ns_id = 5;
|
|
optional uint32 net_ns_id = 6;
|
|
optional uint32 ipc_ns_id = 7;
|
|
optional uint32 uts_ns_id = 8;
|
|
optional uint32 mnt_ns_id = 9;
|
|
optional uint32 user_ns_id = 10;
|
|
optional uint32 cgroup_ns_id = 11;
|
|
optional uint32 pid_for_children_ns_id = 12;
|
|
}
|
|
|
|
message thread_sas_entry {
|
|
required uint64 ss_sp = 1;
|
|
required uint64 ss_size = 2;
|
|
required uint32 ss_flags = 3;
|
|
}
|
|
|
|
message thread_core_entry {
|
|
required uint64 futex_rla = 1;
|
|
required uint32 futex_rla_len = 2;
|
|
optional sint32 sched_nice = 3;
|
|
optional uint32 sched_policy = 4;
|
|
optional uint32 sched_prio = 5;
|
|
optional uint64 blk_sigset = 6;
|
|
optional thread_sas_entry sas = 7;
|
|
optional uint32 pdeath_sig = 8;
|
|
|
|
optional signal_queue_entry signals_p = 9;
|
|
optional creds_entry creds = 10;
|
|
|
|
optional seccomp_mode seccomp_mode = 11;
|
|
optional uint32 seccomp_filter = 12;
|
|
}
|
|
|
|
message task_rlimits_entry {
|
|
repeated rlimit_entry rlimits = 1;
|
|
};
|
|
|
|
message core_entry {
|
|
enum march {
|
|
UNKNOWN = 0;
|
|
X86_64 = 1;
|
|
ARM = 2;
|
|
AARCH64 = 3;
|
|
PPC64 = 4;
|
|
S390 = 5;
|
|
}
|
|
|
|
required march mtype = 1;
|
|
optional thread_info_x86 thread_info = 2;
|
|
optional thread_info_arm ti_arm = 6;
|
|
optional thread_info_aarch64 ti_aarch64 = 8;
|
|
optional thread_info_ppc64 ti_ppc64 = 9;
|
|
optional thread_info_s390 ti_s390 = 10;
|
|
|
|
optional task_core_entry tc = 3;
|
|
optional task_kobj_ids_entry ids = 4;
|
|
optional thread_core_entry thread_core = 5;
|
|
}
|