proc: move "struct pde_opener" to kmem cache

"struct pde_opener" is fixed size and we can have more granular approach
to debugging.

For those who don't know, per cache SLUB poisoning and red zoning don't
work if there is at least one object allocated which is hopeless in case
of kmalloc-64 but not in case of standalone cache.  Although systemd
opens 2 files from the get go, so it is hopeless after all.

Link: http://lkml.kernel.org/r/20180214082306.GB17157@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 0331ddbee4f6fd5e6c32f1dd9ca6457a2c7a9d4d..5349eb07ac29902f4deba53b15653143e46b02d5 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -54,6 +54,7 @@ static void proc_evict_inode(struct inode *inode)
 }
 
 static struct kmem_cache *proc_inode_cachep __ro_after_init;
+static struct kmem_cache *pde_opener_cache __ro_after_init;
 
 static struct inode *proc_alloc_inode(struct super_block *sb)
 {
@@ -92,7 +93,7 @@ static void init_once(void *foo)
        inode_init_once(&ei->vfs_inode);
 }
 
-void __init proc_init_inodecache(void)
+void __init proc_init_kmemcache(void)
 {
        proc_inode_cachep = kmem_cache_create("proc_inode_cache",
                                             sizeof(struct proc_inode),
@@ -100,6 +101,9 @@ void __init proc_init_inodecache(void)
                                                SLAB_MEM_SPREAD|SLAB_ACCOUNT|
                                                SLAB_PANIC),
                                             init_once);
+       pde_opener_cache =
+               kmem_cache_create("pde_opener", sizeof(struct pde_opener), 0,
+                                 SLAB_PANIC, NULL);
 }
 
 static int proc_show_options(struct seq_file *seq, struct dentry *root)
@@ -172,7 +176,7 @@ static void close_pdeo(struct proc_dir_entry *pde, struct pde_opener *pdeo)
                spin_unlock(&pde->pde_unload_lock);
                if (unlikely(c))
                        complete(c);
-               kfree(pdeo);
+               kmem_cache_free(pde_opener_cache, pdeo);
        }
 }
 
@@ -347,7 +351,7 @@ static int proc_reg_open(struct inode *inode, struct file *file)
 
        release = pde->proc_fops->release;
        if (release) {
-               pdeo = kmalloc(sizeof(struct pde_opener), GFP_KERNEL);
+               pdeo = kmem_cache_alloc(pde_opener_cache, GFP_KERNEL);
                if (!pdeo) {
                        rv = -ENOMEM;
                        goto out_unuse;
@@ -368,7 +372,7 @@ static int proc_reg_open(struct inode *inode, struct file *file)
                        list_add(&pdeo->lh, &pde->pde_openers);
                        spin_unlock(&pde->pde_unload_lock);
                } else
-                       kfree(pdeo);
+                       kmem_cache_free(pde_opener_cache, pdeo);
        }
 
 out_unuse:

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 713d5dfe3f0564da58020e1007d114f0ef6f7e77..dc00ef8538cb1d1751b0cf8fad4a426537e9c88a 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -182,7 +182,7 @@ extern const struct inode_operations proc_link_inode_operations;
 
 extern const struct inode_operations proc_pid_link_inode_operations;
 
-extern void proc_init_inodecache(void);
+void proc_init_kmemcache(void);
 void set_proc_pid_nlink(void);
 extern struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);
 extern int proc_fill_super(struct super_block *, void *data, int flags);

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 4a19e02c7ed059439740a45bec3587f9471bc6c7..98797b762a71f41c65537d72fd244a4424ad0d52 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -125,7 +125,7 @@ void __init proc_root_init(void)
 {
        int err;
 
-       proc_init_inodecache();
+       proc_init_kmemcache();
        set_proc_pid_nlink();
        err = register_filesystem(&proc_fs_type);
        if (err)