提交 113737cc 编写于 作者: V Vasily Averin 提交者: Greg Kroah-Hartman

mm/swapfile.c: use kvzalloc for swap_info_struct allocation

commit 873d7bcfd066663e3e50113dc4a0de19289b6354 upstream.

Commit a2468cc9 ("swap: choose swap device according to numa node")
changed 'avail_lists' field of 'struct swap_info_struct' to an array.
In popular linux distros it increased size of swap_info_struct up to 40
Kbytes and now swap_info_struct allocation requires order-4 page.
Switch to kvzmalloc allows to avoid unexpected allocation failures.

Link: http://lkml.kernel.org/r/fc23172d-3c75-21e2-d551-8b1808cbe593@virtuozzo.com
Fixes: a2468cc9 ("swap: choose swap device according to numa node")
Signed-off-by: NVasily Averin <vvs@virtuozzo.com>
Acked-by: NAaron Lu <aaron.lu@intel.com>
Acked-by: NMichal Hocko <mhocko@suse.com>
Reviewed-by: NAndrew Morton <akpm@linux-foundation.org>
Cc: Huang Ying <ying.huang@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 7b46e532
...@@ -2820,7 +2820,7 @@ static struct swap_info_struct *alloc_swap_info(void) ...@@ -2820,7 +2820,7 @@ static struct swap_info_struct *alloc_swap_info(void)
unsigned int type; unsigned int type;
int i; int i;
p = kzalloc(sizeof(*p), GFP_KERNEL); p = kvzalloc(sizeof(*p), GFP_KERNEL);
if (!p) if (!p)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
...@@ -2831,7 +2831,7 @@ static struct swap_info_struct *alloc_swap_info(void) ...@@ -2831,7 +2831,7 @@ static struct swap_info_struct *alloc_swap_info(void)
} }
if (type >= MAX_SWAPFILES) { if (type >= MAX_SWAPFILES) {
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
kfree(p); kvfree(p);
return ERR_PTR(-EPERM); return ERR_PTR(-EPERM);
} }
if (type >= nr_swapfiles) { if (type >= nr_swapfiles) {
...@@ -2845,7 +2845,7 @@ static struct swap_info_struct *alloc_swap_info(void) ...@@ -2845,7 +2845,7 @@ static struct swap_info_struct *alloc_swap_info(void)
smp_wmb(); smp_wmb();
nr_swapfiles++; nr_swapfiles++;
} else { } else {
kfree(p); kvfree(p);
p = swap_info[type]; p = swap_info[type];
/* /*
* Do not memset this entry: a racing procfs swap_next() * Do not memset this entry: a racing procfs swap_next()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册