Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753196AbdHNMIs (ORCPT ); Mon, 14 Aug 2017 08:08:48 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:36130 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753151AbdHNMIr (ORCPT ); Mon, 14 Aug 2017 08:08:47 -0400 MIME-Version: 1.0 In-Reply-To: <1502705898-27571-1-git-send-email-chuhu@redhat.com> References: <1502705898-27571-1-git-send-email-chuhu@redhat.com> From: Chunyu Hu Date: Mon, 14 Aug 2017 20:08:45 +0800 Message-ID: Subject: Re: [PATCH 1/2] tracing: Fix kmemleak in tracing_map_array_free To: Chunyu Hu Cc: Steven Rostedt , Ingo Molnar , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3376 Lines: 87 Resend to add linux-kernel cced. The steps I was using was: echo hist:keys=irq > trigger echo '!hist:keys=irq:vals=hitcount:sort=hitcount:size=2048' > trigger Then scan the kmem. echo scan > /sys/kernel/debug/kmemleak On 14 August 2017 at 18:18, Chunyu Hu wrote: > kmemleak reported the below leak when I was doing clear of the hist > trigger. With this patch, the kmeamleak is gone. > > unreferenced object 0xffff94322b63d760 (size 32): > comm "bash", pid 1522, jiffies 4403687962 (age 2442.311s) > hex dump (first 32 bytes): > 00 01 00 00 04 00 00 00 08 00 00 00 ff 00 00 00 ................ > 10 00 00 00 00 00 00 00 80 a8 7a f2 31 94 ff ff ..........z.1... > backtrace: > [] kmemleak_alloc+0x4a/0xa0 > [] kmem_cache_alloc_trace+0xca/0x1d0 > [] tracing_map_array_alloc+0x26/0x140 > [] kretprobe_trampoline+0x0/0x50 > [] create_hist_data+0x535/0x750 > [] event_hist_trigger_func+0x1f7/0x420 > [] event_trigger_write+0xfd/0x1a0 > [] __vfs_write+0x37/0x170 > [] vfs_write+0xb2/0x1b0 > [] SyS_write+0x55/0xc0 > [] do_syscall_64+0x67/0x150 > [] return_from_SYSCALL_64+0x0/0x6a > [] 0xffffffffffffffff > unreferenced object 0xffff9431f27aa880 (size 128): > comm "bash", pid 1522, jiffies 4403687962 (age 2442.311s) > hex dump (first 32 bytes): > 00 00 8c 2a 32 94 ff ff 00 f0 8b 2a 32 94 ff ff ...*2......*2... > 00 e0 8b 2a 32 94 ff ff 00 d0 8b 2a 32 94 ff ff ...*2......*2... > backtrace: > [] kmemleak_alloc+0x4a/0xa0 > [] __kmalloc+0xe8/0x220 > [] tracing_map_array_alloc+0xb1/0x140 > [] kretprobe_trampoline+0x0/0x50 > [] create_hist_data+0x535/0x750 > [] event_hist_trigger_func+0x1f7/0x420 > [] event_trigger_write+0xfd/0x1a0 > [] __vfs_write+0x37/0x170 > [] vfs_write+0xb2/0x1b0 > [] SyS_write+0x55/0xc0 > [] do_syscall_64+0x67/0x150 > [] return_from_SYSCALL_64+0x0/0x6a > [] 0xffffffffffffffff > > Signed-off-by: Chunyu Hu > --- > kernel/trace/tracing_map.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c > index 0a689bb..305039b 100644 > --- a/kernel/trace/tracing_map.c > +++ b/kernel/trace/tracing_map.c > @@ -221,16 +221,19 @@ void tracing_map_array_free(struct tracing_map_array *a) > if (!a) > return; > > - if (!a->pages) { > - kfree(a); > - return; > - } > + if (!a->pages) > + goto free; > > for (i = 0; i < a->n_pages; i++) { > if (!a->pages[i]) > break; > free_page((unsigned long)a->pages[i]); > } > + > + kfree(a->pages); > + > + free: > + kfree(a); > } > > struct tracing_map_array *tracing_map_array_alloc(unsigned int n_elts, > -- > 1.8.3.1 >