Skip to content

Commit

Permalink
proc: move "struct pde_opener" to kmem cache
Browse files Browse the repository at this point in the history
"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>
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Apr 11, 2018
1 parent a9fabc3 commit 195b8cf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
12 changes: 8 additions & 4 deletions fs/proc/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -92,14 +93,17 @@ 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),
0, (SLAB_RECLAIM_ACCOUNT|
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)
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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;
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion fs/proc/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion fs/proc/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 195b8cf

Please sign in to comment.