Skip to content

Commit 4fac1f3

Browse files
Lang Yusmb49
Lang Yu
authored andcommitted
mm/kmemleak: avoid scanning potential huge holes
BugLink: https://bugs.launchpad.net/bugs/1966021 commit c10a0f8 upstream. 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/20211108140029.721144-1-lang.yu@amd.com Signed-off-by: Lang Yu <lang.yu@amd.com> Acked-by: David Hildenbrand <david@redhat.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 59bda2a commit 4fac1f3

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
@@ -1402,7 +1402,8 @@ static void kmemleak_scan(void)
14021402
{
14031403
unsigned long flags;
14041404
struct kmemleak_object *object;
1405-
int i;
1405+
struct zone *zone;
1406+
int __maybe_unused i;
14061407
int new_leaks = 0;
14071408

14081409
jiffies_last_scan = jiffies;
@@ -1442,9 +1443,9 @@ static void kmemleak_scan(void)
14421443
* Struct page scanning for each node.
14431444
*/
14441445
get_online_mems();
1445-
for_each_online_node(i) {
1446-
unsigned long start_pfn = node_start_pfn(i);
1447-
unsigned long end_pfn = node_end_pfn(i);
1446+
for_each_populated_zone(zone) {
1447+
unsigned long start_pfn = zone->zone_start_pfn;
1448+
unsigned long end_pfn = zone_end_pfn(zone);
14481449
unsigned long pfn;
14491450

14501451
for (pfn = start_pfn; pfn < end_pfn; pfn++) {
@@ -1453,8 +1454,8 @@ static void kmemleak_scan(void)
14531454
if (!page)
14541455
continue;
14551456

1456-
/* only scan pages belonging to this node */
1457-
if (page_to_nid(page) != i)
1457+
/* only scan pages belonging to this zone */
1458+
if (page_zone(page) != zone)
14581459
continue;
14591460
/* only scan if page is in use */
14601461
if (page_count(page) == 0)

0 commit comments

Comments
 (0)