From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756220AbbDOLwG (ORCPT ); Wed, 15 Apr 2015 07:52:06 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:10783 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754625AbbDOLwB (ORCPT ); Wed, 15 Apr 2015 07:52:01 -0400 From: Wang Kai To: CC: , Subject: [PATCH] kmemleak: record accurate early log buffer count and report when exceeded Date: Wed, 15 Apr 2015 19:49:23 +0800 Message-ID: <1429098563-76831-1-git-send-email-morgan.wang@huawei.com> X-Mailer: git-send-email 1.8.5.5 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 5405aff..49956cf 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -814,6 +814,8 @@ static void __init log_early(int op_type, const void *ptr, size_t size, } if (crt_early_log >= ARRAY_SIZE(early_log)) { + /* kmemleak will stop recording, just count the requests */ + crt_early_log++; kmemleak_disable(); return; } @@ -1829,7 +1831,8 @@ 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)) + /* Don't warning when 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); -- 1.7.9.5