The patch titled
slab leak detector
has been removed from the -mm tree. Its filename is
slab-leak-detector.patch
This patch was dropped because /proc/slab_allocators does this
------------------------------------------------------
Subject: slab leak detector
From: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Maintenance work from Alexander Nyberg <alexn@xxxxxxxxx>
With the patch applied,
echo "size-4096 0 0 0" > /proc/slabinfo
walks the objects in the size-4096 slab, printing out the calling address
of whoever allocated that object.
It is for leak detection.
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/slab.c | 44 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 41 insertions(+), 3 deletions(-)
diff -puN mm/slab.c~slab-leak-detector mm/slab.c
--- a/mm/slab.c~slab-leak-detector
+++ a/mm/slab.c
@@ -203,7 +203,7 @@
* is less than 512 (PAGE_SIZE<<3), but greater than 256.
*/
-typedef unsigned int kmem_bufctl_t;
+typedef unsigned long kmem_bufctl_t;
#define BUFCTL_END (((kmem_bufctl_t)(~0U))-0)
#define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1)
#define BUFCTL_ACTIVE (((kmem_bufctl_t)(~0U))-2)
@@ -2511,7 +2511,7 @@ static void slab_put_obj(struct kmem_cac
{
unsigned int objnr = obj_to_index(cachep, slabp, objp);
-#if DEBUG
+#if 0
/* Verify that the slab belongs to the intended node */
WARN_ON(slabp->nodeid != nodeid);
@@ -2769,7 +2769,7 @@ bad:
i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
i++) {
if (i % 16 == 0)
- printk("\n%03x:", i);
+ printk("\n%04lx:", i);
printk(" %02x", ((unsigned char *)slabp)[i]);
}
printk("\n");
@@ -2906,6 +2906,15 @@ static void *cache_alloc_debugcheck_afte
*dbg_redzone1(cachep, objp) = RED_ACTIVE;
*dbg_redzone2(cachep, objp) = RED_ACTIVE;
}
+ {
+ int objnr;
+ struct slab *slabp;
+
+ slabp = page_get_slab(virt_to_page(objp));
+
+ objnr = (objp - slabp->s_mem) / cachep->buffer_size;
+ slab_bufctl(slabp)[objnr] = (unsigned long)caller;
+ }
#ifdef CONFIG_DEBUG_SLAB_LEAK
{
struct slab *slabp;
@@ -3977,6 +3986,34 @@ struct seq_operations slabinfo_op = {
.show = s_show,
};
+static void do_dump_slabp(kmem_cache_t *cachep)
+{
+#if DEBUG
+ struct list_head *q;
+ int node;
+
+ check_irq_on();
+ for_each_online_node(node) {
+ struct kmem_list3 *rl3 = cachep->nodelists[node];
+ spin_lock_irq(&rl3->list_lock);
+
+ list_for_each(q, &rl3->slabs_full) {
+ int i;
+ struct slab *slabp = list_entry(q, struct slab, list);
+
+ for (i = 0; i < cachep->num; i++) {
+ unsigned long sym = slab_bufctl(slabp)[i];
+
+ printk("obj %p/%d: %p", slabp, i, (void *)sym);
+ print_symbol(" <%s>", sym);
+ printk("\n");
+ }
+ }
+ spin_unlock_irq(&rl3->list_lock);
+ }
+#endif
+}
+
#define MAX_SLABINFO_WRITE 128
/**
* slabinfo_write - Tuning for the slab allocator
@@ -4013,6 +4050,7 @@ ssize_t slabinfo_write(struct file *file
if (!strcmp(cachep->name, kbuf)) {
if (limit < 1 || batchcount < 1 ||
batchcount > limit || shared < 0) {
+ do_dump_slabp(cachep);
res = 0;
} else {
res = do_tune_cpucache(cachep, limit,
_
Patches currently in -mm which might be from manfred@xxxxxxxxxxxxxxxx are
origin.patch
forcedeth-typecast-cleanup.patch
lockdep-annotate-forcedethc-disable_irq.patch
list_del-debug.patch
slab-leak-detector.patch
mm-debug-dump-pageframes-on-bad_page.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
