* [PATCH] mm/kmemleak: Move up cond_resched() call in page scanning loop
@ 2023-08-25 16:49 Waiman Long
2023-08-27 13:07 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Waiman Long @ 2023-08-25 16:49 UTC (permalink / raw)
To: Catalin Marinas, Andrew Morton
Cc: linux-mm, linux-kernel, Yisheng Xie, Waiman Long
Commit bde5f6bc68db ("kmemleak: add scheduling point to kmemleak_scan()")
added a cond_resched() call to the struct page scanning loop to prevent
soft lockup from happening. However, soft lockup can still happen in
that loop in some corner cases when the pages that satisfy the "!(pfn &
63)" check are skipped for some reasons.
Fix this corner case by moving up the cond_resched() check so that it
will be called every 64 pages unconditionally.
Fixes: bde5f6bc68db ("kmemleak: add scheduling point to kmemleak_scan()")
Signed-off-by: Waiman Long <longman@redhat.com>
---
mm/kmemleak.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index a2d34226e3c8..114d8dcdcf70 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1579,6 +1579,9 @@ static void kmemleak_scan(void)
for (pfn = start_pfn; pfn < end_pfn; pfn++) {
struct page *page = pfn_to_online_page(pfn);
+ if (!(pfn & 63))
+ cond_resched();
+
if (!page)
continue;
@@ -1589,8 +1592,6 @@ static void kmemleak_scan(void)
if (page_count(page) == 0)
continue;
scan_block(page, page + 1, NULL);
- if (!(pfn & 63))
- cond_resched();
}
}
put_online_mems();
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mm/kmemleak: Move up cond_resched() call in page scanning loop
2023-08-25 16:49 [PATCH] mm/kmemleak: Move up cond_resched() call in page scanning loop Waiman Long
@ 2023-08-27 13:07 ` Catalin Marinas
0 siblings, 0 replies; 2+ messages in thread
From: Catalin Marinas @ 2023-08-27 13:07 UTC (permalink / raw)
To: Waiman Long; +Cc: Andrew Morton, linux-mm, linux-kernel, Yisheng Xie
On Fri, Aug 25, 2023 at 12:49:47PM -0400, Waiman Long wrote:
> Commit bde5f6bc68db ("kmemleak: add scheduling point to kmemleak_scan()")
> added a cond_resched() call to the struct page scanning loop to prevent
> soft lockup from happening. However, soft lockup can still happen in
> that loop in some corner cases when the pages that satisfy the "!(pfn &
> 63)" check are skipped for some reasons.
>
> Fix this corner case by moving up the cond_resched() check so that it
> will be called every 64 pages unconditionally.
>
> Fixes: bde5f6bc68db ("kmemleak: add scheduling point to kmemleak_scan()")
> Signed-off-by: Waiman Long <longman@redhat.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-27 13:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-25 16:49 [PATCH] mm/kmemleak: Move up cond_resched() call in page scanning loop Waiman Long
2023-08-27 13:07 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).