Commit 53d85c98 authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds

cleancache: forbid overriding cleancache_ops

Currently, cleancache_register_ops returns the previous value of
cleancache_ops to allow chaining.  However, chaining, as it is
implemented now, is extremely dangerous due to possible pool id
collisions.  Suppose, a new cleancache driver is registered after the
previous one assigned an id to a super block.  If the new driver assigns
the same id to another super block, which is perfectly possible, we will
have two different filesystems using the same id.  No matter if the new
driver implements chaining or not, we are likely to get data corruption
with such a configuration eventually.

This patch therefore disables the ability to override cleancache_ops
altogether as potentially dangerous.  If there is already cleancache
driver registered, all further calls to cleancache_register_ops will
return EBUSY.  Since no user of cleancache implements chaining, we only
need to make minor changes to the code outside the cleancache core.
Signed-off-by: default avatarVladimir Davydov <vdavydov@parallels.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Stefan Hengelein <ilendir@googlemail.com>
Cc: Florian Schmaus <fschmaus@gmail.com>
Cc: Andor Daam <andor.daam@googlemail.com>
Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Bob Liu <lliubbo@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9de16262
...@@ -28,9 +28,7 @@ IMPLEMENTATION OVERVIEW ...@@ -28,9 +28,7 @@ IMPLEMENTATION OVERVIEW
A cleancache "backend" that provides transcendent memory registers itself A cleancache "backend" that provides transcendent memory registers itself
to the kernel's cleancache "frontend" by calling cleancache_register_ops, to the kernel's cleancache "frontend" by calling cleancache_register_ops,
passing a pointer to a cleancache_ops structure with funcs set appropriately. passing a pointer to a cleancache_ops structure with funcs set appropriately.
Note that cleancache_register_ops returns the previous settings so that The functions provided must conform to certain semantics as follows:
chaining can be performed if desired. The functions provided must conform to
certain semantics as follows:
Most important, cleancache is "ephemeral". Pages which are copied into Most important, cleancache is "ephemeral". Pages which are copied into
cleancache have an indefinite lifetime which is completely unknowable cleancache have an indefinite lifetime which is completely unknowable
......
...@@ -397,13 +397,15 @@ static int __init xen_tmem_init(void) ...@@ -397,13 +397,15 @@ static int __init xen_tmem_init(void)
#ifdef CONFIG_CLEANCACHE #ifdef CONFIG_CLEANCACHE
BUG_ON(sizeof(struct cleancache_filekey) != sizeof(struct tmem_oid)); BUG_ON(sizeof(struct cleancache_filekey) != sizeof(struct tmem_oid));
if (tmem_enabled && cleancache) { if (tmem_enabled && cleancache) {
char *s = ""; int err;
struct cleancache_ops *old_ops =
cleancache_register_ops(&tmem_cleancache_ops); err = cleancache_register_ops(&tmem_cleancache_ops);
if (old_ops) if (err)
s = " (WARNING: cleancache_ops overridden)"; pr_warn("xen-tmem: failed to enable cleancache: %d\n",
pr_info("cleancache enabled, RAM provided by Xen Transcendent Memory%s\n", err);
s); else
pr_info("cleancache enabled, RAM provided by "
"Xen Transcendent Memory\n");
} }
#endif #endif
#ifdef CONFIG_XEN_SELFBALLOONING #ifdef CONFIG_XEN_SELFBALLOONING
......
...@@ -33,8 +33,7 @@ struct cleancache_ops { ...@@ -33,8 +33,7 @@ struct cleancache_ops {
void (*invalidate_fs)(int); void (*invalidate_fs)(int);
}; };
extern struct cleancache_ops * extern int cleancache_register_ops(struct cleancache_ops *ops);
cleancache_register_ops(struct cleancache_ops *ops);
extern void __cleancache_init_fs(struct super_block *); extern void __cleancache_init_fs(struct super_block *);
extern void __cleancache_init_shared_fs(struct super_block *); extern void __cleancache_init_shared_fs(struct super_block *);
extern int __cleancache_get_page(struct page *); extern int __cleancache_get_page(struct page *);
......
...@@ -106,15 +106,17 @@ static DEFINE_MUTEX(poolid_mutex); ...@@ -106,15 +106,17 @@ static DEFINE_MUTEX(poolid_mutex);
*/ */
/* /*
* Register operations for cleancache, returning previous thus allowing * Register operations for cleancache. Returns 0 on success.
* detection of multiple backends and possible nesting.
*/ */
struct cleancache_ops *cleancache_register_ops(struct cleancache_ops *ops) int cleancache_register_ops(struct cleancache_ops *ops)
{ {
struct cleancache_ops *old = cleancache_ops;
int i; int i;
mutex_lock(&poolid_mutex); mutex_lock(&poolid_mutex);
if (cleancache_ops) {
mutex_unlock(&poolid_mutex);
return -EBUSY;
}
for (i = 0; i < MAX_INITIALIZABLE_FS; i++) { for (i = 0; i < MAX_INITIALIZABLE_FS; i++) {
if (fs_poolid_map[i] == FS_NO_BACKEND) if (fs_poolid_map[i] == FS_NO_BACKEND)
fs_poolid_map[i] = ops->init_fs(PAGE_SIZE); fs_poolid_map[i] = ops->init_fs(PAGE_SIZE);
...@@ -130,7 +132,7 @@ struct cleancache_ops *cleancache_register_ops(struct cleancache_ops *ops) ...@@ -130,7 +132,7 @@ struct cleancache_ops *cleancache_register_ops(struct cleancache_ops *ops)
barrier(); barrier();
cleancache_ops = ops; cleancache_ops = ops;
mutex_unlock(&poolid_mutex); mutex_unlock(&poolid_mutex);
return old; return 0;
} }
EXPORT_SYMBOL(cleancache_register_ops); EXPORT_SYMBOL(cleancache_register_ops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment