From: Andrey Mirkin <major@openvz.org>
To: containers@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Cc: Pavel Emelyanov <xemul@openvz.org>, Andrey Mirkin <major@openvz.org>
Subject: [PATCH 07/10] Introduce function for restarting a container
Date: Sat, 18 Oct 2008 03:11:35 +0400 [thread overview]
Message-ID: <1224285098-573-8-git-send-email-major@openvz.org> (raw)
In-Reply-To: <1224285098-573-7-git-send-email-major@openvz.org>
Actually, right now this function will restart only one process.
Function to read head of dump file is introduced.
Signed-off-by: Andrey Mirkin <major@openvz.org>
---
checkpoint/Makefile | 2 +-
checkpoint/checkpoint.h | 1 +
checkpoint/restart.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++
checkpoint/sys.c | 2 +-
4 files changed, 90 insertions(+), 2 deletions(-)
create mode 100644 checkpoint/restart.c
diff --git a/checkpoint/Makefile b/checkpoint/Makefile
index bbb0e37..47c7852 100644
--- a/checkpoint/Makefile
+++ b/checkpoint/Makefile
@@ -2,4 +2,4 @@ obj-y += sys_core.o
obj-$(CONFIG_CHECKPOINT) += cptrst.o
-cptrst-objs := sys.o checkpoint.o cpt_process.o cpt_mm.o
+cptrst-objs := sys.o checkpoint.o cpt_process.o cpt_mm.o restart.o
diff --git a/checkpoint/checkpoint.h b/checkpoint/checkpoint.h
index e3e6b66..0608bb9 100644
--- a/checkpoint/checkpoint.h
+++ b/checkpoint/checkpoint.h
@@ -62,3 +62,4 @@ extern int debug_level;
int dump_container(struct cpt_context *ctx);
int cpt_dump_task(struct task_struct *tsk, struct cpt_context *ctx);
int cpt_dump_mm(struct task_struct *tsk, struct cpt_context *ctx);
+int restart_container(struct cpt_context *ctx);
diff --git a/checkpoint/restart.c b/checkpoint/restart.c
new file mode 100644
index 0000000..acfcadb
--- /dev/null
+++ b/checkpoint/restart.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2008 Parallels, Inc.
+ *
+ * Author: Andrey Mirkin <major@openvz.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ */
+
+#include <linux/sched.h>
+#include <linux/fs.h>
+#include <linux/file.h>
+#include <linux/version.h>
+
+#include "checkpoint.h"
+#include "cpt_image.h"
+
+int rst_get_object(int type, void *tmp, int size, struct cpt_context *ctx)
+{
+ int err;
+ struct cpt_object_hdr *hdr = tmp;
+ err = ctx->read(hdr, sizeof(struct cpt_object_hdr), ctx);
+ if (err)
+ return err;
+ if (type > 0 && type != hdr->cpt_type)
+ return -EINVAL;
+ if (hdr->cpt_hdrlen < sizeof(struct cpt_object_hdr))
+ return -EINVAL;
+ if (size < sizeof(struct cpt_object_hdr))
+ return -EINVAL;
+ if (hdr->cpt_len < hdr->cpt_hdrlen)
+ return -EINVAL;
+ if (size > hdr->cpt_hdrlen)
+ size = hdr->cpt_hdrlen;
+ if (size > sizeof(*hdr))
+ err = ctx->read(hdr + 1, size - sizeof(*hdr), ctx);
+ return err;
+}
+
+static int rst_read_head(struct cpt_context *ctx)
+{
+ struct cpt_head hdr;
+ int err;
+
+ err = -EBADF;
+ if (!ctx->file)
+ return err;
+
+ err = ctx->read(&hdr, sizeof(hdr), ctx);
+ if (err < 0)
+ return err;
+
+ if (hdr.cpt_signature[0] != CPT_SIGNATURE0 ||
+ hdr.cpt_signature[1] != CPT_SIGNATURE1 ||
+ hdr.cpt_signature[2] != CPT_SIGNATURE2 ||
+ hdr.cpt_signature[3] != CPT_SIGNATURE3) {
+ return -EINVAL;
+ }
+ if (KERNEL_VERSION(hdr.cpt_image_major, hdr.cpt_image_minor,
+ hdr.cpt_image_sublevel) != LINUX_VERSION_CODE)
+ return -EINVAL;
+
+#if defined(CONFIG_X86_32)
+ if (hdr.cpt_arch != CPT_ARCH_I386)
+ return -ENOSYS;
+#else
+#error Arch is not supported
+#endif
+
+ return 0;
+}
+
+int restart_container(struct cpt_context *ctx)
+{
+ int err;
+
+ err = rst_read_head(ctx);
+
+ /* Restart process */
+ if (!err)
+ err = -ENOSYS;
+
+ return err;
+}
diff --git a/checkpoint/sys.c b/checkpoint/sys.c
index 1902fef..b92312a 100644
--- a/checkpoint/sys.c
+++ b/checkpoint/sys.c
@@ -140,7 +140,7 @@ static int restart(int ctid, int fd, unsigned long flags)
ctx->ctx_state = CPT_CTX_UNDUMPING;
/* restart */
- err = -ENOSYS;
+ err = restart_container(ctx);
context_put(ctx);
--
1.5.6
next prev parent reply other threads:[~2008-10-17 23:13 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-17 23:11 [PATCH 0/10] OpenVZ kernel based checkpointing/restart (v2) Andrey Mirkin
2008-10-17 23:11 ` [PATCH 01/10] Introduce trivial sys_checkpoint and sys_restore system calls Andrey Mirkin
2008-10-17 23:11 ` [PATCH 02/10] Make checkpoint/restart functionality modular Andrey Mirkin
2008-10-17 23:11 ` [PATCH 03/10] Introduce context structure needed during checkpointing/restart Andrey Mirkin
2008-10-17 23:11 ` [PATCH 04/10] Introduce container dump function Andrey Mirkin
2008-10-17 23:11 ` [PATCH 05/10] Introduce function to dump process Andrey Mirkin
2008-10-17 23:11 ` [PATCH 06/10] Introduce functions to dump mm Andrey Mirkin
2008-10-17 23:11 ` Andrey Mirkin [this message]
2008-10-17 23:11 ` [PATCH 08/10] Introduce functions to restart a process Andrey Mirkin
2008-10-17 23:11 ` [PATCH 09/10] Introduce functions to restore mm Andrey Mirkin
2008-10-17 23:11 ` [PATCH 10/10] Add support for multiple processes Andrey Mirkin
2008-10-27 15:58 ` Oren Laadan
2008-10-30 4:55 ` [Devel] " Andrey Mirkin
2008-10-20 9:23 ` [PATCH 08/10] Introduce functions to restart a process Cedric Le Goater
2008-10-22 8:49 ` [Devel] " Andrey Mirkin
2008-10-22 9:25 ` Louis Rilling
2008-10-22 10:06 ` Greg Kurz
2008-10-22 10:44 ` Louis Rilling
2008-10-22 12:44 ` Greg Kurz
2008-10-22 10:12 ` Andrey Mirkin
2008-10-22 10:46 ` Louis Rilling
2008-10-23 8:53 ` Andrey Mirkin
2008-10-22 15:25 ` Oren Laadan
2008-10-23 9:00 ` Andrey Mirkin
2008-10-23 13:57 ` Dave Hansen
2008-10-24 3:57 ` Andrey Mirkin
2008-10-25 21:10 ` Oren Laadan
2008-10-29 14:52 ` Andrey Mirkin
2008-10-30 15:59 ` Oren Laadan
2008-10-22 12:47 ` Cedric Le Goater
2008-10-23 9:54 ` Andrey Mirkin
2008-10-23 13:49 ` Dave Hansen
2008-10-24 4:04 ` Andrey Mirkin
2008-10-20 13:25 ` Louis Rilling
2008-10-23 10:56 ` [Devel] " Andrey Mirkin
2008-10-20 12:25 ` [PATCH 06/10] Introduce functions to dump mm Louis Rilling
2008-10-22 8:58 ` [Devel] " Andrey Mirkin
2008-10-20 17:21 ` Dave Hansen
2008-10-23 8:43 ` [Devel] " Andrey Mirkin
2008-10-23 13:51 ` Dave Hansen
2008-10-24 4:07 ` Andrey Mirkin
2008-10-20 11:02 ` [PATCH 05/10] Introduce function to dump process Louis Rilling
2008-10-24 4:15 ` [Devel] " Andrey Mirkin
2008-10-20 17:48 ` Serge E. Hallyn
2008-10-24 4:40 ` [Devel] " Andrey Mirkin
2008-10-20 17:02 ` [PATCH 03/10] Introduce context structure needed during checkpointing/restart Dave Hansen
2008-10-29 15:30 ` [Devel] " Andrey Mirkin
2008-10-20 16:51 ` [PATCH 02/10] Make checkpoint/restart functionality modular Dave Hansen
2008-10-20 16:59 ` Serge E. Hallyn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1224285098-573-8-git-send-email-major@openvz.org \
--to=major@openvz.org \
--cc=containers@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xemul@openvz.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome