Commit d8569925 authored by Vasily Averin's avatar Vasily Averin Committed by Greg Kroah-Hartman
Browse files

mm/swapfile.c: use kvzalloc for swap_info_struct allocation

commit 873d7bcf 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: default avatarVasily Averin <vvs@virtuozzo.com>
Acked-by: default avatarAaron Lu <aaron.lu@intel.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Huang Ying <ying.huang@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 52fcb8dd
......@@ -2830,7 +2830,7 @@ static struct swap_info_struct *alloc_swap_info(void)
unsigned int type;
int i;
p = kzalloc(sizeof(*p), GFP_KERNEL);
p = kvzalloc(sizeof(*p), GFP_KERNEL);
if (!p)
return ERR_PTR(-ENOMEM);
......@@ -2841,7 +2841,7 @@ static struct swap_info_struct *alloc_swap_info(void)
}
if (type >= MAX_SWAPFILES) {
spin_unlock(&swap_lock);
kfree(p);
kvfree(p);
return ERR_PTR(-EPERM);
}
if (type >= nr_swapfiles) {
......@@ -2855,7 +2855,7 @@ static struct swap_info_struct *alloc_swap_info(void)
smp_wmb();
nr_swapfiles++;
} else {
kfree(p);
kvfree(p);
p = swap_info[type];
/*
* Do not memset this entry: a racing procfs swap_next()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment