vfs: use kmalloc() to allocate fdmem if possible
PATCH 5/5 vfs: use kmalloc() to allocate fdmem if possible
From: Changli Gao <[email protected]>
Use kmalloc() to allocate fdmem if possible.
vmalloc() is used as a fallback solution for fdmem allocation. A new helper function __free_fdtable() is introduced to reduce the lines of code.
A potential bug, vfree() a memory allocated by kmalloc(), is fixed.
[[email protected]: use __GFP_NOWARN, uninline alloc_fdmem() and free_fdmem()]
Signed-off-by Changli Gao <[email protected]>
Cc Alexander Viro <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Cc Alexey Dobriyan <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Avi Kivity <[email protected]>
Cc Tetsuo Handa <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/file.c | 57 ++++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 34 deletions(-)
fs/file.c renamed from fs/file.c~vfs-use-kmalloc-to-allocate-fdmem-if-possible +23 -34
@@ -39,28 +39,27 @@ int sysctl_nr_open_max = 1024 * 1024; /**/ static DEFINE_PER_CPU(struct fdtable_defer, fdtable_defer_list); -static inline void *alloc_fdmem (unsigned int size) +static inline void *alloc_fdmem (unsigned int size) { -if (size <=PAGE_SIZE ) -return kmalloc (size,GFP_KERNEL ); -else -return vmalloc (size); +void *data; + + data =kmalloc (size,GFP_KERNEL |__GFP_NOWARN); +if (data !=NULL ) +return data; + +return vmalloc (size); } -static inline void free_fdarr (struct fdtable *fdt) +static void free_fdmem (void *ptr) { -if (fdt->max_fds <= (PAGE_SIZE /sizeof (struct file *))) -kfree (fdt->fd); -else -vfree (fdt->fd); +is_vmalloc_addr (ptr) ?vfree (ptr) :kfree (ptr); } -static inline void free_fdset (struct fdtable *fdt) +static void __free_fdtable (struct fdtable *fdt) { -if (fdt->max_fds <= (PAGE_SIZE *BITS_PER_BYTE /2 )) -kfree (fdt->open_fds); -else -vfree (fdt->open_fds); +free_fdmem (fdt->fd); +free_fdmem (fdt->open_fds); +kfree (fdt); }static void free_fdtable_work (struct work_struct *work)
@@ -75,9 +74,8 @@ static void free_fdtable_work(struct worspin_unlock_bh (&f->lock);while (fdt) {struct fdtable *next = fdt->next; -vfree (fdt->fd); -free_fdset (fdt); -kfree (fdt); + +__free_fdtable (fdt); fdt = next; } }
@@ -98,7 +96,7 @@ void free_fdtable_rcu(struct rcu_head *r container_of(fdt, struct files_struct, fdtab));return ; } -if (fdt->max_fds <= (PAGE_SIZE /sizeof (struct file *))) { +if (!is_vmalloc_addr (fdt->fd) && !is_vmalloc_addr (fdt->open_fds)) {kfree (fdt->fd);kfree (fdt->open_fds);kfree (fdt);
@@ -184,7 +182,7 @@ static struct fdtable * alloc_fdtable(unreturn fdt; out_arr: -free_fdarr (fdt); +free_fdmem (fdt->fd); out_fdt:kfree (fdt); out:
@@ -214,9 +212,7 @@ static int expand_fdtable(struct files_s* caller and alloc_fdtable(). Cheaper to catch it here... */ if (unlikely (new_fdt->max_fds <= nr)) { -free_fdarr (new_fdt); -free_fdset (new_fdt); -kfree (new_fdt); +__free_fdtable (new_fdt);return -EMFILE ; }/*
@@ -232,9 +228,7 @@ static int expand_fdtable(struct files_sfree_fdtable (cur_fdt); }else {/* Somebody else expanded, so undo our attempt */ -free_fdarr (new_fdt); -free_fdset (new_fdt); -kfree (new_fdt); +__free_fdtable (new_fdt); }return 1 ; }
@@ -325,11 +319,8 @@ struct files_struct *dup_fd(struct fileswhile (unlikely (open_files > new_fdt->max_fds)) {spin_unlock (&oldf->file_lock); -if (new_fdt != &newf->fdtab) { -free_fdarr (new_fdt); -free_fdset (new_fdt); -kfree (new_fdt); - } +if (new_fdt != &newf->fdtab) +__free_fdtable (new_fdt); new_fdt =alloc_fdtable (open_files -1 );if (!new_fdt) {
@@ -339,9 +330,7 @@ struct files_struct *dup_fd(struct files/* beyond sysctl_nr_open; nothing to do */ if (unlikely (new_fdt->max_fds < open_files)) { -free_fdarr (new_fdt); -free_fdset (new_fdt); -kfree (new_fdt); +__free_fdtable (new_fdt); *errorp = -EMFILE ; goto out_release; }
_