4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xishi Qiu <qiuxi...@huawei.com>
commit 6f25a14a7053b69917e2ebea0d31dd444cd31fd5 upstream.
It is incorrect to use next_node to find a target node, it will return
MAX_NUMNODES or invalid node. This will lead to crash in buddy system
allocation.
Fixes: c8721bbbdd36 ("mm: memory-hotplug: enable memory hotplug to handle
hugepage")
Signed-off-by: Xishi Qiu <qiuxi...@huawei.com>
Acked-by: Vlastimil Babka <vba...@suse.cz>
Acked-by: Naoya Horiguchi <n-horigu...@ah.jp.nec.com>
Cc: Joonsoo Kim <js1...@gmail.com>
Cc: David Rientjes <rient...@google.com>
Cc: "Laura Abbott" <lau...@codeaurora.org>
Cc: Hui Zhu <zhu...@xiaomi.com>
Cc: Wang Xiaoqiang <wangx...@lzu.edu.cn>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
mm/page_isolation.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -289,11 +289,11 @@ struct page *alloc_migrate_target(struct
* now as a simple work-around, we use the next node for destination.
*/
if (PageHuge(page)) {
- nodemask_t src = nodemask_of_node(page_to_nid(page));
- nodemask_t dst;
- nodes_complement(dst, src);
+ int node = next_online_node(page_to_nid(page));
+ if (node == MAX_NUMNODES)
+ node = first_online_node;
return alloc_huge_page_node(page_hstate(compound_head(page)),
- next_node(page_to_nid(page), dst));
+ node);
}
if (PageHighMem(page))
