mm: khugepaged: allow page allocation fallback to eligible nodes
Subsystems (4)
PATCH v2 1/2 mm: khugepaged: allow page allocation fallback to eligible nodes
Syzbot reported the below splat:
WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 __alloc_pages_node include/linux/gfp.h:221 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Modules linked in: CPU: 1 PID: 3646 Comm: syz-executor210 Not tainted 6.1.0-rc1-syzkaller-00454-ga70385240892 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022 RIP: 0010:__alloc_pages_node include/linux/gfp.h:221 [inline] RIP: 0010:hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] RIP: 0010:alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Code: e5 01 4c 89 ee e8 6e f9 ae ff 4d 85 ed 0f 84 28 fc ff ff e8 70 fc ae ff 48 8d 6b ff 4c 8d 63 07 e9 16 fc ff ff e8 5e fc ae ff <0f> 0b e9 96 fa ff ff 41 bc 1a 00 00 00 e9 86 fd ff ff e8 47 fc ae RSP: 0018:ffffc90003fdf7d8 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff888077f457c0 RSI: ffffffff81cd8f42 RDI: 0000000000000001 RBP: ffff888079388c0c R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: dffffc0000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 00007f6b48ccf700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6b48a819f0 CR3: 00000000171e7000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> collapse_file+0x1ca/0x5780 mm/khugepaged.c:1715 hpage_collapse_scan_file+0xd6c/0x17a0 mm/khugepaged.c:2156 madvise_collapse+0x53a/0xb40 mm/khugepaged.c:2611 madvise_vma_behavior+0xd0a/0x1cc0 mm/madvise.c:1066 madvise_walk_vmas+0x1c7/0x2b0 mm/madvise.c:1240 do_madvise.part.0+0x24a/0x340 mm/madvise.c:1419 do_madvise mm/madvise.c:1432 [inline] __do_sys_madvise mm/madvise.c:1432 [inline] __se_sys_madvise mm/madvise.c:1430 [inline] __x64_sys_madvise+0x113/0x150 mm/madvise.c:1430 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f6b48a4eef9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 15 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f6b48ccf318 EFLAGS: 00000246 ORIG_RAX: 000000000000001c RAX: ffffffffffffffda RBX: 00007f6b48af0048 RCX: 00007f6b48a4eef9 RDX: 0000000000000019 RSI: 0000000000600003 RDI: 0000000020000000 RBP: 00007f6b48af0040 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f6b48aa53a4 R13: 00007f6b48bffcbf R14: 00007f6b48ccf400 R15: 0000000000022000 </TASK>
The khugepaged code would pick up the node with the most hit as the preferred node, and also tries to do some balance if several nodes have the same hit record. Basically it does conceptually:
* If the target_node <= last_target_node, then iterate fromlast_target_node + 1 to MAX_NUMNODES (1024 on default config)
* If the max_value == node_load[nid], then target_node = nid
But there is a corner case, paritucularly for MADV_COLLAPSE, that the non-existing node may be returned as preferred node.
Assuming the system has 2 nodes, the target_node is 0 and the last_target_node is 1, if MADV_COLLAPSE path is hit, the max_value may be 0, then it may return 2 for target_node, but it is actually not existing (offline), so the warn is triggered.
The node balance was introduced by commit 9f1b868a13ac ("mm: thp:
khugepaged: add policy for finding target node") to satisfy "numactl --interleave=all". But interleaving is a mere hint rather than something that has hard requirements.
So use nodemask to record the nodes which have the same hit record, the hugepage allocation could fallback to those nodes. And remove __GFP_THISNODE since it does disallow fallback. And if nodemask is empty (no node is set), it means there is one single node has the most hist record, the nodemask approach actually behaves like __GFP_THISNODE.
--- mm/khugepaged.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)
mm/khugepaged.c +14 -18
@@ -97,8 +97,8 @@ struct collapse_control {/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ]; -/* Last target selected in hpage_collapse_find_target_node() */ -int last_target_node; +/* nodemask for allocation fallback */ +nodemask_t alloc_nmask; };/**
@@ -734,7 +734,6 @@ static void khugepaged_alloc_sleep(void)struct collapse_control khugepaged_collapse_control = { .is_khugepaged = true, - .last_target_node =NUMA_NO_NODE , };static bool hpage_collapse_scan_abort (int nid,struct collapse_control *cc)
@@ -783,16 +782,11 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) target_node = nid; } -/* do some balance if several nodes have the same hit record */ -if (target_node <= cc->last_target_node) -for (nid = cc->last_target_node +1 ; nid <MAX_NUMNODES ; - nid++) -if (max_value == cc->node_load[nid]) { - target_node = nid; -break ; - } +for_each_online_node (nid) { +if (max_value == cc->node_load[nid]) +node_set (nid, cc->alloc_nmask); + } - cc->last_target_node = target_node;return target_node; }#else
@@ -802,9 +796,10 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) }#endif -static bool hpage_collapse_alloc_page (struct page **hpage,gfp_t gfp,int node) +static bool hpage_collapse_alloc_page (struct page **hpage,gfp_t gfp,int node, +nodemask_t *nmask) { - *hpage =__alloc_pages_node (node, gfp,HPAGE_PMD_ORDER ); + *hpage =__alloc_pages (gfp,HPAGE_PMD_ORDER , node, nmask);if (unlikely (!*hpage)) {count_vm_event (THP_COLLAPSE_ALLOC_FAILED );return false;
@@ -955,12 +950,11 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm,static int alloc_charge_hpage (struct page **hpage,struct mm_struct *mm,struct collapse_control *cc) { -/* Only allocate from the target node */ gfp_t gfp = (cc->is_khugepaged ?alloc_hugepage_khugepaged_gfpmask () : -GFP_TRANSHUGE ) | __GFP_THISNODE; +GFP_TRANSHUGE );int node =hpage_collapse_find_target_node (cc); -if (!hpage_collapse_alloc_page (hpage, gfp, node)) +if (!hpage_collapse_alloc_page (hpage, gfp, node, &cc->alloc_nmask))return SCAN_ALLOC_HUGE_PAGE_FAIL ;if (unlikely (mem_cgroup_charge (page_folio (*hpage), mm, gfp)))return SCAN_CGROUP_CHARGE_FAIL ;
@@ -1144,6 +1138,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, goto out;memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask); pte =pte_offset_map_lock (mm, pmd, address, &ptl);for (_address = address, _pte = pte; _pte < pte +HPAGE_PMD_NR ; _pte++, _address +=PAGE_SIZE ) {
@@ -2078,6 +2073,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, present =0 ; swap =0 ;memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask);rcu_read_lock ();xas_for_each (&xas, page, start +HPAGE_PMD_NR -1 ) {if (xas_retry (&xas, page))
@@ -2581,7 +2577,6 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev,if (!cc)return -ENOMEM ; cc->is_khugepaged = false; - cc->last_target_node =NUMA_NO_NODE ;mmgrab (mm);lru_add_drain_all ();
@@ -2607,6 +2602,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, }mmap_assert_locked (mm);memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask);if (IS_ENABLED (CONFIG_SHMEM ) && vma->vm_file) {struct file *file =get_file (vma->vm_file);pgoff_t pgoff =linear_page_index (vma, addr);
Signature · 1 line
2.26.3
PATCH v2 2/2 mm: don't warn if the node is offlined
Syzbot reported the below splat:
WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 __alloc_pages_node include/linux/gfp.h:221 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Modules linked in: CPU: 1 PID: 3646 Comm: syz-executor210 Not tainted 6.1.0-rc1-syzkaller-00454-ga70385240892 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022 RIP: 0010:__alloc_pages_node include/linux/gfp.h:221 [inline] RIP: 0010:hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] RIP: 0010:alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Code: e5 01 4c 89 ee e8 6e f9 ae ff 4d 85 ed 0f 84 28 fc ff ff e8 70 fc ae ff 48 8d 6b ff 4c 8d 63 07 e9 16 fc ff ff e8 5e fc ae ff <0f> 0b e9 96 fa ff ff 41 bc 1a 00 00 00 e9 86 fd ff ff e8 47 fc ae RSP: 0018:ffffc90003fdf7d8 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff888077f457c0 RSI: ffffffff81cd8f42 RDI: 0000000000000001 RBP: ffff888079388c0c R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: dffffc0000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 00007f6b48ccf700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6b48a819f0 CR3: 00000000171e7000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> collapse_file+0x1ca/0x5780 mm/khugepaged.c:1715 hpage_collapse_scan_file+0xd6c/0x17a0 mm/khugepaged.c:2156 madvise_collapse+0x53a/0xb40 mm/khugepaged.c:2611 madvise_vma_behavior+0xd0a/0x1cc0 mm/madvise.c:1066 madvise_walk_vmas+0x1c7/0x2b0 mm/madvise.c:1240 do_madvise.part.0+0x24a/0x340 mm/madvise.c:1419 do_madvise mm/madvise.c:1432 [inline] __do_sys_madvise mm/madvise.c:1432 [inline] __se_sys_madvise mm/madvise.c:1430 [inline] __x64_sys_madvise+0x113/0x150 mm/madvise.c:1430 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f6b48a4eef9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 15 00 00 90 48 89 f8 48 89
f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f6b48ccf318 EFLAGS: 00000246 ORIG_RAX: 000000000000001c
RAX: ffffffffffffffda RBX: 00007f6b48af0048 RCX: 00007f6b48a4eef9
RDX: 0000000000000019 RSI: 0000000000600003 RDI: 0000000020000000
RBP: 00007f6b48af0040 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f6b48aa53a4
R13: 00007f6b48bffcbf R14: 00007f6b48ccf400 R15: 0000000000022000
</TASK>
It is because khugepaged allocates pages with __GFP_THISNODE, but the preferred node is offlined. The previous patch fixed the khugepaged code to avoid allocating page from non-existing node. But it is still racy against memory hotremove. There is no synchronization with the memory hotplug so it is possible that memory gets offline during a longer taking scanning.
So this warning still seems not quite helpful because:
* There is no guarantee the node is online for __GFP_THISNODE context for all the callsites.
* Kernel just fails the allocation regardless the warning, and it looks all callsites handle the allocation failure gracefully.
It is actually even harmful for those running in panic-on-warn mode. So removing the warning seems like a good move.
---
v2: * Added patch 1/2.
* Reworded the commit log per Michal.
include/linux/gfp.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/gfp.h +0 -2
@@ -218,7 +218,6 @@ static inline struct page * __alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order) { VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES); -VM_WARN_ON ((gfp_mask & __GFP_THISNODE) && !node_online (nid));return __alloc_pages (gfp_mask, order, nid,NULL ); }
@@ -227,7 +226,6 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid));return __folio_alloc (gfp, order, nid,NULL ); }
Signature · 1 line
2.26.3
Michal Hocko
reviewerRe: [v2 PATCH 2/2] mm: don't warn if the node is offlined
Quoted 56 lines · Yang Shi
Syzbot reported the below splat:
WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 __alloc_pages_node include/linux/gfp.h:221 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Modules linked in: CPU: 1 PID: 3646 Comm: syz-executor210 Not tainted 6.1.0-rc1-syzkaller-00454-ga70385240892 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022 RIP: 0010:__alloc_pages_node include/linux/gfp.h:221 [inline] RIP: 0010:hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] RIP: 0010:alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Code: e5 01 4c 89 ee e8 6e f9 ae ff 4d 85 ed 0f 84 28 fc ff ff e8 70 fc ae ff 48 8d 6b ff 4c 8d 63 07 e9 16 fc ff ff e8 5e fc ae ff <0f> 0b e9 96 fa ff ff 41 bc 1a 00 00 00 e9 86 fd ff ff e8 47 fc ae RSP: 0018:ffffc90003fdf7d8 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff888077f457c0 RSI: ffffffff81cd8f42 RDI: 0000000000000001 RBP: ffff888079388c0c R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: dffffc0000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 00007f6b48ccf700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6b48a819f0 CR3: 00000000171e7000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> collapse_file+0x1ca/0x5780 mm/khugepaged.c:1715 hpage_collapse_scan_file+0xd6c/0x17a0 mm/khugepaged.c:2156 madvise_collapse+0x53a/0xb40 mm/khugepaged.c:2611 madvise_vma_behavior+0xd0a/0x1cc0 mm/madvise.c:1066 madvise_walk_vmas+0x1c7/0x2b0 mm/madvise.c:1240 do_madvise.part.0+0x24a/0x340 mm/madvise.c:1419 do_madvise mm/madvise.c:1432 [inline] __do_sys_madvise mm/madvise.c:1432 [inline] __se_sys_madvise mm/madvise.c:1430 [inline] __x64_sys_madvise+0x113/0x150 mm/madvise.c:1430 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f6b48a4eef9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 15 00 00 90 48 89 f8 48 89f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f6b48ccf318 EFLAGS: 00000246ORIG_RAX:000000000000001c
RAX: ffffffffffffffda RBX:00007f6b48af0048RCX:00007f6b48a4eef9
RDX: 0000000000000019 RSI: 0000000000600003 RDI: 0000000020000000
RBP:00007f6b48af0040R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12:00007f6b48aa53a4
R13:00007f6b48bffcbfR14:00007f6b48ccf400R15: 0000000000022000
Quoted 4 lines
</TASK>It is because khugepaged allocates pages with
__GFP_THISNODE, but the preferred node is offlined. The previous patch fixed the khugepaged
I would go and call it out s@offlined@bogus@
Quoted 5 lines
code to avoid allocating page from non-existing node. But it is still racy against memory hotremove. There is no synchronization with the memory hotplug so it is possible that memory gets offline during a longer taking scanning.
Quoted 8 lines
So this warning still seems not quite helpful because:
* There is no guarantee the node is online for__GFP_THISNODEcontext for all the callsites.
* Kernel just fails the allocation regardless the warning, and it looks all callsites handle the allocation failure gracefully.It is actually even harmful for those running in panic-on-warn mode. So removing the warning seems like a good move.
And I would rephrased this as well to:
So while the warning has helped to identify a buggy code it is not safe in general and this warning could panic the system with panic-on-warn configuration which tends to be used surprisingly often.
Quoted 4 lines
Reported-by [email protected]Signed-off-by Yang Shi <[email protected]>Reviewed-by Zach O'Keefe <[email protected]>Acked-by Michal Hocko <[email protected]>
Btw. while you are at it. Considering the warning has helped to identify a buggy code, do you think it would make sense to chage it to
---
include/linux/gfp.h +4 -1
@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) { +pr_warn ("%pGg allocation from offline node %d\n" , &gfp, nid); +dump_stack (); + }return __folio_alloc (gfp, order, nid,NULL ); }
Signature · 2 lines
Michal Hocko SUSE Labs
Michal Hocko
reviewerRe: [v2 PATCH 2/2] mm: don't warn if the node is offlined
On Fri 04-11-22 10:35:21, Michal Hocko wrote:
[...]
include/linux/gfp.h static inline · line 230
Quoted 10 lines
include/linux/gfp.h +1
-1@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) {
or maybe even better
if ((gfp & (__GFP_THISNODE|__GFP_NOWARN) == __GFP_THISNODE|__GFP_NOWARN) && !node_online(nid))
because it doesn't really make much sense to dump this information if the allocation failure is going to provide sufficient (and even more comprehensive) context for the failure. It looks more hairy but this can be hidden in a nice little helper shared between the two callers.
Quoted 9 lines
include/linux/gfp.h +3
-0+pr_warn ("%pGg allocation from offline node %d\n" , &gfp, nid); +dump_stack (); + }return __folio_alloc (gfp, order, nid,NULL ); }Signature · 2 lines
Michal Hocko SUSE Labs
Signature · 2 lines
Michal Hocko SUSE Labs
Re: [v2 PATCH 2/2] mm: don't warn if the node is offlined
Quoted 15 lines · Michal Hocko
On Fri 04-11-22 10:35:21, Michal Hocko wrote:
[...]include/linux/gfp.h static inline · line 230
Quoted 10 lines
include/linux/gfp.h +1
-1@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) {or maybe even better
Quoted 6 lines
if ((gfp & (__GFP_THISNODE|__GFP_NOWARN) == __GFP_THISNODE|__GFP_NOWARN) && !node_online(nid))because it doesn't really make much sense to dump this information if the allocation failure is going to provide sufficient (and even more comprehensive) context for the failure. It looks more hairy but this can be hidden in a nice little helper shared between the two callers.
Thanks a lot for the suggestion, printing warning if the gfp flag allows sounds like a good idea to me. Will adopt it. But the check should look like:
if ((gfp & __GFP_THISNODE) && !(gfp & __GFP_NOWARN) && !node_online(nid))
Quoted 14 lines
Quoted 10 lines
include/linux/gfp.h +3
-1+pr_warn ("%pGg allocation from offline node %d\n" , &gfp, nid); +dump_stack (); + }return __folio_alloc (gfp, order, nid,NULL ); } --Michal Hocko
SUSE Labs--
Michal Hocko
SUSE Labs
Michal Hocko
reviewerRe: [v2 PATCH 2/2] mm: don't warn if the node is offlined
Quoted 23 lines · Yang Shi
Quoted 15 lines · Michal Hocko
On Fri 04-11-22 10:35:21, Michal Hocko wrote:
[...]include/linux/gfp.h static inline · line 230
Quoted 10 lines
include/linux/gfp.h +1
-1@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) {or maybe even better
Quoted 6 lines
if ((gfp & (__GFP_THISNODE|__GFP_NOWARN) == __GFP_THISNODE|__GFP_NOWARN) && !node_online(nid))because it doesn't really make much sense to dump this information if the allocation failure is going to provide sufficient (and even more comprehensive) context for the failure. It looks more hairy but this can be hidden in a nice little helper shared between the two callers.
Quoted 5 lines
Thanks a lot for the suggestion, printing warning if the gfp flag allows sounds like a good idea to me. Will adopt it. But the check should look like:
if ((gfp &
__GFP_THISNODE) && !(gfp &__GFP_NOWARN) && !node_online(nid))
The idea was to warn if __GFP_NOWARN _was_ specified. Otherwise we will get an allocation failure splat from the page allocator and there it will be clear that the node doesn't have any memory associated. It is exactly __GFP_NOWARN case that would be a silent failure and potentially a buggy code (like this THP collapse path). See my point?
Signature · 2 lines
Michal Hocko SUSE Labs
Re: [v2 PATCH 2/2] mm: don't warn if the node is offlined
Quoted 29 lines · Michal Hocko
Quoted 27 lines · Yang Shi
Quoted 15 lines · Michal Hocko
On Fri 04-11-22 10:35:21, Michal Hocko wrote:
[...]include/linux/gfp.h static inline · line 230
Quoted 10 lines
include/linux/gfp.h +1
-1@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) {or maybe even better
Quoted 6 lines
if ((gfp & (__GFP_THISNODE|__GFP_NOWARN) == __GFP_THISNODE|__GFP_NOWARN) && !node_online(nid))because it doesn't really make much sense to dump this information if the allocation failure is going to provide sufficient (and even more comprehensive) context for the failure. It looks more hairy but this can be hidden in a nice little helper shared between the two callers.
Thanks a lot for the suggestion, printing warning if the gfp flag allows sounds like a good idea to me. Will adopt it. But the check should look like:
Quoted 7 lines
Quoted 1 line
if ((gfp &
__GFP_THISNODE) && !(gfp &__GFP_NOWARN) && !node_online(nid))The idea was to warn if
__GFP_NOWARN_was_ specified. Otherwise we will get an allocation failure splat from the page allocator and there it will be clear that the node doesn't have any memory associated. It is exactly__GFP_NOWARNcase that would be a silent failure and potentially a buggy code (like this THP collapse path). See my point?
Aha, yeah, see your point now. I didn't see the splat from the allocator from the bug report, then I realized it had not called into allocator yet before the warning was triggered.
Quoted 3 lines
--
Michal Hocko
SUSE Labs
Michal Hocko
reviewerRe: [v2 PATCH 2/2] mm: don't warn if the node is offlined
Quoted 38 lines · Yang Shi
Quoted 29 lines · Michal Hocko
Quoted 27 lines · Yang Shi
Quoted 15 lines · Michal Hocko
On Fri 04-11-22 10:35:21, Michal Hocko wrote:
[...]include/linux/gfp.h static inline · line 230
Quoted 10 lines
include/linux/gfp.h +1
-1@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) {or maybe even better
Quoted 6 lines
if ((gfp & (__GFP_THISNODE|__GFP_NOWARN) == __GFP_THISNODE|__GFP_NOWARN) && !node_online(nid))because it doesn't really make much sense to dump this information if the allocation failure is going to provide sufficient (and even more comprehensive) context for the failure. It looks more hairy but this can be hidden in a nice little helper shared between the two callers.
Thanks a lot for the suggestion, printing warning if the gfp flag allows sounds like a good idea to me. Will adopt it. But the check should look like:
Quoted 7 lines
Quoted 1 line
if ((gfp &
__GFP_THISNODE) && !(gfp &__GFP_NOWARN) && !node_online(nid))The idea was to warn if
__GFP_NOWARN_was_ specified. Otherwise we will get an allocation failure splat from the page allocator and there it will be clear that the node doesn't have any memory associated. It is exactly__GFP_NOWARNcase that would be a silent failure and potentially a buggy code (like this THP collapse path). See my point?
Quoted 3 lines
Aha, yeah, see your point now. I didn't see the splat from the allocator from the bug report, then I realized it had not called into allocator yet before the warning was triggered.
And it would trigger even if it did because GFP_TRANSHUGE has __GFP_NOWARN
Signature · 2 lines
Michal Hocko SUSE Labs
Re: [v2 PATCH 2/2] mm: don't warn if the node is offlined
Quoted 40 lines · Michal Hocko
Quoted 38 lines · Yang Shi
Quoted 36 lines · Michal Hocko
Quoted 23 lines · Yang Shi
Quoted 15 lines · Michal Hocko
On Fri 04-11-22 10:35:21, Michal Hocko wrote:
[...]include/linux/gfp.h static inline · line 230
Quoted 10 lines
include/linux/gfp.h +1
-1@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) {or maybe even better
Quoted 6 lines
if ((gfp & (__GFP_THISNODE|__GFP_NOWARN) == __GFP_THISNODE|__GFP_NOWARN) && !node_online(nid))because it doesn't really make much sense to dump this information if the allocation failure is going to provide sufficient (and even more comprehensive) context for the failure. It looks more hairy but this can be hidden in a nice little helper shared between the two callers.
Quoted 5 lines
Thanks a lot for the suggestion, printing warning if the gfp flag allows sounds like a good idea to me. Will adopt it. But the check should look like:
if ((gfp &
__GFP_THISNODE) && !(gfp &__GFP_NOWARN) && !node_online(nid))The idea was to warn if
__GFP_NOWARN_was_ specified. Otherwise we will get an allocation failure splat from the page allocator and there it will be clear that the node doesn't have any memory associated. It is exactly__GFP_NOWARNcase that would be a silent failure and potentially a buggy code (like this THP collapse path). See my point?
Quoted 6 lines
Quoted 3 lines
Aha, yeah, see your point now. I didn't see the splat from the allocator from the bug report, then I realized it had not called into allocator yet before the warning was triggered.
And it would trigger even if it did because
GFP_TRANSHUGEhas__GFP_NOWARN
Yeah, the syzbot has panic on warn set, so kernel just panicked before entering the allocator.
Quoted 3 lines
--
Michal Hocko
SUSE Labs
Re: [v2 PATCH 2/2] mm: don't warn if the node is offlined
Quoted 45 lines · Yang Shi
Quoted 44 lines · Michal Hocko
Quoted 41 lines · Yang Shi
Quoted 29 lines · Michal Hocko
Quoted 27 lines · Yang Shi
Quoted 15 lines · Michal Hocko
On Fri 04-11-22 10:35:21, Michal Hocko wrote:
[...]include/linux/gfp.h static inline · line 230
Quoted 10 lines
include/linux/gfp.h +1
-1@@ -227,7 +227,10 @@ static inlinestruct folio *__folio_alloc_node (gfp_t gfp,unsigned int order,int nid) {VM_BUG_ON (nid <0 || nid >=MAX_NUMNODES ); -VM_WARN_ON ((gfp & __GFP_THISNODE) && !node_online (nid)); +if ((gfp & __GFP_THISNODE) && !node_online (nid)) {or maybe even better
Quoted 6 lines
if ((gfp & (__GFP_THISNODE|__GFP_NOWARN) == __GFP_THISNODE|__GFP_NOWARN) && !node_online(nid))because it doesn't really make much sense to dump this information if the allocation failure is going to provide sufficient (and even more comprehensive) context for the failure. It looks more hairy but this can be hidden in a nice little helper shared between the two callers.
Thanks a lot for the suggestion, printing warning if the gfp flag allows sounds like a good idea to me. Will adopt it. But the check should look like:
Quoted 7 lines
Quoted 1 line
if ((gfp &
__GFP_THISNODE) && !(gfp &__GFP_NOWARN) && !node_online(nid))The idea was to warn if
__GFP_NOWARN_was_ specified. Otherwise we will get an allocation failure splat from the page allocator and there it will be clear that the node doesn't have any memory associated. It is exactly__GFP_NOWARNcase that would be a silent failure and potentially a buggy code (like this THP collapse path). See my point?Aha, yeah, see your point now. I didn't see the splat from the allocator from the bug report, then I realized it had not called into allocator yet before the warning was triggered.
Quoted 6 lines
Quoted 2 lines
And it would trigger even if it did because
GFP_TRANSHUGEhas__GFP_NOWARNYeah, the syzbot has panic on warn set, so kernel just panicked before entering the allocator.
Sorry I'm late to the party here. I think Michal's suggestion is sound -- catches instances like we saw with MADV_COLLAPSE, but no risk of panic-on-warn. Thanks for the suggestion.
Best,
Zach
Quoted 3 lines
Quoted 3 lines
--
Michal Hocko
SUSE Labs
Quoted 74 lines · Yang Shi
Syzbot reported the below splat:
WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 __alloc_pages_node include/linux/gfp.h:221 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Modules linked in: CPU: 1 PID: 3646 Comm: syz-executor210 Not tainted 6.1.0-rc1-syzkaller-00454-ga70385240892 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022 RIP: 0010:__alloc_pages_node include/linux/gfp.h:221 [inline] RIP: 0010:hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] RIP: 0010:alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Code: e5 01 4c 89 ee e8 6e f9 ae ff 4d 85 ed 0f 84 28 fc ff ff e8 70 fc ae ff 48 8d 6b ff 4c 8d 63 07 e9 16 fc ff ff e8 5e fc ae ff <0f> 0b e9 96 fa ff ff 41 bc 1a 00 00 00 e9 86 fd ff ff e8 47 fc ae RSP: 0018:ffffc90003fdf7d8 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff888077f457c0 RSI: ffffffff81cd8f42 RDI: 0000000000000001 RBP: ffff888079388c0c R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: dffffc0000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 00007f6b48ccf700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6b48a819f0 CR3: 00000000171e7000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> collapse_file+0x1ca/0x5780 mm/khugepaged.c:1715 hpage_collapse_scan_file+0xd6c/0x17a0 mm/khugepaged.c:2156 madvise_collapse+0x53a/0xb40 mm/khugepaged.c:2611 madvise_vma_behavior+0xd0a/0x1cc0 mm/madvise.c:1066 madvise_walk_vmas+0x1c7/0x2b0 mm/madvise.c:1240 do_madvise.part.0+0x24a/0x340 mm/madvise.c:1419 do_madvise mm/madvise.c:1432 [inline] __do_sys_madvise mm/madvise.c:1432 [inline] __se_sys_madvise mm/madvise.c:1430 [inline] __x64_sys_madvise+0x113/0x150 mm/madvise.c:1430 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f6b48a4eef9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 15 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f6b48ccf318 EFLAGS: 00000246 ORIG_RAX: 000000000000001c RAX: ffffffffffffffda RBX: 00007f6b48af0048 RCX: 00007f6b48a4eef9 RDX: 0000000000000019 RSI: 0000000000600003 RDI: 0000000020000000 RBP: 00007f6b48af0040 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f6b48aa53a4 R13: 00007f6b48bffcbf R14: 00007f6b48ccf400 R15: 0000000000022000 </TASK>The khugepaged code would pick up the node with the most hit as the preferred node, and also tries to do some balance if several nodes have the same hit record. Basically it does conceptually:
* If thetarget_node<=last_target_node, then iterate fromlast_target_node+ 1 toMAX_NUMNODES(1024 on default config)
* If themax_value== node_load[nid], thentarget_node= nidBut there is a corner case, paritucularly for
MADV_COLLAPSE, that the non-existing node may be returned as preferred node.Assuming the system has 2 nodes, the
target_nodeis 0 and thelast_target_nodeis 1, ifMADV_COLLAPSEpath is hit, themax_valuemay be 0, then it may return 2 fortarget_node, but it is actually not existing (offline), so the warn is triggered.The node balance was introduced by commit
9f1b868a13ac("mm: thp:
khugepaged: add policy for finding target node") to satisfy "numactl --interleave=all". But interleaving is a mere hint rather than something that has hard requirements.So use nodemask to record the nodes which have the same hit record, the hugepage allocation could fallback to those nodes. And remove
__GFP_THISNODEsince it does disallow fallback. And if nodemask is empty (no node is set), it means there is one single node has the most hist record, the nodemask approach actually behaves like__GFP_THISNODE.
Quoted 4 lines
Reported-by [email protected]Suggested-by Zach O'Keefe <[email protected]>Suggested-by Michal Hocko <[email protected]>Signed-off-by Yang Shi <[email protected]>
Quoted 111 lines
--- mm/khugepaged.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)mm/khugepaged.c +14
-18@@ -97,8 +97,8 @@ struct collapse_control {/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ]; -/* Last target selected in hpage_collapse_find_target_node() */ -int last_target_node; +/* nodemask for allocation fallback */ +nodemask_t alloc_nmask; };/** @@ -734,7 +734,6 @@ static void khugepaged_alloc_sleep(void)struct collapse_control khugepaged_collapse_control = { .is_khugepaged = true, - .last_target_node =NUMA_NO_NODE , };static bool hpage_collapse_scan_abort (int nid,struct collapse_control *cc)@@ -783,16 +782,11 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) target_node = nid; } -/* do some balance if several nodes have the same hit record */ -if (target_node <= cc->last_target_node) -for (nid = cc->last_target_node +1 ; nid <MAX_NUMNODES ; - nid++) -if (max_value == cc->node_load[nid]) { - target_node = nid; -break ; - } +for_each_online_node (nid) { +if (max_value == cc->node_load[nid]) +node_set (nid, cc->alloc_nmask); + } - cc->last_target_node = target_node;return target_node; }#else @@ -802,9 +796,10 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) }#endif -static bool hpage_collapse_alloc_page (struct page **hpage,gfp_t gfp,int node) +static bool hpage_collapse_alloc_page (struct page **hpage,gfp_t gfp,int node, +nodemask_t *nmask) { - *hpage =__alloc_pages_node (node, gfp,HPAGE_PMD_ORDER ); + *hpage =__alloc_pages (gfp,HPAGE_PMD_ORDER , node, nmask);if (unlikely (!*hpage)) {count_vm_event (THP_COLLAPSE_ALLOC_FAILED );return false;@@ -955,12 +950,11 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm,static int alloc_charge_hpage (struct page **hpage,struct mm_struct *mm,struct collapse_control *cc) { -/* Only allocate from the target node */ gfp_t gfp = (cc->is_khugepaged ?alloc_hugepage_khugepaged_gfpmask () : -GFP_TRANSHUGE ) | __GFP_THISNODE; +GFP_TRANSHUGE );int node =hpage_collapse_find_target_node (cc); -if (!hpage_collapse_alloc_page (hpage, gfp, node)) +if (!hpage_collapse_alloc_page (hpage, gfp, node, &cc->alloc_nmask))return SCAN_ALLOC_HUGE_PAGE_FAIL ;if (unlikely (mem_cgroup_charge (page_folio (*hpage), mm, gfp)))return SCAN_CGROUP_CHARGE_FAIL ;@@ -1144,6 +1138,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, goto out;memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask); pte =pte_offset_map_lock (mm, pmd, address, &ptl);for (_address = address, _pte = pte; _pte < pte +HPAGE_PMD_NR ; _pte++, _address +=PAGE_SIZE ) {@@ -2078,6 +2073,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, present =0 ; swap =0 ;memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask);rcu_read_lock ();xas_for_each (&xas, page, start +HPAGE_PMD_NR -1 ) {if (xas_retry (&xas, page))@@ -2581,7 +2577,6 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev,if (!cc)return -ENOMEM ; cc->is_khugepaged = false; - cc->last_target_node =NUMA_NO_NODE ;mmgrab (mm);lru_add_drain_all ();@@ -2607,6 +2602,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, }mmap_assert_locked (mm);memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask);if (IS_ENABLED (CONFIG_SHMEM ) && vma->vm_file) {struct file *file =get_file (vma->vm_file);pgoff_t pgoff =linear_page_index (vma, addr);Signature · 1 line
2.26.3
Thanks for the patch, Yang! Looks good. khugepaged selftest is good too.
Quoted 76 lines · Zach O'Keefe
Quoted 74 lines · Yang Shi
Syzbot reported the below splat:
WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 __alloc_pages_node include/linux/gfp.h:221 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] WARNING: CPU: 1 PID: 3646 at include/linux/gfp.h:221 alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Modules linked in: CPU: 1 PID: 3646 Comm: syz-executor210 Not tainted 6.1.0-rc1-syzkaller-00454-ga70385240892 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022 RIP: 0010:__alloc_pages_node include/linux/gfp.h:221 [inline] RIP: 0010:hpage_collapse_alloc_page mm/khugepaged.c:807 [inline] RIP: 0010:alloc_charge_hpage+0x802/0xaa0 mm/khugepaged.c:963 Code: e5 01 4c 89 ee e8 6e f9 ae ff 4d 85 ed 0f 84 28 fc ff ff e8 70 fc ae ff 48 8d 6b ff 4c 8d 63 07 e9 16 fc ff ff e8 5e fc ae ff <0f> 0b e9 96 fa ff ff 41 bc 1a 00 00 00 e9 86 fd ff ff e8 47 fc ae RSP: 0018:ffffc90003fdf7d8 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff888077f457c0 RSI: ffffffff81cd8f42 RDI: 0000000000000001 RBP: ffff888079388c0c R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: dffffc0000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 00007f6b48ccf700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6b48a819f0 CR3: 00000000171e7000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> collapse_file+0x1ca/0x5780 mm/khugepaged.c:1715 hpage_collapse_scan_file+0xd6c/0x17a0 mm/khugepaged.c:2156 madvise_collapse+0x53a/0xb40 mm/khugepaged.c:2611 madvise_vma_behavior+0xd0a/0x1cc0 mm/madvise.c:1066 madvise_walk_vmas+0x1c7/0x2b0 mm/madvise.c:1240 do_madvise.part.0+0x24a/0x340 mm/madvise.c:1419 do_madvise mm/madvise.c:1432 [inline] __do_sys_madvise mm/madvise.c:1432 [inline] __se_sys_madvise mm/madvise.c:1430 [inline] __x64_sys_madvise+0x113/0x150 mm/madvise.c:1430 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f6b48a4eef9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 15 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f6b48ccf318 EFLAGS: 00000246 ORIG_RAX: 000000000000001c RAX: ffffffffffffffda RBX: 00007f6b48af0048 RCX: 00007f6b48a4eef9 RDX: 0000000000000019 RSI: 0000000000600003 RDI: 0000000020000000 RBP: 00007f6b48af0040 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f6b48aa53a4 R13: 00007f6b48bffcbf R14: 00007f6b48ccf400 R15: 0000000000022000 </TASK>The khugepaged code would pick up the node with the most hit as the preferred node, and also tries to do some balance if several nodes have the same hit record. Basically it does conceptually:
* If thetarget_node<=last_target_node, then iterate fromlast_target_node+ 1 toMAX_NUMNODES(1024 on default config)
* If themax_value== node_load[nid], thentarget_node= nidBut there is a corner case, paritucularly for
MADV_COLLAPSE, that the non-existing node may be returned as preferred node.Assuming the system has 2 nodes, the
target_nodeis 0 and thelast_target_nodeis 1, ifMADV_COLLAPSEpath is hit, themax_valuemay be 0, then it may return 2 fortarget_node, but it is actually not existing (offline), so the warn is triggered.The node balance was introduced by commit
9f1b868a13ac("mm: thp:
khugepaged: add policy for finding target node") to satisfy "numactl --interleave=all". But interleaving is a mere hint rather than something that has hard requirements.So use nodemask to record the nodes which have the same hit record, the hugepage allocation could fallback to those nodes. And remove
__GFP_THISNODEsince it does disallow fallback. And if nodemask is empty (no node is set), it means there is one single node has the most hist record, the nodemask approach actually behaves like__GFP_THISNODE.
Quoted 6 lines
Quoted 4 lines
Reported-by [email protected]Suggested-by Zach O'Keefe <[email protected]>Suggested-by Michal Hocko <[email protected]>Signed-off-by Yang Shi <[email protected]>Reviewed-by Zach O'Keefe <[email protected]>
Thanks.
Quoted 99 lines
Quoted 99 lines
--- mm/khugepaged.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)mm/khugepaged.c +13
-18@@ -97,8 +97,8 @@ struct collapse_control {/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ]; -/* Last target selected in hpage_collapse_find_target_node() */ -int last_target_node; +/* nodemask for allocation fallback */ +nodemask_t alloc_nmask; };/** @@ -734,7 +734,6 @@ static void khugepaged_alloc_sleep(void)struct collapse_control khugepaged_collapse_control = { .is_khugepaged = true, - .last_target_node =NUMA_NO_NODE , };static bool hpage_collapse_scan_abort (int nid,struct collapse_control *cc)@@ -783,16 +782,11 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) target_node = nid; } -/* do some balance if several nodes have the same hit record */ -if (target_node <= cc->last_target_node) -for (nid = cc->last_target_node +1 ; nid <MAX_NUMNODES ; - nid++) -if (max_value == cc->node_load[nid]) { - target_node = nid; -break ; - } +for_each_online_node (nid) { +if (max_value == cc->node_load[nid]) +node_set (nid, cc->alloc_nmask); + } - cc->last_target_node = target_node;return target_node; }#else @@ -802,9 +796,10 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) }#endif -static bool hpage_collapse_alloc_page (struct page **hpage,gfp_t gfp,int node) +static bool hpage_collapse_alloc_page (struct page **hpage,gfp_t gfp,int node, +nodemask_t *nmask) { - *hpage =__alloc_pages_node (node, gfp,HPAGE_PMD_ORDER ); + *hpage =__alloc_pages (gfp,HPAGE_PMD_ORDER , node, nmask);if (unlikely (!*hpage)) {count_vm_event (THP_COLLAPSE_ALLOC_FAILED );return false;@@ -955,12 +950,11 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm,static int alloc_charge_hpage (struct page **hpage,struct mm_struct *mm,struct collapse_control *cc) { -/* Only allocate from the target node */ gfp_t gfp = (cc->is_khugepaged ?alloc_hugepage_khugepaged_gfpmask () : -GFP_TRANSHUGE ) | __GFP_THISNODE; +GFP_TRANSHUGE );int node =hpage_collapse_find_target_node (cc); -if (!hpage_collapse_alloc_page (hpage, gfp, node)) +if (!hpage_collapse_alloc_page (hpage, gfp, node, &cc->alloc_nmask))return SCAN_ALLOC_HUGE_PAGE_FAIL ;if (unlikely (mem_cgroup_charge (page_folio (*hpage), mm, gfp)))return SCAN_CGROUP_CHARGE_FAIL ;@@ -1144,6 +1138,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, goto out;memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask); pte =pte_offset_map_lock (mm, pmd, address, &ptl);for (_address = address, _pte = pte; _pte < pte +HPAGE_PMD_NR ; _pte++, _address +=PAGE_SIZE ) {@@ -2078,6 +2073,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, present =0 ; swap =0 ;memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask);rcu_read_lock ();xas_for_each (&xas, page, start +HPAGE_PMD_NR -1 ) {if (xas_retry (&xas, page))@@ -2581,7 +2577,6 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev,if (!cc)return -ENOMEM ; cc->is_khugepaged = false; - cc->last_target_node =NUMA_NO_NODE ;
Quoted 15 lines
Quoted 11 lines
mm/khugepaged.c +1
-1mmgrab (mm);lru_add_drain_all ();@@ -2607,6 +2602,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, }mmap_assert_locked (mm);memset (cc->node_load,0 ,sizeof (cc->node_load)); +nodes_clear (cc->alloc_nmask);if (IS_ENABLED (CONFIG_SHMEM ) && vma->vm_file) {struct file *file =get_file (vma->vm_file);pgoff_t pgoff =linear_page_index (vma, addr); --Quoted 2 lines
2.26.3
Thanks for the patch, Yang! Looks good. khugepaged selftest is good too.
Thanks for running the test. I ran it too.
Michal Hocko
reviewerOn Thu 03-11-22 14:36:40, Yang Shi wrote:
[...]
Quoted 19 lines
So use nodemask to record the nodes which have the same hit record, the hugepage allocation could fallback to those nodes. And remove
__GFP_THISNODEsince it does disallow fallback. And if nodemask is empty (no node is set), it means there is one single node has the most hist record, the nodemask approach actually behaves like__GFP_THISNODE.Reported-by [email protected]Suggested-by Zach O'Keefe <[email protected]>Suggested-by Michal Hocko <[email protected]>Signed-off-by Yang Shi <[email protected]>--- mm/khugepaged.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)mm/khugepaged.c +0
-0
mm/khugepaged.c struct collapse_control { · line 101
Quoted 7 lines
mm/khugepaged.c +2
-2@@ -97,8 +97,8 @@ struct collapse_control {/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ]; -/* Last target selected in hpage_collapse_find_target_node() */ -int last_target_node; +/* nodemask for allocation fallback */ +nodemask_t alloc_nmask;
This will eat another 1k on the stack on most configurations (NODE_SHIFT=10). Along with 4k of node_load this is quite a lot even on shallow call chains like madvise resp. khugepaged. I would just add a follow up patch which changes both node_load and alloc_nmask to dynamically allocated objects.
Other than that LGTM. I thought we want to keep __GFP_THISNODE but after a closer look it seems that this flag is not really compatible with nodemask after all. node_zonelist() will simply return a trivial zone list for a single (preferred node) so no fallback to other nodes is possible. My bad to not realize it earlier.
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 25 lines · Michal Hocko
On Thu 03-11-22 14:36:40, Yang Shi wrote:
[...]Quoted 22 lines
So use nodemask to record the nodes which have the same hit record, the hugepage allocation could fallback to those nodes. And remove
__GFP_THISNODEsince it does disallow fallback. And if nodemask is empty (no node is set), it means there is one single node has the most hist record, the nodemask approach actually behaves like__GFP_THISNODE.Reported-by [email protected]Suggested-by Zach O'Keefe <[email protected]>Suggested-by Michal Hocko <[email protected]>Signed-off-by Yang Shi <[email protected]>--- mm/khugepaged.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)mm/khugepaged.c +0
-0@@ -97,8 +97,8 @@ struct collapse_control {/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ];
Quoted 10 lines
mm/khugepaged.c struct collapse_control { · line 101
Quoted 4 lines
mm/khugepaged.c +2
-2-/* Last target selected in hpage_collapse_find_target_node() */ -int last_target_node; +/* nodemask for allocation fallback */ +nodemask_t alloc_nmask;This will eat another 1k on the stack on most configurations (NODE_SHIFT=10). Along with 4k of
node_loadthis is quite a lot even on shallow call chains like madvise resp. khugepaged. I would just add a follow up patch which changes bothnode_loadandalloc_nmaskto dynamically allocated objects.
The collapse_control is allocated by kmalloc dynamically for MADV_COLLAPSE path, and defined as a global variable for khugepaged (khugepaged_collapse_control). So it is not on stack.
Quoted 5 lines
Other than that LGTM. I thought we want to keep
__GFP_THISNODEbut after a closer look it seems that this flag is not really compatible with nodemask after all.node_zonelist()will simply return a trivial zone list for a single (preferred node) so no fallback to other nodes is
Yes, exactly.
Quoted 1 line
possible. My bad to not realize it earlier.
It is fine, never mind.
Quoted 3 lines
--
Michal Hocko
SUSE Labs
Quoted 37 lines · Yang Shi
Quoted 25 lines · Michal Hocko
On Thu 03-11-22 14:36:40, Yang Shi wrote:
[...]Quoted 22 lines
So use nodemask to record the nodes which have the same hit record, the hugepage allocation could fallback to those nodes. And remove
__GFP_THISNODEsince it does disallow fallback. And if nodemask is empty (no node is set), it means there is one single node has the most hist record, the nodemask approach actually behaves like__GFP_THISNODE.Reported-by [email protected]Suggested-by Zach O'Keefe <[email protected]>Suggested-by Michal Hocko <[email protected]>Signed-off-by Yang Shi <[email protected]>--- mm/khugepaged.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)mm/khugepaged.c +0
-0@@ -97,8 +97,8 @@ struct collapse_control {/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ];Quoted 10 lines
mm/khugepaged.c struct collapse_control { · line 101
Quoted 4 lines
mm/khugepaged.c +2
-2-/* Last target selected in hpage_collapse_find_target_node() */ -int last_target_node; +/* nodemask for allocation fallback */ +nodemask_t alloc_nmask;This will eat another 1k on the stack on most configurations (NODE_SHIFT=10). Along with 4k of
node_loadthis is quite a lot even on shallow call chains like madvise resp. khugepaged. I would just add a follow up patch which changes bothnode_loadandalloc_nmaskto dynamically allocated objects.
Quoted 3 lines
The
collapse_controlis allocated by kmalloc dynamically forMADV_COLLAPSEpath, and defined as a global variable for khugepaged (khugepaged_collapse_control). So it is not on stack.
Dang, I must have been blind because I _think_ I have seen it as a local stack defined. Maybe I just implicitly put that to the same bucket as othe $foo_control (e.g. scan_control, oom_control etc) which leave on the stack usually. Sorry about the confusion. Sorry for the noise.
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 39 lines · Michal Hocko
Quoted 37 lines · Yang Shi
Quoted 35 lines · Michal Hocko
On Thu 03-11-22 14:36:40, Yang Shi wrote:
[...]Quoted 19 lines
So use nodemask to record the nodes which have the same hit record, the hugepage allocation could fallback to those nodes. And remove
__GFP_THISNODEsince it does disallow fallback. And if nodemask is empty (no node is set), it means there is one single node has the most hist record, the nodemask approach actually behaves like__GFP_THISNODE.Reported-by [email protected]Suggested-by Zach O'Keefe <[email protected]>Suggested-by Michal Hocko <[email protected]>Signed-off-by Yang Shi <[email protected]>--- mm/khugepaged.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)mm/khugepaged.c +0
-0mm/khugepaged.c struct collapse_control { · line 101
Quoted 7 lines
mm/khugepaged.c +2
-2@@ -97,8 +97,8 @@ struct collapse_control {/* Num pages scanned per node */ u32 node_load[MAX_NUMNODES ]; -/* Last target selected in hpage_collapse_find_target_node() */ -int last_target_node; +/* nodemask for allocation fallback */ +nodemask_t alloc_nmask;This will eat another 1k on the stack on most configurations (NODE_SHIFT=10). Along with 4k of
node_loadthis is quite a lot even on shallow call chains like madvise resp. khugepaged. I would just add a follow up patch which changes bothnode_loadandalloc_nmaskto dynamically allocated objects.
Quoted 8 lines
Quoted 3 lines
The
collapse_controlis allocated by kmalloc dynamically forMADV_COLLAPSEpath, and defined as a global variable for khugepaged (khugepaged_collapse_control). So it is not on stack.Dang, I must have been blind because I _think_ I have seen it as a local stack defined. Maybe I just implicitly put that to the same bucket as othe $foo_control (e.g.
scan_control,oom_controletc) which leave on the stack usually. Sorry about the confusion. Sorry for the noise.
It doesn't matter. It was not put on the stack due to its size when Zach was adding MADV_COLLAPSE.
Quoted 2 lines
Acked-by Michal Hocko <[email protected]>
Thanks.
Quoted 3 lines
--
Michal Hocko
SUSE Labs