Skip to content

Commit c10a0f8

Browse files
Lang Yutorvalds
authored andcommitted
mm/kmemleak: avoid scanning potential huge holes
When using devm_request_free_mem_region() and devm_memremap_pages() to add ZONE_DEVICE memory, if requested free mem region's end pfn were huge(e.g., 0x400000000), the node_end_pfn() will be also huge (see move_pfn_range_to_zone()). Thus it creates a huge hole between node_start_pfn() and node_end_pfn(). We found on some AMD APUs, amdkfd requested such a free mem region and created a huge hole. In such a case, following code snippet was just doing busy test_bit() looping on the huge hole. for (pfn = start_pfn; pfn < end_pfn; pfn++) { struct page *page = pfn_to_online_page(pfn); if (!page) continue; ... } So we got a soft lockup: watchdog: BUG: soft lockup - CPU#6 stuck for 26s! [bash:1221] CPU: 6 PID: 1221 Comm: bash Not tainted 5.15.0-custom #1 RIP: 0010:pfn_to_online_page+0x5/0xd0 Call Trace: ? kmemleak_scan+0x16a/0x440 kmemleak_write+0x306/0x3a0 ? common_file_perm+0x72/0x170 full_proxy_write+0x5c/0x90 vfs_write+0xb9/0x260 ksys_write+0x67/0xe0 __x64_sys_write+0x1a/0x20 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae I did some tests with the patch. (1) amdgpu module unloaded before the patch: real 0m0.976s user 0m0.000s sys 0m0.968s after the patch: real 0m0.981s user 0m0.000s sys 0m0.973s (2) amdgpu module loaded before the patch: real 0m35.365s user 0m0.000s sys 0m35.354s after the patch: real 0m1.049s user 0m0.000s sys 0m1.042s Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Lang Yu <[email protected]> Acked-by: David Hildenbrand <[email protected]> Acked-by: Catalin Marinas <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 520ba72 commit c10a0f8

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

mm/kmemleak.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,8 @@ static void kmemleak_scan(void)
14101410
{
14111411
unsigned long flags;
14121412
struct kmemleak_object *object;
1413-
int i;
1413+
struct zone *zone;
1414+
int __maybe_unused i;
14141415
int new_leaks = 0;
14151416

14161417
jiffies_last_scan = jiffies;
@@ -1450,9 +1451,9 @@ static void kmemleak_scan(void)
14501451
* Struct page scanning for each node.
14511452
*/
14521453
get_online_mems();
1453-
for_each_online_node(i) {
1454-
unsigned long start_pfn = node_start_pfn(i);
1455-
unsigned long end_pfn = node_end_pfn(i);
1454+
for_each_populated_zone(zone) {
1455+
unsigned long start_pfn = zone->zone_start_pfn;
1456+
unsigned long end_pfn = zone_end_pfn(zone);
14561457
unsigned long pfn;
14571458

14581459
for (pfn = start_pfn; pfn < end_pfn; pfn++) {
@@ -1461,8 +1462,8 @@ static void kmemleak_scan(void)
14611462
if (!page)
14621463
continue;
14631464

1464-
/* only scan pages belonging to this node */
1465-
if (page_to_nid(page) != i)
1465+
/* only scan pages belonging to this zone */
1466+
if (page_zone(page) != zone)
14661467
continue;
14671468
/* only scan if page is in use */
14681469
if (page_count(page) == 0)

0 commit comments

Comments
 (0)