2014-04-17 08:06:50

by zhangwei(Jovi)

Subject: [PATCH] tracing/uprobes: fix uprobe_cpu_buffer memory leak

Forgot to free uprobe_cpu_buffer percpu page in uprobe_buffer_disable.

Signed-off-by: zhangwei(Jovi) <[email protected]>
---
kernel/trace/trace_uprobe.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index e447336..071d3bb 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -729,9 +729,15 @@ static int uprobe_buffer_enable(void)

static void uprobe_buffer_disable(void)
{
+ int cpu;
+
BUG_ON(!mutex_is_locked(&event_mutex));

if (--uprobe_buffer_refcnt == 0) {
+ for_each_possible_cpu(cpu)
+ free_page((unsigned long)per_cpu_ptr(uprobe_cpu_buffer,
+ cpu)->buf);
+
free_percpu(uprobe_cpu_buffer);
uprobe_cpu_buffer = NULL;
}
--
1.8.3.1

2014-04-17 13:31:33

by Namhyung Kim

Subject: Re: [PATCH] tracing/uprobes: fix uprobe_cpu_buffer memory leak

Hi Jovi,

(Sorry for replying in another thread. I don't have an access to the
company mail at home.)

On Thu, Apr 17, 2014 at 04:05:19PM +0800, "zhangwei(Jovi)" wrote:
> Forgot to free uprobe_cpu_buffer percpu page in uprobe_buffer_disable.

Thanks for fixing this!

Acked-by: Namhyung Kim <[email protected]>

Thanks,
Namhyung

2014-04-17 14:43:30

by Steven Rostedt

Subject: Re: [PATCH] tracing/uprobes: fix uprobe_cpu_buffer memory leak

On Thu, 17 Apr 2014 22:31:24 +0900
Namhyung Kim <[email protected]> wrote:

> Hi Jovi,
>
> (Sorry for replying in another thread. I don't have an access to the
> company mail at home.)
>
> On Thu, Apr 17, 2014 at 04:05:19PM +0800, "zhangwei(Jovi)" wrote:
> > Forgot to free uprobe_cpu_buffer percpu page in uprobe_buffer_disable.
>
> Thanks for fixing this!
>
> Acked-by: Namhyung Kim <[email protected]>

I'm running this through my tests right now.

Thanks!

-- Steve