From 158e8f8fe637117f00bb6ecbad84d6491970d84d Mon Sep 17 00:00:00 2001 From: Guoyun Sun Date: Wed, 8 Apr 2020 10:23:16 +0800 Subject: [PATCH] mips:proto: Add mips to protocol buffer files Signed-off-by: Guoyun Sun --- images/Makefile | 1 + images/core-mips.proto | 90 ++++++++++++++++++++++++++++++++++++++++++ images/core.proto | 5 +++ images/sa.proto | 1 + 4 files changed, 97 insertions(+) create mode 100755 images/core-mips.proto diff --git a/images/Makefile b/images/Makefile index bc67278e6..5458e4679 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,7 @@ proto-obj-y += stats.o proto-obj-y += core.o proto-obj-y += core-x86.o +proto-obj-y += core-mips.o proto-obj-y += core-arm.o proto-obj-y += core-aarch64.o proto-obj-y += core-ppc64.o diff --git a/images/core-mips.proto b/images/core-mips.proto new file mode 100755 index 000000000..6391b1e86 --- /dev/null +++ b/images/core-mips.proto @@ -0,0 +1,90 @@ +syntax = "proto2"; + +import "opts.proto"; + +message user_mips_regs_entry { + required uint64 r0 = 1; + required uint64 r1 = 2; + required uint64 r2 = 3; + required uint64 r3 = 4; + required uint64 r4 = 5; + required uint64 r5 = 6; + required uint64 r6 = 7; + required uint64 r7 = 8; + required uint64 r8 = 9; + required uint64 r9 = 10; + required uint64 r10 = 11; + required uint64 r11 = 12; + required uint64 r12 = 13; + required uint64 r13 = 14; + required uint64 r14 = 15; + required uint64 r15 = 16; + required uint64 r16 = 17; + required uint64 r17 = 18; + required uint64 r18 = 19; + required uint64 r19 = 20; + required uint64 r20 = 21; + required uint64 r21 = 22; + required uint64 r22 = 23; + required uint64 r23 = 24; + required uint64 r24 = 25; + required uint64 r25 = 26; + required uint64 r26 = 27; + required uint64 r27 = 28; + required uint64 r28 = 29; + required uint64 r29 = 30; + required uint64 r30 = 31; + required uint64 r31 = 32; + required uint64 lo = 33; + required uint64 hi = 34; + required uint64 cp0_epc = 35; + required uint64 cp0_badvaddr = 36; + required uint64 cp0_status = 37; + required uint64 cp0_cause = 38; +} + +message user_mips_fpregs_entry { + required uint64 r0 = 1; + required uint64 r1 = 2; + required uint64 r2 = 3; + required uint64 r3 = 4; + required uint64 r4 = 5; + required uint64 r5 = 6; + required uint64 r6 = 7; + required uint64 r7 = 8; + required uint64 r8 = 9; + required uint64 r9 = 10; + required uint64 r10 = 11; + required uint64 r11 = 12; + required uint64 r12 = 13; + required uint64 r13 = 14; + required uint64 r14 = 15; + required uint64 r15 = 16; + required uint64 r16 = 17; + required uint64 r17 = 18; + required uint64 r18 = 19; + required uint64 r19 = 20; + required uint64 r20 = 21; + required uint64 r21 = 22; + required uint64 r22 = 23; + required uint64 r23 = 24; + required uint64 r24 = 25; + required uint64 r25 = 26; + required uint64 r26 = 27; + required uint64 r27 = 28; + required uint64 r28 = 29; + required uint64 r29 = 30; + required uint64 r30 = 31; + required uint64 r31 = 32; + required uint64 lo = 33; + required uint64 hi = 34; + required uint32 fpu_fcr31 = 35; + required uint32 fpu_id = 36; +} + +message thread_info_mips { + required uint64 clear_tid_addr = 1[(criu).hex = true]; + required uint64 tls = 2; + required user_mips_regs_entry gpregs = 3[(criu).hex = true]; + required user_mips_fpregs_entry fpregs = 4[(criu).hex = true]; +} diff --git a/images/core.proto b/images/core.proto index 22c2a9f1f..9e9e39388 100644 --- a/images/core.proto +++ b/images/core.proto @@ -5,6 +5,7 @@ import "core-arm.proto"; import "core-aarch64.proto"; import "core-ppc64.proto"; import "core-s390.proto"; +import "core-mips.proto"; import "rlimit.proto"; import "timer.proto"; @@ -55,6 +56,7 @@ message task_core_entry { optional bool child_subreaper = 18; // Reserved for container relative start time //optional uint64 start_time = 19; + optional uint64 blk_sigset_extended = 20[(criu).hex = true]; } message task_kobj_ids_entry { @@ -96,6 +98,7 @@ message thread_core_entry { optional uint32 seccomp_filter = 12; optional string comm = 13; + optional uint64 blk_sigset_extended = 14; } message task_rlimits_entry { @@ -110,6 +113,7 @@ message core_entry { AARCH64 = 3; PPC64 = 4; S390 = 5; + MIPS = 6; } required march mtype = 1; @@ -118,6 +122,7 @@ message core_entry { optional thread_info_aarch64 ti_aarch64 = 8; optional thread_info_ppc64 ti_ppc64 = 9; optional thread_info_s390 ti_s390 = 10; + optional thread_info_mips ti_mips = 11; optional task_core_entry tc = 3; optional task_kobj_ids_entry ids = 4; diff --git a/images/sa.proto b/images/sa.proto index 3bce0c4ff..07fd4ffd3 100644 --- a/images/sa.proto +++ b/images/sa.proto @@ -8,4 +8,5 @@ message sa_entry { required uint64 restorer = 3 [(criu).hex = true]; required uint64 mask = 4 [(criu).hex = true]; optional bool compat_sigaction = 5; + optional uint64 mask_extended = 6 [(criu).hex = true]; }