From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vn0-f43.google.com (mail-vn0-f43.google.com [209.85.216.43]) by kanga.kvack.org (Postfix) with ESMTP id 5B47D6B0038 for ; Wed, 15 Apr 2015 07:47:31 -0400 (EDT) Received: by vnbg1 with SMTP id g1so13950439vnb.2 for ; Wed, 15 Apr 2015 04:47:31 -0700 (PDT) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com. [58.251.152.64]) by mx.google.com with ESMTPS id qm3si2730008oeb.47.2015.04.15.04.47.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Apr 2015 04:47:30 -0700 (PDT) From: Wang Kai Subject: [PATCH] kmemleak: record accurate early log buffer count and report when exceeded Date: Wed, 15 Apr 2015 19:44:52 +0800 Message-ID: <1429098292-76415-1-git-send-email-morgan.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: catalin.marinas@arm.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.or 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 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org