From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759452AbZCYJri (ORCPT ); Wed, 25 Mar 2009 05:47:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758921AbZCYJrM (ORCPT ); Wed, 25 Mar 2009 05:47:12 -0400 Received: from hera.kernel.org ([140.211.167.34]:46407 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757607AbZCYJrK (ORCPT ); Wed, 25 Mar 2009 05:47:10 -0400 Date: Wed, 25 Mar 2009 09:45:54 GMT From: Pekka Enberg To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, penberg@cs.helsinki.fi, eduard.munteanu@linux360.ro, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, penberg@cs.helsinki.fi, eduard.munteanu@linux360.ro, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <1237971957.30175.18.camel@penberg-laptop> References: <1237971957.30175.18.camel@penberg-laptop> Subject: [tip:tracing/kmemtrace] kmemtrace: trace kfree() calls with NULL or zero-length objects Message-ID: Git-Commit-ID: ceff33f2fe894601b5e6805f88ea2b6a9622ce75 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Wed, 25 Mar 2009 09:45:56 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ceff33f2fe894601b5e6805f88ea2b6a9622ce75 Gitweb: http://git.kernel.org/tip/ceff33f2fe894601b5e6805f88ea2b6a9622ce75 Author: Pekka Enberg AuthorDate: Wed, 25 Mar 2009 11:05:57 +0200 Committer: Ingo Molnar CommitDate: Wed, 25 Mar 2009 10:15:20 +0100 kmemtrace: trace kfree() calls with NULL or zero-length objects Impact: also output kfree(NULL) entries This patch moves the trace_kfree() calls before the ZERO_OR_NULL_PTR check so that we can trace call-sites that call kfree() with NULL many times which might be an indication of a bug. Signed-off-by: Pekka Enberg Cc: Eduard - Gabriel Munteanu LKML-Reference: <1237971957.30175.18.camel@penberg-laptop> Signed-off-by: Ingo Molnar --- mm/slab.c | 4 ++-- mm/slob.c | 4 ++-- mm/slub.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index fa00fd6..b584002 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3773,6 +3773,8 @@ void kfree(const void *objp) struct kmem_cache *c; unsigned long flags; + trace_kfree(_RET_IP_, objp); + if (unlikely(ZERO_OR_NULL_PTR(objp))) return; local_irq_save(flags); @@ -3782,8 +3784,6 @@ void kfree(const void *objp) debug_check_no_obj_freed(objp, obj_size(c)); __cache_free(c, (void *)objp); local_irq_restore(flags); - - trace_kfree(_RET_IP_, objp); } EXPORT_SYMBOL(kfree); diff --git a/mm/slob.c b/mm/slob.c index 2ccd31d..5bd7ecc 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -503,6 +503,8 @@ void kfree(const void *block) { struct slob_page *sp; + trace_kfree(_RET_IP_, block); + if (unlikely(ZERO_OR_NULL_PTR(block))) return; @@ -513,8 +515,6 @@ void kfree(const void *block) slob_free(m, *m + align); } else put_page(&sp->page); - - trace_kfree(_RET_IP_, block); } EXPORT_SYMBOL(kfree); diff --git a/mm/slub.c b/mm/slub.c index c3a905b..988ef33 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2791,6 +2791,8 @@ void kfree(const void *x) struct page *page; void *object = (void *)x; + trace_kfree(_RET_IP_, x); + if (unlikely(ZERO_OR_NULL_PTR(x))) return; @@ -2801,8 +2803,6 @@ void kfree(const void *x) return; } slab_free(page->slab, page, object, _RET_IP_); - - trace_kfree(_RET_IP_, x); } EXPORT_SYMBOL(kfree);