Commit 873d7bcf authored by Vasily Averin's avatar Vasily Averin Committed by Linus Torvalds
Browse files

mm/swapfile.c: use kvzalloc for swap_info_struct allocation

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.

Fixes: a2468cc9

 ("swap: choose swap device according to numa node")
Signed-off-by: default avatarVasily Averin <>
Acked-by: default avatarAaron Lu <>
Acked-by: default avatarMichal Hocko <>
Reviewed-by: default avatarAndrew Morton <>
Cc: Huang Ying <>
Cc: <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent f341e16f
......@@ -2813,7 +2813,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);
......@@ -2824,7 +2824,7 @@ static struct swap_info_struct *alloc_swap_info(void)
if (type >= MAX_SWAPFILES) {
return ERR_PTR(-EPERM);
if (type >= nr_swapfiles) {
......@@ -2838,7 +2838,7 @@ static struct swap_info_struct *alloc_swap_info(void)
} else {
p = swap_info[type];
* Do not memset this entry: a racing procfs swap_next()
Supports Markdown
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