IMA: use rbtree instead of radix tree for inode information cache

The IMA code needs to store the number of tasks which have an open fd
granting permission to write a file even when IMA is not in use.  It
needs this information in order to be enabled at a later point in time
without losing it's integrity garantees.

At the moment that means we store a little bit of data about every inode
in a cache.  We use a radix tree key'd on the inode's memory address.
Dave Chinner pointed out that a radix tree is a terrible data structure
for such a sparse key space.  This patch switches to using an rbtree
which should be more efficient.

Bug report from Dave:

 "I just noticed that slabtop was reporting an awfully high usage of
  radix tree nodes:

   OBJS ACTIVE  USE OBJ SIZE  SLABS OBJ/SLAB CACHE SIZE NAME
  4200331 2778082  66%    0.55K 144839       29   2317424K radix_tree_node
  2321500 2060290  88%    1.00K  72581       32   2322592K xfs_inode
  2235648 2069791  92%    0.12K  69864       32    279456K iint_cache

  That is, 2.7M radix tree nodes are allocated, and the cache itself is
  consuming 2.3GB of RAM.  I know that the XFS inodei caches are indexed
  by radix tree node, but for 2 million cached inodes that would mean a
  density of 1 inode per radix tree node, which for a system with 16M
  inodes in the filsystems is an impossibly low density.  The worst I've
  seen in a production system like kernel.org is about 20-25% density,
  which would mean about 150-200k radix tree nodes for that many inodes.
  So it's not the inode cache.

  So I looked up what the iint_cache was.  It appears to used for
  storing per-inode IMA information, and uses a radix tree for indexing.
  It uses the *address* of the struct inode as the indexing key.  That
  means the key space is extremely sparse - for XFS the struct inode
  addresses are approximately 1000 bytes apart, which means the closest
  the radix tree index keys get is ~1000.  Which means that there is a
  single entry per radix tree leaf node, so the radix tree is using
  roughly 550 bytes for every 120byte structure being cached.  For the
  above example, it's probably wasting close to 1GB of RAM...."

Reported-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 3fbcd1dda0ef6e06da4a5b4b9c23a240a6378a35..7557791e954d53d1f176a0e518d7b8db1b7ddd7f 100644 (file)
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -100,6 +100,8 @@ static inline unsigned long ima_hash_key(u8 *digest)
 
 /* integrity data associated with an inode */
 struct ima_iint_cache {
+       struct rb_node rb_node; /* rooted in ima_iint_tree */
+       struct inode *inode;    /* back pointer to inode in question */
        u64 version;            /* track inode changes */
        unsigned long flags;
        u8 digest[IMA_DIGEST_SIZE];
@@ -108,7 +110,6 @@ struct ima_iint_cache {
        long writecount;        /* measured files writecount */
        long opencount;         /* opens reference count */
        struct kref refcount;   /* ima_iint_cache reference count */
-       struct rcu_head rcu;
 };
 
 /* LIM API function definitions */
@@ -122,13 +123,12 @@ int ima_store_template(struct ima_template_entry *entry, int violation,
 void ima_template_show(struct seq_file *m, void *e,
                       enum ima_show_type show);
 
-/* radix tree calls to lookup, insert, delete
+/* rbtree tree calls to lookup, insert, delete
  * integrity data associated with an inode.
  */
 struct ima_iint_cache *ima_iint_insert(struct inode *inode);
 struct ima_iint_cache *ima_iint_find_get(struct inode *inode);
 void iint_free(struct kref *kref);
-void iint_rcu_free(struct rcu_head *rcu);
 
 /* IMA policy related functions */
 enum ima_hooks { FILE_CHECK = 1, FILE_MMAP, BPRM_CHECK };

diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
index afba4aef812f699134f7c7bc66c32251d2f12c69..8395f0f5e9b918925839ff4293361b3e363793e8 100644 (file)
--- a/security/integrity/ima/ima_iint.c
+++ b/security/integrity/ima/ima_iint.c
@@ -12,21 +12,48 @@
  * File: ima_iint.c
  *     - implements the IMA hooks: ima_inode_alloc, ima_inode_free
  *     - cache integrity information associated with an inode
- *       using a radix tree.
+ *       using a rbtree tree.
  */
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/radix-tree.h>
+#include <linux/rbtree.h>
 #include "ima.h"
 
-RADIX_TREE(ima_iint_store, GFP_ATOMIC);
-DEFINE_SPINLOCK(ima_iint_lock);
+static struct rb_root ima_iint_tree = RB_ROOT;
+static DEFINE_SPINLOCK(ima_iint_lock);
 static struct kmem_cache *iint_cache __read_mostly;
 
 int iint_initialized = 0;
 
-/* ima_iint_find_get - return the iint associated with an inode
+/*
+ * __ima_iint_find - return the iint associated with an inode
+ */
+static struct ima_iint_cache *__ima_iint_find(struct inode *inode)
+{
+       struct ima_iint_cache *iint;
+       struct rb_node *n = ima_iint_tree.rb_node;
+
+       assert_spin_locked(&ima_iint_lock);
+
+       while (n) {
+               iint = rb_entry(n, struct ima_iint_cache, rb_node);
+
+               if (inode < iint->inode)
+                       n = n->rb_left;
+               else if (inode > iint->inode)
+                       n = n->rb_right;
+               else
+                       break;
+       }
+       if (!n)
+               return NULL;
+
+       return iint;
+}
+
+/*
+ * ima_iint_find_get - return the iint associated with an inode
  *
  * ima_iint_find_get gets a reference to the iint. Caller must
  * remember to put the iint reference.
@@ -35,13 +62,12 @@ struct ima_iint_cache *ima_iint_find_get(struct inode *inode)
 {
        struct ima_iint_cache *iint;
 
-       rcu_read_lock();
-       iint = radix_tree_lookup(&ima_iint_store, (unsigned long)inode);
-       if (!iint)
-               goto out;
-       kref_get(&iint->refcount);
-out:
-       rcu_read_unlock();
+       spin_lock(&ima_iint_lock);
+       iint = __ima_iint_find(inode);
+       if (iint)
+               kref_get(&iint->refcount);
+       spin_unlock(&ima_iint_lock);
+
        return iint;
 }
 
@@ -51,25 +77,43 @@ out:
  */
 int ima_inode_alloc(struct inode *inode)
 {
-       struct ima_iint_cache *iint = NULL;
-       int rc = 0;
+       struct rb_node **p;
+       struct rb_node *new_node, *parent = NULL;
+       struct ima_iint_cache *new_iint, *test_iint;
+       int rc;
 
-       iint = kmem_cache_alloc(iint_cache, GFP_NOFS);
-       if (!iint)
+       new_iint = kmem_cache_alloc(iint_cache, GFP_NOFS);
+       if (!new_iint)
                return -ENOMEM;
 
-       rc = radix_tree_preload(GFP_NOFS);
-       if (rc < 0)
-               goto out;
+       new_iint->inode = inode;
+       new_node = &new_iint->rb_node;
 
        spin_lock(&ima_iint_lock);
-       rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint);
+
+       p = &ima_iint_tree.rb_node;
+       while (*p) {
+               parent = *p;
+               test_iint = rb_entry(parent, struct ima_iint_cache, rb_node);
+
+               rc = -EEXIST;
+               if (inode < test_iint->inode)
+                       p = &(*p)->rb_left;
+               else if (inode > test_iint->inode)
+                       p = &(*p)->rb_right;
+               else
+                       goto out_err;
+       }
+
+       rb_link_node(new_node, parent, p);
+       rb_insert_color(new_node, &ima_iint_tree);
+
        spin_unlock(&ima_iint_lock);
-       radix_tree_preload_end();
-out:
-       if (rc < 0)
-               kmem_cache_free(iint_cache, iint);
 
+       return 0;
+out_err:
+       spin_unlock(&ima_iint_lock);
+       kref_put(&new_iint->refcount, iint_free);
        return rc;
 }
 
@@ -99,13 +143,6 @@ void iint_free(struct kref *kref)
        kmem_cache_free(iint_cache, iint);
 }
 
-void iint_rcu_free(struct rcu_head *rcu_head)
-{
-       struct ima_iint_cache *iint = container_of(rcu_head,
-                                                  struct ima_iint_cache, rcu);
-       kref_put(&iint->refcount, iint_free);
-}
-
 /**
  * ima_inode_free - called on security_inode_free
  * @inode: pointer to the inode
@@ -117,10 +154,12 @@ void ima_inode_free(struct inode *inode)
        struct ima_iint_cache *iint;
 
        spin_lock(&ima_iint_lock);
-       iint = radix_tree_delete(&ima_iint_store, (unsigned long)inode);
+       iint = __ima_iint_find(inode);
+       if (iint)
+               rb_erase(&iint->rb_node, &ima_iint_tree);
        spin_unlock(&ima_iint_lock);
        if (iint)
-               call_rcu(&iint->rcu, iint_rcu_free);
+               kref_put(&iint->refcount, iint_free);
 }
 
 static void init_once(void *foo)