Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kmemleak: Add more cond_resched() calls in the scanning thread

Browse source 
Following recent fix to no longer reschedule in the scan_block()
function, the system may become unresponsive with !PREEMPT. This patch
re-adds the cond_resched() call to scan_block() but conditioned by the
allow_resched parameter.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Catalin Marinas 2009-07-07 10:32:56 +01:00
parent bf2a76b317
commit 4b8a96744c
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mm/kmemleak.c
View file

@ -807,7 +807,7 @@ static int scan_should_stop(void)
* found to the gray list. * found to the gray list.
*/ */
static void scan_block(void *_start, void *_end, static void scan_block(void *_start, void *_end,
struct kmemleak_object *scanned) struct kmemleak_object *scanned, int allow_resched)
{ {
unsigned long *ptr; unsigned long *ptr;
unsigned long *start = PTR_ALIGN(_start, BYTES_PER_POINTER); unsigned long *start = PTR_ALIGN(_start, BYTES_PER_POINTER);
@ -818,6 +818,8 @@ static void scan_block(void *_start, void *_end,
unsigned long pointer = *ptr; unsigned long pointer = *ptr;
struct kmemleak_object *object; struct kmemleak_object *object;
if (allow_resched)
cond_resched();
if (scan_should_stop()) if (scan_should_stop())
break; break;
@ -881,12 +883,12 @@ static void scan_object(struct kmemleak_object *object)
goto out; goto out;
if (hlist_empty(&object->area_list)) if (hlist_empty(&object->area_list))
scan_block((void *)object->pointer, scan_block((void *)object->pointer,
(void *)(object->pointer + object->size), object); (void *)(object->pointer + object->size), object, 0);
else else
hlist_for_each_entry(area, elem, &object->area_list, node) hlist_for_each_entry(area, elem, &object->area_list, node)
scan_block((void *)(object->pointer + area->offset), scan_block((void *)(object->pointer + area->offset),
(void *)(object->pointer + area->offset (void *)(object->pointer + area->offset
+ area->length), object); + area->length), object, 0);
out: out:
spin_unlock_irqrestore(&object->lock, flags); spin_unlock_irqrestore(&object->lock, flags);
} }
@ -931,14 +933,14 @@ static void kmemleak_scan(void)
rcu_read_unlock(); rcu_read_unlock();
/* data/bss scanning */ /* data/bss scanning */
scan_block(_sdata, _edata, NULL); scan_block(_sdata, _edata, NULL, 1);
scan_block(__bss_start, __bss_stop, NULL); scan_block(__bss_start, __bss_stop, NULL, 1);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* per-cpu sections scanning */ /* per-cpu sections scanning */
for_each_possible_cpu(i) for_each_possible_cpu(i)
scan_block(__per_cpu_start + per_cpu_offset(i), scan_block(__per_cpu_start + per_cpu_offset(i),
__per_cpu_end + per_cpu_offset(i), NULL); __per_cpu_end + per_cpu_offset(i), NULL, 1);
#endif #endif
/* /*
@ -960,7 +962,7 @@ static void kmemleak_scan(void)
/* only scan if page is in use */ /* only scan if page is in use */
if (page_count(page) == 0) if (page_count(page) == 0)
continue; continue;
scan_block(page, page + 1, NULL); scan_block(page, page + 1, NULL, 1);
} }
} }
@ -972,7 +974,8 @@ static void kmemleak_scan(void)
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
for_each_process(task) for_each_process(task)
scan_block(task_stack_page(task), scan_block(task_stack_page(task),
task_stack_page(task) + THREAD_SIZE, NULL); task_stack_page(task) + THREAD_SIZE,
NULL, 0);
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
} }