mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrey Mirkin <major@openvz.org>
To: linux-kernel@vger.kernel.org
Cc: containers@lists.linux-foundation.org, Andrey Mirkin <major@openvz.org>
Subject: [PATCH 7/9] Introduce function for restarting a container
Date: Wed,  3 Sep 2008 14:57:54 +0400	[thread overview]
Message-ID: <1220439476-16465-8-git-send-email-major@openvz.org> (raw)
In-Reply-To: <1220439476-16465-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>
---
 cpt/Makefile  |    2 +-
 cpt/cpt.h     |    1 +
 cpt/restart.c |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 cpt/sys.c     |    2 +-
 4 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 cpt/restart.c

diff --git a/cpt/Makefile b/cpt/Makefile
index bbb0e37..47c7852 100644
--- a/cpt/Makefile
+++ b/cpt/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/cpt/cpt.h b/cpt/cpt.h
index 73ae296..6471246 100644
--- a/cpt/cpt.h
+++ b/cpt/cpt.h
@@ -59,3 +59,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/cpt/restart.c b/cpt/restart.c
new file mode 100644
index 0000000..5770985
--- /dev/null
+++ b/cpt/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 "cpt.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/cpt/sys.c b/cpt/sys.c
index 6801c22..5b453f2 100644
--- a/cpt/sys.c
+++ b/cpt/sys.c
@@ -142,7 +142,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


  reply	other threads:[~2008-09-03 10:57 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-03 10:57 [PATCH 0/9] OpenVZ kernel based checkpointing/restart Andrey Mirkin
2008-09-03 10:57 ` [PATCH 1/9] Introduce trivial sys_checkpoint and sys_restore system calls Andrey Mirkin
2008-09-03 10:57   ` [PATCH 2/9] Make checkpoint/restart functionality modular Andrey Mirkin
2008-09-03 10:57     ` [PATCH 3/9] Introduce context structure needed during checkpointing/restart Andrey Mirkin
2008-09-03 10:57       ` [PATCH 4/9] Introduce container dump function Andrey Mirkin
2008-09-03 10:57         ` [PATCH 5/9] Introduce function to dump process Andrey Mirkin
2008-09-03 10:57           ` [PATCH 6/9] Introduce functions to dump mm Andrey Mirkin
2008-09-03 10:57             ` Andrey Mirkin [this message]
2008-09-03 10:57               ` [PATCH 8/9] Introduce functions to restart a process Andrey Mirkin
2008-09-03 10:57                 ` [PATCH 9/9] Introduce functions to restore mm Andrey Mirkin
2008-09-03 14:32                 ` [PATCH 8/9] Introduce functions to restart a process Louis Rilling
2008-09-13 17:34                   ` Pavel Machek
2008-09-03 14:17             ` [PATCH 6/9] Introduce functions to dump mm Louis Rilling
2008-09-03 14:23         ` [PATCH 4/9] Introduce container dump function Serge E. Hallyn
2008-09-03 14:45           ` Andrey Mirkin
2008-09-03 12:29       ` [PATCH 3/9] Introduce context structure needed during checkpointing/restart Matthieu Fertré
2008-09-03 14:11         ` Andrey Mirkin
2008-09-03 13:56       ` Louis Rilling
2008-09-03 14:07         ` Andrey Mirkin
2008-09-03 14:13       ` Cedric Le Goater
2008-09-03 14:29         ` Andrey Mirkin
2008-09-03 14:27     ` [PATCH 2/9] Make checkpoint/restart functionality modular Serge E. Hallyn
2008-09-03 14:51       ` Andrey Mirkin
2008-09-03 11:44   ` [PATCH 1/9] Introduce trivial sys_checkpoint and sys_restore system calls Cedric Le Goater
2008-09-03 13:05     ` [Devel] " Andrey Mirkin
2008-09-03 12:28 ` [PATCH 0/9] OpenVZ kernel based checkpointing/restart Cedric Le Goater
2008-09-03 13:59   ` [Devel] " Andrey Mirkin
2008-09-04 22:55     ` Dave Hansen
2008-09-03 14:18   ` Serge E. Hallyn
2008-09-03 13:49 ` Louis Rilling
2008-09-03 14:06   ` Louis Rilling
2008-09-03 14:19     ` Andrey Mirkin
2008-09-03 14:26     ` Cedric Le Goater
2008-09-03 14:53       ` Andrey Mirkin
2008-09-04  8:14 ` Oren Laadan
2008-09-04 14:05 ` Dave Hansen
2008-10-17 23:33 ` Dave Hansen
2008-10-20 11:10   ` Louis Rilling
2008-10-20 13:25     ` Daniel Lezcano
2008-10-20 13:48       ` Cedric Le Goater
2008-10-20 13:49         ` Daniel Lezcano
2008-10-20 15:53       ` Oren Laadan
2008-10-20 16:37         ` Daniel Lezcano
2008-10-20 17:23           ` Serge E. Hallyn
2008-10-21  0:18             ` Oren Laadan
2008-10-21  0:58               ` Serge E. Hallyn
2008-10-21 13:24               ` Daniel Lezcano
2008-10-27 14:45           ` [Devel] " Andrey Mirkin
2008-10-20 16:51         ` Serge E. Hallyn
2008-10-21  9:36         ` Cedric Le Goater
2008-10-20 16:36     ` Dave Hansen
2008-10-20 12:14   ` [Devel] " Andrey Mirkin
2008-10-20 15:55     ` Dave Hansen
2008-10-27 14:07       ` Andrey Mirkin
2008-10-27 14:39         ` Oren Laadan
2008-10-30  6:02           ` Andrey Mirkin
2008-10-30 11:47             ` Louis Rilling
2008-10-30 17:08               ` Dave Hansen
2008-10-30 18:01                 ` Louis Rilling
2008-10-30 18:28                   ` Oren Laadan
2008-10-30 17:45               ` Oren Laadan
2008-10-30 18:14                 ` Louis Rilling
2008-10-30 18:32                   ` Oren Laadan
2008-10-31 10:37                     ` Louis Rilling
2008-10-30 14:08             ` Serge E. Hallyn
2008-10-30 17:03             ` Dave Hansen
2008-11-03 19:35         ` Oren Laadan
2008-10-20 17:17     ` Oren Laadan
2008-10-27 14:38       ` Andrey Mirkin

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=1220439476-16465-8-git-send-email-major@openvz.org \
    --to=major@openvz.org \
    --cc=containers@lists.linux-foundation.org \
    --cc=linux-kernel@vger.kernel.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