cr: deal with UTS stuff (struct uts_namespace)
PATCH 20/30 cr: deal with UTS stuff (struct uts_namespace)
Signed-off-by Alexey Dobriyan <[email protected]>
---
include/linux/cr.h | 14 +++++ kernel/cr/Kconfig | 1 kernel/cr/Makefile | 1 kernel/cr/cpt-sys.c | 6 ++ kernel/cr/cr-nsproxy.c | 21 +++++++- kernel/cr/cr-uts.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++ kernel/cr/cr.h | 4 + 7 files changed, 167 insertions(+), 3 deletions(-)
include/linux/cr.h +14 -0
@@ -36,6 +36,7 @@ struct cr_object_header {#define CR_OBJ_VMA_CONTENT 5#define CR_OBJ_VMA_VDSO 6#define CR_OBJ_NSPROXY 7 +#define CR_OBJ_UTS_NS 8__u32 cr_type;/* object type */ __u32 cr_len;/* object length in bytes including header */ } __packed;
@@ -150,6 +151,19 @@ struct cr_image_arch_x86_64 {struct cr_image_nsproxy {struct cr_object_header cr_hdr; + +cr_pos_t cr_pos_uts_ns; +} __packed; + +struct cr_image_uts_ns { +struct cr_object_header cr_hdr; + +__u8 cr_sysname[64 ]; +__u8 cr_nodename[64 ]; +__u8 cr_release[64 ]; +__u8 cr_version[64 ]; +__u8 cr_machine[64 ]; +__u8 cr_domainname[64 ]; } __packed;struct cr_image_mm_struct {
kernel/cr/Kconfig +1 -0
@@ -1,5 +1,6 @@ config CR bool "Container checkpoint/restart" + depends on UTS_NS select FREEZER help Container checkpoint/restart.
kernel/cr/Makefile +1 -0
@@ -5,5 +5,6 @@ cr-y += cr-file.o cr-y += cr-mm.o cr-y += cr-nsproxy.o cr-y += cr-task.o +cr-y += cr-uts.o cr-$(CONFIG_X86_32) += cr-x86_32.o cr-$(CONFIG_X86_64) += cr-x86_64.o
kernel/cr/cpt-sys.c +6 -0
@@ -68,6 +68,9 @@ static int cr_collect(struct cr_context *ctx) rv =cr_collect_all_nsproxy (ctx);if (rv <0 )return rv; + rv =cr_collect_all_uts_ns (ctx); +if (rv <0 ) +return rv; rv =cr_collect_all_mm_struct (ctx);if (rv <0 )return rv;
@@ -110,6 +113,9 @@ static int cr_dump(struct cr_context *ctx) rv =cr_dump_all_file (ctx);if (rv <0 )return rv; + rv =cr_dump_all_uts_ns (ctx); +if (rv <0 ) +return rv; rv =cr_dump_all_mm_struct (ctx);if (rv <0 )return rv;
kernel/cr/cr-nsproxy.c +18 -3
@@ -48,6 +48,7 @@ static int cr_dump_nsproxy(struct cr_context *ctx, struct cr_object *obj) {struct nsproxy *nsproxy = obj->o_obj;struct cr_image_nsproxy *i; +struct cr_object *tmp;int rv;printk ("dump nsproxy %p\n" , nsproxy);
@@ -56,6 +57,9 @@ static int cr_dump_nsproxy(struct cr_context *ctx, struct cr_object *obj)if (!i)return -ENOMEM ; + tmp =cr_find_obj_by_ptr (ctx, nsproxy->uts_ns,CR_CTX_UTS_NS ); + i->cr_pos_uts_ns = tmp->o_pos; + obj->o_pos = ctx->cr_dump_file->f_pos; rv =cr_write (ctx, i,sizeof (*i));kfree (i);
@@ -79,7 +83,8 @@ static int __cr_restore_nsproxy(struct cr_context *ctx, loff_t pos) {struct cr_image_nsproxy *i;struct nsproxy *nsproxy; -struct cr_object *obj; +struct uts_namespace *uts_ns; +struct cr_object *obj, *tmp;int rv; i =kzalloc (sizeof (*i),GFP_KERNEL );
@@ -101,8 +106,18 @@ static int __cr_restore_nsproxy(struct cr_context *ctx, loff_t pos)return -ENOMEM ; } -get_uts_ns (&init_uts_ns); - nsproxy->uts_ns = &init_uts_ns; + tmp =cr_find_obj_by_pos (ctx, i->cr_pos_uts_ns,CR_CTX_UTS_NS ); +if (!tmp) { + rv =cr_restore_uts_ns (ctx, i->cr_pos_uts_ns); +if (rv <0 ) { +kfree (i); +return rv; + } + tmp =cr_find_obj_by_pos (ctx, i->cr_pos_uts_ns,CR_CTX_UTS_NS ); + } + uts_ns = tmp->o_obj; +get_uts_ns (uts_ns); + nsproxy->uts_ns = uts_ns;#ifdef CONFIG_SYSVIPC get_ipc_ns (&init_ipc_ns);
new file mode 100644
kernel/cr/cr-uts.c new file +123 -0
123 lines not on this page · raw message
kernel/cr/cr.h +4 -0
@@ -26,6 +26,7 @@ enum cr_context_obj_type {CR_CTX_MM_STRUCT ,CR_CTX_NSPROXY ,CR_CTX_TASK_STRUCT , +CR_CTX_UTS_NS , NR_CR_CTX_TYPES };
@@ -71,16 +72,19 @@ int cr_collect_all_file(struct cr_context *ctx);int cr_collect_all_mm_struct (struct cr_context *ctx);int cr_collect_all_nsproxy (struct cr_context *ctx);int cr_collect_all_task_struct (struct cr_context *ctx); +int cr_collect_all_uts_ns (struct cr_context *ctx);int cr_dump_all_file (struct cr_context *ctx);int cr_dump_all_mm_struct (struct cr_context *ctx);int cr_dump_all_nsproxy (struct cr_context *ctx);int cr_dump_all_task_struct (struct cr_context *ctx); +int cr_dump_all_uts_ns (struct cr_context *ctx);int cr_restore_file (struct cr_context *ctx,loff_t pos);int cr_restore_mm_struct (struct cr_context *ctx,loff_t pos);int cr_restore_nsproxy (struct cr_context *ctx,loff_t pos);int cr_restore_task_struct (struct cr_context *ctx,loff_t pos); +int cr_restore_uts_ns (struct cr_context *ctx,loff_t pos);#if defined(CONFIG_X86_32 ) || defined(CONFIG_X86_64 )__u32 cr_image_header_arch (void );