From: Dave Hansen <dave@linux.vnet.ibm.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: containers <containers@lists.linux-foundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Serge E. Hallyn" <serue@us.ibm.com>,
Oren Laadan <orenl@cs.columbia.edu>,
Alexey Dobriyan <adobriyan@gmail.com>,
hch@infradead.org, Dave Hansen <dave@linux.vnet.ibm.com>
Subject: [RFC][PATCH 8/8] check files for checkpointability
Date: Fri, 27 Feb 2009 12:34:35 -0800 [thread overview]
Message-ID: <20090227203435.98735E54@kernel> (raw)
In-Reply-To: <20090227203425.F3B51176@kernel>
Introduce a files_struct counter to indicate whether a particular
file_struct has ever contained a file which can not be
checkpointed. This flag is a one-way trip; once it is set, it may
not be unset.
We assume at allocation that a new files_struct is clean and may
be checkpointed. However, as soon as it has had its files filled
from its parent's, we check it for real in __scan_files_for_cr().
At that point, we mark it if it contained any uncheckpointable
files.
We also check each 'struct file' when it is installed in a fd
slot. This way, if anyone open()s or managed to dup() an
unsuppored file, we can catch it.
Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
---
linux-2.6.git-dave/fs/file.c | 19 +++++++++++++++++++
linux-2.6.git-dave/fs/open.c | 5 +++++
linux-2.6.git-dave/include/linux/checkpoint.h | 14 ++++++++++++++
linux-2.6.git-dave/include/linux/fdtable.h | 3 +++
4 files changed, 41 insertions(+)
diff -puN fs/file.c~track-files_struct-checkpointability fs/file.c
--- linux-2.6.git/fs/file.c~track-files_struct-checkpointability 2009-02-27 12:07:41.000000000 -0800
+++ linux-2.6.git-dave/fs/file.c 2009-02-27 12:07:41.000000000 -0800
@@ -15,6 +15,7 @@
#include <linux/file.h>
#include <linux/fdtable.h>
#include <linux/bitops.h>
+#include <linux/checkpoint.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -285,6 +286,20 @@ static int count_open_files(struct fdtab
return i;
}
+static void __scan_files_for_cr(struct files_struct *files)
+{
+ int i;
+
+ for (i = 0; i < files->fdtab.max_fds; i++) {
+ struct file *f = fcheck_files(files, i);
+ if (!f)
+ continue;
+ if (cr_file_supported(f))
+ continue;
+ files_deny_checkpointing(files);
+ }
+}
+
/*
* Allocate a new files structure and copy contents from the
* passed in files structure.
@@ -303,6 +318,9 @@ struct files_struct *dup_fd(struct files
goto out;
atomic_set(&newf->count, 1);
+#ifdef CONFIG_CHECKPOINT_RESTART
+ newf->may_checkpoint = 1;
+#endif
spin_lock_init(&newf->file_lock);
newf->next_fd = 0;
@@ -396,6 +414,7 @@ struct files_struct *dup_fd(struct files
rcu_assign_pointer(newf->fdt, new_fdt);
+ __scan_files_for_cr(newf);
return newf;
out_release:
diff -puN fs/open.c~track-files_struct-checkpointability fs/open.c
--- linux-2.6.git/fs/open.c~track-files_struct-checkpointability 2009-02-27 12:07:41.000000000 -0800
+++ linux-2.6.git-dave/fs/open.c 2009-02-27 12:07:41.000000000 -0800
@@ -29,6 +29,7 @@
#include <linux/rcupdate.h>
#include <linux/audit.h>
#include <linux/falloc.h>
+#include <linux/checkpoint.h>
int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
{
@@ -1015,6 +1016,10 @@ void fd_install(unsigned int fd, struct
{
struct files_struct *files = current->files;
struct fdtable *fdt;
+
+ if (!cr_file_supported(file))
+ files_deny_checkpointing(files);
+
spin_lock(&files->file_lock);
fdt = files_fdtable(files);
BUG_ON(fdt->fd[fd] != NULL);
diff -puN include/linux/checkpoint.h~track-files_struct-checkpointability include/linux/checkpoint.h
--- linux-2.6.git/include/linux/checkpoint.h~track-files_struct-checkpointability 2009-02-27 12:07:41.000000000 -0800
+++ linux-2.6.git-dave/include/linux/checkpoint.h 2009-02-27 12:07:41.000000000 -0800
@@ -12,6 +12,7 @@
#include <linux/path.h>
#include <linux/fs.h>
+#include <linux/fdtable.h>
#ifdef CONFIG_CHECKPOINT_RESTART
@@ -102,6 +103,18 @@ extern int cr_read_files(struct cr_ctx *
#define pr_fmt(fmt) "[%d:c/r:%s] " fmt, task_pid_vnr(current), __func__
+static inline void __files_deny_checkpointing(struct files_struct *files,
+ char *file, int line)
+{
+ if (!test_and_clear_bit(0, &files->may_checkpoint))
+ return;
+ printk(KERN_INFO "process performed an action that can not be "
+ "checkpointed at: %s:%d\n", file, line);
+ WARN_ON(1);
+}
+#define files_deny_checkpointing(f) \
+ __files_deny_checkpointing(f, __FILE__, __LINE__)
+
int cr_explain_file(struct file *file, char *explain, int left);
int cr_file_supported(struct file *file);
int generic_file_checkpoint(struct file *, struct cr_ctx *, struct cr_hdr_fd *);
@@ -112,6 +125,7 @@ struct cr_hdr_fd;
#define generic_file_checkpoint NULL
+static inline void files_deny_checkpointing(struct files_struct *files) {}
static inline int cr_explain_file(struct file *file, char *explain, int left)
{
return 0;
diff -puN include/linux/fdtable.h~track-files_struct-checkpointability include/linux/fdtable.h
--- linux-2.6.git/include/linux/fdtable.h~track-files_struct-checkpointability 2009-02-27 12:07:41.000000000 -0800
+++ linux-2.6.git-dave/include/linux/fdtable.h 2009-02-27 12:07:41.000000000 -0800
@@ -45,6 +45,9 @@ struct files_struct {
atomic_t count;
struct fdtable *fdt;
struct fdtable fdtab;
+#ifdef CONFIG_CHECKPOINT_RESTART
+ unsigned long may_checkpoint;
+#endif
/*
* written part on a separate cache line in SMP
*/
_
next prev parent reply other threads:[~2009-02-27 20:37 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-27 20:34 [RFC][PATCH 1/8] kill '_data' in cr_hdr_fd_data name Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 2/8] breakout fdinfo sprintf() into its own function Dave Hansen
2009-02-27 20:56 ` Vegard Nossum
2009-02-27 21:23 ` Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 3/8] create fs flags to mark c/r supported fs's Dave Hansen
2009-02-27 21:16 ` Alexey Dobriyan
2009-02-27 21:20 ` Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 4/8] file c/r: expose functions to query fs support Dave Hansen
2009-02-27 21:14 ` Sukadev Bhattiprolu
2009-02-27 21:24 ` Dave Hansen
2009-02-27 21:32 ` Dave Hansen
2009-02-28 1:33 ` Sukadev Bhattiprolu
2009-02-27 20:34 ` [RFC][PATCH 5/8] add f_op for checkpointability Dave Hansen
2009-02-28 2:14 ` Sukadev Bhattiprolu
2009-02-28 2:51 ` Dave Hansen
2009-02-28 20:53 ` Christoph Hellwig
2009-02-28 21:37 ` Dave Hansen
2009-03-01 15:19 ` Serge E. Hallyn
2009-03-02 17:05 ` Dave Hansen
2009-03-03 13:15 ` Christoph Hellwig
2009-03-20 21:13 ` Dave Hansen
2009-03-20 21:30 ` Oren Laadan
2009-02-27 20:34 ` [RFC][PATCH 6/8] mark /dev/null and zero as checkpointable Dave Hansen
2009-02-27 20:34 ` [RFC][PATCH 7/8] add c/r info to fdinfo Dave Hansen
2009-02-27 20:34 ` Dave Hansen [this message]
2009-02-28 2:57 ` [RFC][PATCH 8/8] check files for checkpointability Sukadev Bhattiprolu
2009-03-01 17:00 ` Serge E. Hallyn
2009-03-04 23:41 ` Dave Hansen
2009-03-01 19:43 ` Serge E. Hallyn
2009-03-02 13:37 ` Serge E. Hallyn
2009-03-02 15:56 ` Dave Hansen
2009-03-02 15:59 ` Nathan Lynch
2009-03-02 16:27 ` Dave Hansen
2009-03-02 17:22 ` Nathan Lynch
2009-03-02 17:30 ` Dave Hansen
2009-03-02 17:44 ` Serge E. Hallyn
2009-03-02 17:58 ` Dave Hansen
2009-03-02 18:13 ` Dave Hansen
2009-03-02 18:35 ` Serge E. Hallyn
2009-03-05 8:20 ` Cedric Le Goater
2009-03-02 16:28 ` 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=20090227203435.98735E54@kernel \
--to=dave@linux.vnet.ibm.com \
--cc=adobriyan@gmail.com \
--cc=containers@lists.linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=orenl@cs.columbia.edu \
--cc=serue@us.ibm.com \
/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