From: Andrey Mirkin <major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
To: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Andrey Mirkin <major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>,
Pavel Emelyanov <xemul-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
Subject: [PATCH 03/10] Introduce context structure needed during checkpointing/restart
Date: Sat, 18 Oct 2008 03:11:31 +0400 [thread overview]
Message-ID: <1224285098-573-4-git-send-email-major@openvz.org> (raw)
In-Reply-To: <1224285098-573-3-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
Add functions for context allocation/destroy.
Introduce functions to read/write image.
Introduce image header and object header.
Signed-off-by: Andrey Mirkin <major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
---
checkpoint/checkpoint.h | 40 +++++++++++++++
checkpoint/cpt_image.h | 63 ++++++++++++++++++++++++
checkpoint/sys.c | 125 +++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 225 insertions(+), 3 deletions(-)
create mode 100644 checkpoint/cpt_image.h
diff --git a/checkpoint/checkpoint.h b/checkpoint/checkpoint.h
index 381a9bf..8ea73f5 100644
--- a/checkpoint/checkpoint.h
+++ b/checkpoint/checkpoint.h
@@ -10,6 +10,8 @@
*
*/
+#include "cpt_image.h"
+
struct cpt_operations
{
struct module * owner;
@@ -17,3 +19,41 @@ struct cpt_operations
int (*restart)(int ctid, int fd, unsigned long flags);
};
extern struct cpt_operations cpt_ops;
+
+enum cpt_ctx_state
+{
+ CPT_CTX_ERROR = -1,
+ CPT_CTX_IDLE = 0,
+ CPT_CTX_DUMPING,
+ CPT_CTX_UNDUMPING
+};
+
+typedef struct cpt_context
+{
+ pid_t pid; /* should be changed to ctid later */
+ int ctx_id; /* context id */
+ struct list_head ctx_list;
+ int refcount;
+ int ctx_state;
+ struct semaphore main_sem;
+
+ int errno;
+
+ struct file *file;
+ loff_t current_object;
+
+ struct list_head object_array[CPT_OBJ_MAX];
+
+ int (*write)(const void *addr, size_t count, struct cpt_context *ctx);
+ int (*read)(void *addr, size_t count, struct cpt_context *ctx);
+} cpt_context_t;
+
+extern int debug_level;
+
+#define cpt_printk(lvl, fmt, args...) do { \
+ if (lvl <= debug_level) \
+ printk(fmt, ##args); \
+ } while (0)
+
+#define eprintk(a...) cpt_printk(1, "CPT ERR: " a)
+#define dprintk(a...) cpt_printk(1, "CPT DBG: " a)
diff --git a/checkpoint/cpt_image.h b/checkpoint/cpt_image.h
new file mode 100644
index 0000000..0338dd0
--- /dev/null
+++ b/checkpoint/cpt_image.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008 Parallels, Inc.
+ *
+ * Author: Andrey Mirkin <major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.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.
+ *
+ */
+
+#ifndef __CPT_IMAGE_H_
+#define __CPT_IMAGE_H_ 1
+
+enum _cpt_object_type
+{
+ CPT_OBJ_TASK = 0,
+ CPT_OBJ_MAX,
+ /* The objects above are stored in memory while checkpointing */
+
+ CPT_OBJ_HEAD = 1024,
+};
+
+enum _cpt_content_type {
+ CPT_CONTENT_VOID,
+ CPT_CONTENT_ARRAY,
+ CPT_CONTENT_DATA,
+ CPT_CONTENT_NAME,
+ CPT_CONTENT_REF,
+ CPT_CONTENT_MAX
+};
+
+#define CPT_SIGNATURE0 0x79
+#define CPT_SIGNATURE1 0x1c
+#define CPT_SIGNATURE2 0x01
+#define CPT_SIGNATURE3 0x63
+
+struct cpt_head
+{
+ __u8 cpt_signature[4]; /* Magic number */
+ __u32 cpt_hdrlen; /* Header length */
+ __u16 cpt_image_major; /* Format of this file */
+ __u16 cpt_image_minor; /* Format of this file */
+ __u16 cpt_image_sublevel; /* Format of this file */
+ __u16 cpt_image_extra; /* Format of this file */
+ __u16 cpt_arch; /* Architecture */
+#define CPT_ARCH_I386 0
+ __u16 cpt_pad1;
+ __u32 cpt_pad2;
+ __u64 cpt_time; /* Time */
+} __attribute__ ((aligned (8)));
+
+/* Common object header. */
+struct cpt_object_hdr
+{
+ __u64 cpt_len; /* Size of current chunk of data */
+ __u32 cpt_hdrlen; /* Size of header */
+ __u16 cpt_type; /* Type of object */
+ __u16 cpt_content; /* Content type: array, reference... */
+} __attribute__ ((aligned (8)));
+
+#endif /* __CPT_IMAGE_H_ */
diff --git a/checkpoint/sys.c b/checkpoint/sys.c
index 010e4eb..a561a06 100644
--- a/checkpoint/sys.c
+++ b/checkpoint/sys.c
@@ -13,21 +13,140 @@
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/file.h>
-#include <linux/notifier.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include "checkpoint.h"
+#include "cpt_image.h"
MODULE_LICENSE("GPL");
+/* Debug level, constant for now */
+int debug_level = 1;
+
+static int file_write(const void *addr, size_t count, struct cpt_context *ctx)
+{
+ mm_segment_t oldfs;
+ ssize_t err = -EBADF;
+ struct file *file = ctx->file;
+
+ oldfs = get_fs(); set_fs(KERNEL_DS);
+ if (file)
+ err = file->f_op->write(file, addr, count, &file->f_pos);
+ set_fs(oldfs);
+ if (err != count)
+ return err >= 0 ? -EIO : err;
+ return 0;
+}
+
+static int file_read(void *addr, size_t count, struct cpt_context *ctx)
+{
+ mm_segment_t oldfs;
+ ssize_t err = -EBADF;
+ struct file *file = ctx->file;
+
+ oldfs = get_fs(); set_fs(KERNEL_DS);
+ if (file)
+ err = file->f_op->read(file, addr, count, &file->f_pos);
+ set_fs(oldfs);
+ if (err != count)
+ return err >= 0 ? -EIO : err;
+ return 0;
+}
+
+struct cpt_context * context_alloc(void)
+{
+ struct cpt_context *ctx;
+ int i;
+
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+ if (!ctx)
+ return NULL;
+
+ init_MUTEX(&ctx->main_sem);
+ ctx->refcount = 1;
+
+ ctx->current_object = -1;
+ ctx->write = file_write;
+ ctx->read = file_read;
+ for (i = 0; i < CPT_OBJ_MAX; i++) {
+ INIT_LIST_HEAD(&ctx->object_array[i]);
+ }
+
+ return ctx;
+}
+
+void context_release(struct cpt_context *ctx)
+{
+ ctx->ctx_state = CPT_CTX_ERROR;
+
+ kfree(ctx);
+}
+
+static void context_put(struct cpt_context *ctx)
+{
+ if (!--ctx->refcount)
+ context_release(ctx);
+}
+
static int checkpoint(pid_t pid, int fd, unsigned long flags)
{
- return -ENOSYS;
+ struct file *file;
+ struct cpt_context *ctx;
+ int err;
+
+ err = -EBADF;
+ file = fget(fd);
+ if (!file)
+ goto out;
+
+ err = -ENOMEM;
+ ctx = context_alloc();
+ if (!ctx)
+ goto out_file;
+
+ ctx->file = file;
+ ctx->ctx_state = CPT_CTX_DUMPING;
+
+ /* checkpoint */
+ err = -ENOSYS;
+
+ context_put(ctx);
+
+out_file:
+ fput(file);
+out:
+ return err;
}
static int restart(int ctid, int fd, unsigned long flags)
{
- return -ENOSYS;
+ struct file *file;
+ struct cpt_context *ctx;
+ int err;
+
+ err = -EBADF;
+ file = fget(fd);
+ if (!file)
+ goto out;
+
+ err = -ENOMEM;
+ ctx = context_alloc();
+ if (!ctx)
+ goto out_file;
+
+ ctx->file = file;
+ ctx->ctx_state = CPT_CTX_UNDUMPING;
+
+ /* restart */
+ err = -ENOSYS;
+
+ context_put(ctx);
+
+out_file:
+ fput(file);
+out:
+ return err;
}
static int __init init_cptrst(void)
--
1.5.6
next prev parent reply other threads:[~2008-10-17 23:11 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
[not found] ` <1224285098-573-1-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 01/10] Introduce trivial sys_checkpoint and sys_restore system calls Andrey Mirkin
[not found] ` <1224285098-573-2-git-send-email-major@openvz.org>
[not found] ` <1224285098-573-2-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 02/10] Make checkpoint/restart functionality modular Andrey Mirkin
[not found] ` <1224285098-573-3-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` Andrey Mirkin [this message]
[not found] ` <1224285098-573-4-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 04/10] Introduce container dump function Andrey Mirkin
[not found] ` <1224285098-573-5-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 05/10] Introduce function to dump process Andrey Mirkin
[not found] ` <1224285098-573-6-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 06/10] Introduce functions to dump mm Andrey Mirkin
[not found] ` <1224285098-573-7-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 07/10] Introduce function for restarting a container Andrey Mirkin
[not found] ` <1224285098-573-8-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 08/10] Introduce functions to restart a process Andrey Mirkin
[not found] ` <1224285098-573-9-git-send-email-major@openvz.org>
[not found] ` <1224285098-573-10-git-send-email-major@openvz.org>
[not found] ` <1224285098-573-10-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 10/10] Add support for multiple processes Andrey Mirkin
[not found] ` <1224285098-573-11-git-send-email-major@openvz.org>
[not found] ` <1224285098-573-11-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-27 15:58 ` Oren Laadan
[not found] ` <4905E50C.8020803@cs.columbia.edu>
[not found] ` <4905E50C.8020803-eQaUEPhvms7ENvBUuze7eA@public.gmane.org>
2008-10-30 4:55 ` [Devel] " Andrey Mirkin
[not found] ` <1224285098-573-9-git-send-email-major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-17 23:11 ` [PATCH 09/10] Introduce functions to restore mm Andrey Mirkin
2008-10-20 9:23 ` [PATCH 08/10] Introduce functions to restart a process Cedric Le Goater
[not found] ` <48FC4E0C.7050008-NmTC/0ZBporQT0dZR+AlfA@public.gmane.org>
2008-10-22 8:49 ` [Devel] " Andrey Mirkin
[not found] ` <200810221249.55600.major@openvz.org>
[not found] ` <200810221249.55600.major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-22 9:25 ` Louis Rilling
2008-10-22 12:47 ` Cedric Le Goater
[not found] ` <20081022092502.GW15171@hawkmoon.kerlabs.com>
[not found] ` <20081022092502.GW15171-Hu8+6S1rdjywhHL9vcZdMVaTQe2KTcn/@public.gmane.org>
2008-10-22 10:06 ` Greg Kurz
2008-10-22 10:12 ` Andrey Mirkin
[not found] ` <200810221412.14174.major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-22 10:46 ` Louis Rilling
2008-10-22 15:25 ` Oren Laadan
[not found] ` <48FF45CF.5000306-eQaUEPhvms7ENvBUuze7eA@public.gmane.org>
2008-10-23 9:00 ` Andrey Mirkin
[not found] ` <200810231300.50628.amirkin@parallels.com>
[not found] ` <200810231300.50628.amirkin-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org>
2008-10-23 13:57 ` Dave Hansen
[not found] ` <1224770277.12673.21.camel@nimitz>
2008-10-24 3:57 ` Andrey Mirkin
[not found] ` <200810240757.38012.major@openvz.org>
[not found] ` <200810240757.38012.major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-25 21:10 ` Oren Laadan
[not found] ` <49038B4C.2010009@cs.columbia.edu>
[not found] ` <49038B4C.2010009-eQaUEPhvms7ENvBUuze7eA@public.gmane.org>
2008-10-29 14:52 ` Andrey Mirkin
[not found] ` <200810291752.19281.major@openvz.org>
[not found] ` <200810291752.19281.major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-30 15:59 ` Oren Laadan
[not found] ` <20081022104630.GY15171@hawkmoon.kerlabs.com>
[not found] ` <20081022104630.GY15171-Hu8+6S1rdjywhHL9vcZdMVaTQe2KTcn/@public.gmane.org>
2008-10-23 8:53 ` Andrey Mirkin
[not found] ` <1224669979.4210.15.camel@localhost.localdomain>
[not found] ` <1224669979.4210.15.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2008-10-22 10:44 ` Louis Rilling
[not found] ` <20081022104448.GX15171@hawkmoon.kerlabs.com>
[not found] ` <20081022104448.GX15171-Hu8+6S1rdjywhHL9vcZdMVaTQe2KTcn/@public.gmane.org>
2008-10-22 12:44 ` Greg Kurz
[not found] ` <48FF20F6.1040505@fr.ibm.com>
[not found] ` <48FF20F6.1040505-NmTC/0ZBporQT0dZR+AlfA@public.gmane.org>
2008-10-23 9:54 ` Andrey Mirkin
[not found] ` <200810231354.47033.major@openvz.org>
[not found] ` <200810231354.47033.major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-23 13:49 ` Dave Hansen
[not found] ` <1224769753.12673.12.camel@nimitz>
2008-10-24 4:04 ` Andrey Mirkin
2008-10-20 13:25 ` Louis Rilling
[not found] ` <20081020132536.GS15171-Hu8+6S1rdjywhHL9vcZdMVaTQe2KTcn/@public.gmane.org>
2008-10-23 10:56 ` [Devel] " Andrey Mirkin
2008-10-20 12:25 ` [PATCH 06/10] Introduce functions to dump mm Louis Rilling
[not found] ` <20081020122514.GR15171-Hu8+6S1rdjywhHL9vcZdMVaTQe2KTcn/@public.gmane.org>
2008-10-22 8:58 ` [Devel] " Andrey Mirkin
2008-10-20 17:21 ` Dave Hansen
[not found] ` <1224523278.1848.123.camel@nimitz>
2008-10-23 8:43 ` [Devel] " Andrey Mirkin
[not found] ` <200810231243.42181.major@openvz.org>
[not found] ` <200810231243.42181.major-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-10-23 13:51 ` Dave Hansen
[not found] ` <1224769880.12673.15.camel@nimitz>
2008-10-24 4:07 ` Andrey Mirkin
2008-10-20 11:02 ` [PATCH 05/10] Introduce function to dump process Louis Rilling
2008-10-20 17:48 ` Serge E. Hallyn
[not found] ` <20081020110226.GP15171@hawkmoon.kerlabs.com>
[not found] ` <20081020110226.GP15171-Hu8+6S1rdjywhHL9vcZdMVaTQe2KTcn/@public.gmane.org>
2008-10-24 4:15 ` [Devel] " Andrey Mirkin
[not found] ` <20081020174801.GB29092@us.ibm.com>
[not found] ` <20081020174801.GB29092-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2008-10-24 4:40 ` 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-4-git-send-email-major@openvz.org \
--to=major-gefaqzzx7r8dnm+yrofe0a@public.gmane.org \
--cc=containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=xemul-GEFAQzZX7r8dnm+yROfE0A@public.gmane.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