From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753694AbbEKKza (ORCPT ); Mon, 11 May 2015 06:55:30 -0400 Received: from foss.arm.com ([217.140.101.70]:57734 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753461AbbEKKz2 (ORCPT ); Mon, 11 May 2015 06:55:28 -0400 Date: Mon, 11 May 2015 11:55:24 +0100 From: Catalin Marinas To: Wang Kai Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2] kmemleak: record accurate early log buffer count and report when exceeded Message-ID: <20150511105524.GD18655@e104818-lin.cambridge.arm.com> References: <1431335021-117825-1-git-send-email-morgan.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1431335021-117825-1-git-send-email-morgan.wang@huawei.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 11, 2015 at 10:03:41AM +0100, Wang Kai wrote: > In log_early function, crt_early_log should also count once when > 'crt_early_log >= ARRAY_SIZE(early_log)'. Otherwise the reported > count from kmemleak_init is one less than 'actual number'. > > Then, in kmemleak_init, if early_log buffer size equal actual > number, kmemleak will init sucessful, so change warning condition > to 'crt_early_log > ARRAY_SIZE(early_log)'. > > Signed-off-by: Wang Kai > --- > mm/kmemleak.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/mm/kmemleak.c b/mm/kmemleak.c > index 5405aff..6a07748 100644 > --- a/mm/kmemleak.c > +++ b/mm/kmemleak.c > @@ -814,6 +814,7 @@ static void __init log_early(int op_type, const void *ptr, size_t size, > } > > if (crt_early_log >= ARRAY_SIZE(early_log)) { > + crt_early_log++; > kmemleak_disable(); > return; > } > @@ -1829,7 +1830,7 @@ void __init kmemleak_init(void) > object_cache = KMEM_CACHE(kmemleak_object, SLAB_NOLEAKTRACE); > scan_area_cache = KMEM_CACHE(kmemleak_scan_area, SLAB_NOLEAKTRACE); > > - if (crt_early_log >= ARRAY_SIZE(early_log)) > + if (crt_early_log > ARRAY_SIZE(early_log)) > pr_warning("Early log buffer exceeded (%d), please increase " > "DEBUG_KMEMLEAK_EARLY_LOG_SIZE\n", crt_early_log); It looks fine: Acked-by: Catalin Marinas Thanks (I assume akpm will pick it up, otherwise I'll send it during the next merging window; it's not critical)