[PATCH 4/8] ovl: add infrastructure for intercepting file ops

[Miklos Szeredi]

Overlayfs needs to intercept a few file operations in order to properly
handle the following corner case:

 - file X is in overlayfs;

 - X resides on a lower (read-only) layer
the lower file is L;

 - X is opened with O_RDONLY ->
L is opened -> 'rofd';

 - X is opened with O_WRONLY ->
this results in L being copied up to the upper layer file U
U is opened -> 'rwfd';

 - write to 'rwfd' modifying U;

 - read from 'rofd' gets data from unmodified L;

While this is a rare occurrence, it has been known to cause problems.  To
prevent such inconsistencies, allow intercepting read operations and fix
them up in the unlikely case that it's needed.

This patch adds an ovl_fops structure that is going to contain the pieces
necessary for intercepting file operations:

 a) a new file_operations structure, based on the original but changing
those operations that need to be intercepted;

 b) a pointer to the origin f_op.  Intercepted operations will normally
just call the original, unless the file was copied up;

 c) a hash table entry to hook this up for reuse in subsequent opens.

The hash table is small (32 buckets) since there will only be a few
different file operations used (basically the number of different
filesystems used as lower layer of overlay).  The key to the has table is
the original fops pointer.

Insertion is done under a global mutex.  There will only be one insertion
event for each unique underlying file_operations structure, so this is
going to be rare.

The hash table is accessed using rcu, so this will add minimal overhead to
opens.  The override fops are removed only at module exit time, so we don't
even have to be worry about read-side rcu locking.

There are a few assumption this scheme makes about file operation
structures supplied by filesystems:

 1) the lifetime of the structures is equal to the lifetime of the
filesystem module; ensure this by holding a ref to the
sb->s_type->owner (normal filesystems don't fill in f_ops->owner).
This means that once a filesystem has been used as lower layer of
overlayfs its module cannot be removed until the overlay module itself
is removed.  I don't believe this will be a problem.

 2) Filesystems should not make use of f_op in any way except possibly
replacing it in ->open.  Overlayfs itself breaks this assumption, but
recursion is handled by ->d_real so this is not an issue.  Add a
->magic field to the override fops structure to verify that the
filesystem didn't mess with file->f_op.

Signed-off-by: Miklos Szeredi 
---
 fs/overlayfs/inode.c | 146 ++-
 fs/overlayfs/overlayfs.h |   2 +
 fs/overlayfs/super.c |   1 +
 3 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 1981a5514f51..e98e3323c330 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "overlayfs.h"
 
 static int ovl_copy_up_truncate(struct dentry *dentry)
@@ -334,16 +335,159 @@ static const struct inode_operations 
ovl_symlink_inode_operations = {
.update_time= ovl_update_time,
 };
 
+static DEFINE_READ_MOSTLY_HASHTABLE(ovl_fops_htable, 5);
+static DEFINE_MUTEX(ovl_fops_mutex);
+
+#define OVL_FOPS_MAGIC 0x73706f462a6c764f
+
+struct ovl_fops {
+   struct module *owner;
+   struct file_operations fops;
+   u64 magic;
+   const struct file_operations *orig_fops;
+   struct hlist_node entry;
+};
+
+void ovl_cleanup_fops_htable(void)
+{
+   int bkt;
+   struct hlist_node *tmp;
+   struct ovl_fops *ofop;
+
+   hash_for_each_safe(ovl_fops_htable, bkt, tmp, ofop, entry) {
+   module_put(ofop->owner);
+   fops_put(ofop->orig_fops);
+   kfree(ofop);
+   }
+}
+
+#define OVL_CALL_REAL_FOP(file, call) \
+   ({ struct ovl_fops *__ofop = \
+   container_of(file->f_op, struct ovl_fops, fops); \
+  WARN_ON(__ofop->magic != OVL_FOPS_MAGIC) ? -EIO : \
+  __ofop->orig_fops->call;  \
+   })
+
+static struct ovl_fops *ovl_fops_find(const struct file_operations *orig)
+{
+   struct ovl_fops *ofop;
+
+   hash_for_each_possible_rcu(ovl_fops_htable, ofop, entry, (long) orig) {
+   if (ofop->orig_fops == orig)
+   return ofop;
+   }
+   return NULL;
+}
+
+static struct ovl_fops *ovl_fops_get(struct file *file)
+{
+   const struct file_operations *orig = file->f_op;
+   struct ovl_fops *ofop = ovl_fops_find(orig);
+
+   if (likely(ofop))
+   return ofop;
+
+   mutex_lock(_fops_mutex);
+   ofop = ovl_fops_find(orig);
+   if (ofop)
+   goto out_unlock;
+
+   ofop = kzalloc(sizeof(struct ovl_fops), GFP_KERNEL);
+   if 

[PATCH 4/8] ovl: add infrastructure for intercepting file ops

[Miklos Szeredi]

Overlayfs needs to intercept a few file operations in order to properly
handle the following corner case:

 - file X is in overlayfs;

 - X resides on a lower (read-only) layer
the lower file is L;

 - X is opened with O_RDONLY ->
L is opened -> 'rofd';

 - X is opened with O_WRONLY ->
this results in L being copied up to the upper layer file U
U is opened -> 'rwfd';

 - write to 'rwfd' modifying U;

 - read from 'rofd' gets data from unmodified L;

While this is a rare occurrence, it has been known to cause problems.  To
prevent such inconsistencies, allow intercepting read operations and fix
them up in the unlikely case that it's needed.

This patch adds an ovl_fops structure that is going to contain the pieces
necessary for intercepting file operations:

 a) a new file_operations structure, based on the original but changing
those operations that need to be intercepted;

 b) a pointer to the origin f_op.  Intercepted operations will normally
just call the original, unless the file was copied up;

 c) a hash table entry to hook this up for reuse in subsequent opens.

The hash table is small (32 buckets) since there will only be a few
different file operations used (basically the number of different
filesystems used as lower layer of overlay).  The key to the has table is
the original fops pointer.

Insertion is done under a global mutex.  There will only be one insertion
event for each unique underlying file_operations structure, so this is
going to be rare.

The hash table is accessed using rcu, so this will add minimal overhead to
opens.  The override fops are removed only at module exit time, so we don't
even have to be worry about read-side rcu locking.

There are a few assumption this scheme makes about file operation
structures supplied by filesystems:

 1) the lifetime of the structures is equal to the lifetime of the
filesystem module; ensure this by holding a ref to the
sb->s_type->owner (normal filesystems don't fill in f_ops->owner).
This means that once a filesystem has been used as lower layer of
overlayfs its module cannot be removed until the overlay module itself
is removed.  I don't believe this will be a problem.

 2) Filesystems should not make use of f_op in any way except possibly
replacing it in ->open.  Overlayfs itself breaks this assumption, but
recursion is handled by ->d_real so this is not an issue.  Add a
->magic field to the override fops structure to verify that the
filesystem didn't mess with file->f_op.

Signed-off-by: Miklos Szeredi 
---
 fs/overlayfs/inode.c | 146 ++-
 fs/overlayfs/overlayfs.h |   2 +
 fs/overlayfs/super.c |   1 +
 3 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 1981a5514f51..e98e3323c330 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "overlayfs.h"
 
 static int ovl_copy_up_truncate(struct dentry *dentry)
@@ -334,16 +335,159 @@ static const struct inode_operations 
ovl_symlink_inode_operations = {
.update_time= ovl_update_time,
 };
 
+static DEFINE_READ_MOSTLY_HASHTABLE(ovl_fops_htable, 5);
+static DEFINE_MUTEX(ovl_fops_mutex);
+
+#define OVL_FOPS_MAGIC 0x73706f462a6c764f
+
+struct ovl_fops {
+   struct module *owner;
+   struct file_operations fops;
+   u64 magic;
+   const struct file_operations *orig_fops;
+   struct hlist_node entry;
+};
+
+void ovl_cleanup_fops_htable(void)
+{
+   int bkt;
+   struct hlist_node *tmp;
+   struct ovl_fops *ofop;
+
+   hash_for_each_safe(ovl_fops_htable, bkt, tmp, ofop, entry) {
+   module_put(ofop->owner);
+   fops_put(ofop->orig_fops);
+   kfree(ofop);
+   }
+}
+
+#define OVL_CALL_REAL_FOP(file, call) \
+   ({ struct ovl_fops *__ofop = \
+   container_of(file->f_op, struct ovl_fops, fops); \
+  WARN_ON(__ofop->magic != OVL_FOPS_MAGIC) ? -EIO : \
+  __ofop->orig_fops->call;  \
+   })
+
+static struct ovl_fops *ovl_fops_find(const struct file_operations *orig)
+{
+   struct ovl_fops *ofop;
+
+   hash_for_each_possible_rcu(ovl_fops_htable, ofop, entry, (long) orig) {
+   if (ofop->orig_fops == orig)
+   return ofop;
+   }
+   return NULL;
+}
+
+static struct ovl_fops *ovl_fops_get(struct file *file)
+{
+   const struct file_operations *orig = file->f_op;
+   struct ovl_fops *ofop = ovl_fops_find(orig);
+
+   if (likely(ofop))
+   return ofop;
+
+   mutex_lock(_fops_mutex);
+   ofop = ovl_fops_find(orig);
+   if (ofop)
+   goto out_unlock;
+
+   ofop = kzalloc(sizeof(struct ovl_fops), GFP_KERNEL);
+   if (!ofop)
+