From: Catalin Marinas <catalin.marinas@arm.com>
To: Wang Kai <morgan.wang@huawei.com>
Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] kmemleak: record accurate early log buffer count and report when exceeded
Date: Wed, 15 Apr 2015 16:13:00 +0100 [thread overview]
Message-ID: <20150415151300.GF22741@localhost> (raw)
In-Reply-To: <1429098563-76831-1-git-send-email-morgan.wang@huawei.com>
(I see you corrected the LKML address; I replied to your early patch)
On Wed, Apr 15, 2015 at 12:49:23PM +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 <morgan.wang@huawei.com>
> ---
> 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 */
You could say "just count the last request" since kmemleak_disable()
would set kmemleak_error to 1 and you never get to this block again.
> + 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) */
s/warning/warn/
But I don't think this comment is needed, just add it to the commit 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);
Otherwise, my ack still stands:
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-04-15 15:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 11:49 [PATCH] kmemleak: record accurate early log buffer count and report when exceeded Wang Kai
2015-04-15 15:13 ` Catalin Marinas [this message]
2015-04-15 23:23 ` Wang Kai
-- strict thread matches above, loose matches on Subject: below --
2015-04-15 11:44 Wang Kai
2015-04-15 15:07 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150415151300.GF22741@localhost \
--to=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=morgan.wang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).