lkml.org 
[lkml]   [2013]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Date
From
Subject[PATCH 3/3] mm/kmemleak.c: Merge the consecutive scan-areas.
If the scan-areas are adjacent,it can merge in order to reduce memomy.
And using pr_warn instead of pr_warning.

Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
---
mm/kmemleak.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index f0ece93..9590a57 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -746,24 +746,36 @@ static void add_scan_area(unsigned long ptr, size_t size, gfp_t gfp)
return;
}

- area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));
- if (!area) {
- pr_warning("Cannot allocate a scan area\n");
- goto out;
- }
-
spin_lock_irqsave(&object->lock, flags);
if (ptr + size > object->pointer + object->size) {
kmemleak_warn("Scan area larger than object 0x%08lx\n", ptr);
dump_object_info(object);
- kmem_cache_free(scan_area_cache, area);
goto out_unlock;
}
+ hlist_for_each_entry(area, &object->area_list, node) {
+ if (ptr + size == area->start) {
+ area->start = ptr;
+ area->size += size;
+ goto out_unlock;
+ } else if (ptr == area->start + area->size) {
+ area->size += size;
+ goto out_unlock;
+ }
+
+ }
+ spin_unlock_irqrestore(&object->lock, flags);
+
+ area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));
+ if (!area) {
+ pr_warn("Cannot allocate a scan area\n");
+ goto out;
+ }

INIT_HLIST_NODE(&area->node);
area->start = ptr;
area->size = size;

+ spin_lock_irqsave(&object->lock, flags);
hlist_add_head(&area->node, &object->area_list);
out_unlock:
spin_unlock_irqrestore(&object->lock, flags);
--
1.8.3.rc1.44.gb387c77
From a76e17c129d2f779f1588aa7ae319b76854068eb Mon Sep 17 00:00:00 2001
From: Jianpeng Ma <majianpeng@gmail.com>
Date: Tue, 14 May 2013 19:32:06 +0800
Subject: [PATCH 3/3] mm/kmemleak.c: Merge the consecutive scan-areas.

If the scan-areas are adjacent,it can merge in order to reduce memomy.
And using pr_warn instead of pr_warning.

Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
---
mm/kmemleak.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index f0ece93..9590a57 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -746,24 +746,36 @@ static void add_scan_area(unsigned long ptr, size_t size, gfp_t gfp)
return;
}

- area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));
- if (!area) {
- pr_warning("Cannot allocate a scan area\n");
- goto out;
- }
-
spin_lock_irqsave(&object->lock, flags);
if (ptr + size > object->pointer + object->size) {
kmemleak_warn("Scan area larger than object 0x%08lx\n", ptr);
dump_object_info(object);
- kmem_cache_free(scan_area_cache, area);
goto out_unlock;
}
+ hlist_for_each_entry(area, &object->area_list, node) {
+ if (ptr + size == area->start) {
+ area->start = ptr;
+ area->size += size;
+ goto out_unlock;
+ } else if (ptr == area->start + area->size) {
+ area->size += size;
+ goto out_unlock;
+ }
+
+ }
+ spin_unlock_irqrestore(&object->lock, flags);
+
+ area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp));
+ if (!area) {
+ pr_warn("Cannot allocate a scan area\n");
+ goto out;
+ }

INIT_HLIST_NODE(&area->node);
area->start = ptr;
area->size = size;

+ spin_lock_irqsave(&object->lock, flags);
hlist_add_head(&area->node, &object->area_list);
out_unlock:
spin_unlock_irqrestore(&object->lock, flags);
--
1.8.3.rc1.44.gb387c77
\
 
 \ /
  Last update: 2013-05-14 14:01    [W:6.585 / U:0.440 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site