Skip to contentSkip to conversation

cr: ipc_ns

PATCH In review Alexey Dobriyan 1 participant 1 message Apr 10, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 30/30 cr: ipc_ns

Create/restore ipc_ns as an object, restore sysctl values.

FIXME: restoration of sysctls is buggy as-is, values should be written
at the very last moment
FIXME: actual restoration of IPC objects.

---

 include/linux/cr.h     |   14 +++++
 kernel/cr/Kconfig      |    1 
 kernel/cr/Makefile     |    1 
 kernel/cr/cpt-sys.c    |    6 ++
 kernel/cr/cr-ipc.c     |  132 +++++++++++++++++++++++++++++++++++++++++++++++++
 kernel/cr/cr-nsproxy.c |    6 ++
 kernel/cr/cr.h         |   27 ++++++++++
 7 files changed, 187 insertions(+)
include/linux/cr.h +14 -0
@@ -52,6 +52,7 @@ struct cr_object_header {
 #define CR_OBJ_NET_NS		21
 #define CR_OBJ_SOCK		22
 #define CR_OBJ_TTY		23
+#define CR_OBJ_IPC_NS		24
 	__u32	cr_type;	/* object type */
 	__u32	cr_len;		/* object length in bytes including header */
 } __packed;
@@ -180,6 +181,7 @@ struct cr_image_nsproxy {
 	struct cr_object_header cr_hdr;
 
 	cr_pos_t	cr_pos_uts_ns;
+	cr_pos_t	cr_pos_ipc_ns;	/* CR_POS_UNDEF if CONFIG_SYSVIPC=n */
 	cr_pos_t	cr_pos_mnt_ns;
 	cr_pos_t	cr_pos_pid_ns;
 	cr_pos_t	cr_pos_net_ns;	/* CR_POS_UNDEF if CONFIG_NET=n */
@@ -418,4 +420,16 @@ struct cr_image_tty {
 	__u8		cr_low_latency;
 	__u8		cr_ctrl_status;
 } __packed;
+
+struct cr_image_ipc_ns {
+	struct cr_object_header cr_hdr;
+
+	__u32		cr_sem_ctls[4];
+	__u32		cr_msg_ctlmax;
+	__u32		cr_msg_ctlmnb;
+	__u32		cr_msg_ctlmni;
+	__u64		cr_shm_ctlmax;
+	__u64		cr_shm_ctlall;
+	__u32		cr_shm_ctlmni;
+} __packed;
 #endif
kernel/cr/Kconfig +1 -0
@@ -1,6 +1,7 @@
 config CR
 	bool "Container checkpoint/restart"
 	depends on DEVPTS_MULTIPLE_INSTANCES
+	depends on IPC_NS || (SYSVIPC = n)
 	depends on NET_NS || (NET = n)
 	depends on PID_NS
 	depends on USER_NS
kernel/cr/Makefile +1 -0
@@ -4,6 +4,7 @@ cr-y += cr-context.o
 cr-y += cr-cred.o
 cr-y += cr-file.o
 cr-y += cr-fs.o
+cr-y += cr-ipc.o
 cr-y += cr-mm.o
 cr-y += cr-mnt.o
 cr-$(CONFIG_NET) += cr-net.o
kernel/cr/cpt-sys.c +6 -0
@@ -71,6 +71,9 @@ static int cr_collect(struct cr_context *ctx)
 	rv = cr_collect_all_uts_ns(ctx);
 	if (rv < 0)
 		return rv;
+	rv = cr_collect_all_ipc_ns(ctx);
+	if (rv < 0)
+		return rv;
 	rv = cr_collect_all_mnt_ns(ctx);
 	if (rv < 0)
 		return rv;
@@ -194,6 +197,9 @@ static int cr_dump(struct cr_context *ctx)
 	rv = cr_dump_all_sock(ctx);
 	if (rv < 0)
 		return rv;
+	rv = cr_dump_all_ipc_ns(ctx);
+	if (rv < 0)
+		return rv;
 	rv = cr_dump_all_sighand_struct(ctx);
 	if (rv < 0)
 		return rv;

new file mode 100644

kernel/cr/cr-ipc.c new file +132 -0

132 lines not on this page · raw message

kernel/cr/cr-nsproxy.c +6 -0
@@ -59,6 +59,12 @@ static int cr_dump_nsproxy(struct cr_context *ctx, struct cr_object *obj)
 
 	tmp = cr_find_obj_by_ptr(ctx, nsproxy->uts_ns, CR_CTX_UTS_NS);
 	i->cr_pos_uts_ns = tmp->o_pos;
+#ifdef CONFIG_SYSVIPC
+	tmp = cr_find_obj_by_ptr(ctx, nsproxy->ipc_ns, CR_CTX_IPC_NS);
+	i->cr_pos_ipc_ns = tmp->o_pos;
+#else
+	i->cr_pos = CR_POS_UNDEF;
+#endif
 	tmp = cr_find_obj_by_ptr(ctx, nsproxy->mnt_ns, CR_CTX_MNT_NS);
 	i->cr_pos_mnt_ns = tmp->o_pos;
 	tmp = cr_find_obj_by_ptr(ctx, nsproxy->pid_ns, CR_CTX_PID_NS);
kernel/cr/cr.h +27 -0
@@ -28,6 +28,9 @@ enum cr_context_obj_type {
 	CR_CTX_FILES_STRUCT,
 	CR_CTX_FS_STRUCT,
 	CR_CTX_GROUP_INFO,
+#ifdef CONFIG_SYSVIPC
+	CR_CTX_IPC_NS,
+#endif
 	CR_CTX_MM_STRUCT,
 	CR_CTX_MNT_NS,
 #ifdef CONFIG_NET
@@ -103,6 +106,14 @@ int cr_collect_all_files_struct(struct cr_context *ctx);
 int cr_collect_all_file(struct cr_context *ctx);
 int cr_collect_all_fs_struct(struct cr_context *ctx);
 int cr_collect_all_group_info(struct cr_context *ctx);
+#ifdef CONFIG_SYSVIPC
+int cr_collect_all_ipc_ns(struct cr_context *ctx);
+#else
+static inline int cr_collect_all_ipc_ns(struct cr_context *ctx)
+{
+	return 0;
+}
+#endif
 int cr_collect_all_mm_struct(struct cr_context *ctx);
 int cr_collect_all_mnt_ns(struct cr_context *ctx);
 #ifdef CONFIG_NET
@@ -137,6 +148,14 @@ int cr_dump_all_files_struct(struct cr_context *ctx);
 int cr_dump_all_file(struct cr_context *ctx);
 int cr_dump_all_fs_struct(struct cr_context *ctx);
 int cr_dump_all_group_info(struct cr_context *ctx);
+#ifdef CONFIG_SYSVIPC
+int cr_dump_all_ipc_ns(struct cr_context *ctx);
+#else
+static inline int cr_dump_all_ipc_ns(struct cr_context *ctx)
+{
+	return 0;
+}
+#endif
 int cr_dump_all_mm_struct(struct cr_context *ctx);
 int cr_dump_all_mnt_ns(struct cr_context *ctx);
 #ifdef CONFIG_NET
@@ -171,6 +190,14 @@ int cr_restore_files_struct(struct cr_context *ctx, loff_t pos);
 int cr_restore_file(struct cr_context *ctx, loff_t pos);
 int cr_restore_fs_struct(struct cr_context *ctx, loff_t pos);
 int cr_restore_group_info(struct cr_context *ctx, loff_t pos);
+#ifdef CONFIG_SYSVIPC
+int cr_restore_ipc_ns(struct cr_context *ctx, loff_t pos);
+#else
+static inline int cr_restore_ipc_ns(struct cr_context *ctx, loff_t pos)
+{
+	return 0;
+}
+#endif
 int cr_restore_mm_struct(struct cr_context *ctx, loff_t pos);
 int cr_restore_mnt_ns(struct cr_context *ctx, loff_t pos);
 #ifdef CONFIG_NET