* [PATCH] powerpc: kernel/kgdb.c: fix memory leakage
@ 2013-01-14 17:26 Cong Ding
2013-02-01 2:04 ` Jason Wessel
0 siblings, 1 reply; 4+ messages in thread
From: Cong Ding @ 2013-01-14 17:26 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Tiejun Chen,
Michael Neuling, Jason Wessel, Stephen Rothwell, linuxppc-dev,
linux-kernel
Cc: Cong Ding
the variable backup_current_thread_info isn't freed before existing the
function.
Signed-off-by: Cong Ding <dinggnu@gmail.com>
---
arch/powerpc/kernel/kgdb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index 8747447..5ca82cd 100644
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -154,12 +154,12 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
static int kgdb_singlestep(struct pt_regs *regs)
{
struct thread_info *thread_info, *exception_thread_info;
- struct thread_info *backup_current_thread_info = \
- (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
+ struct thread_info *backup_current_thread_info;
if (user_mode(regs))
return 0;
+ backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
/*
* On Book E and perhaps other processors, singlestep is handled on
* the critical exception stack. This causes current_thread_info()
@@ -185,6 +185,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
/* Restore current_thread_info lastly. */
memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
+ kfree(backup_current_thread_info);
return 1;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] powerpc: kernel/kgdb.c: fix memory leakage
2013-01-14 17:26 [PATCH] powerpc: kernel/kgdb.c: fix memory leakage Cong Ding
@ 2013-02-01 2:04 ` Jason Wessel
2013-02-08 2:41 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 4+ messages in thread
From: Jason Wessel @ 2013-02-01 2:04 UTC (permalink / raw)
To: Cong Ding
Cc: Stephen Rothwell, Michael Neuling, linux-kernel, Tiejun Chen,
Paul Mackerras, linuxppc-dev
On 01/14/2013 11:26 AM, Cong Ding wrote:
> the variable backup_current_thread_info isn't freed before existing the
> function.
>
> Signed-off-by: Cong Ding <dinggnu@gmail.com>
> ---
> arch/powerpc/kernel/kgdb.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
> index 8747447..5ca82cd 100644
> --- a/arch/powerpc/kernel/kgdb.c
> +++ b/arch/powerpc/kernel/kgdb.c
> @@ -154,12 +154,12 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
> static int kgdb_singlestep(struct pt_regs *regs)
> {
> struct thread_info *thread_info, *exception_thread_info;
> - struct thread_info *backup_current_thread_info = \
> - (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
> + struct thread_info *backup_current_thread_info;
Woh... This is definitely wrong. You have found a problem for sure,
but this is not the right way to fix it.
It is not a good idea to kmalloc while single stepping because you can
hang the kernel if you single step any operation in kmalloc().
I am in the process of going through all the kgdb mails from the last
few months while I had been away from the project, so I didn't catch
this one and I see it has upstream commit (fefd9e6f8). I'll submit
another patch to fix this the right way and use a static variable.
This is ok to use a static variable here because this is not something
we can recursively call at a single CPU level.
If Ben prefers we not burn the memory unless kgdb is active we can
kmalloc / kfree the space we need at the time that kgdb is
initialized. Else we can go with this patch you see below. We'll see
what Ben desires.
-----
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index a7bc752..bb12c8b 100644
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -151,15 +151,16 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
return 1;
}
+static struct thread_info kgdb_backup_thread_info[NR_CPUS];
+
static int kgdb_singlestep(struct pt_regs *regs)
{
struct thread_info *thread_info, *exception_thread_info;
- struct thread_info *backup_current_thread_info;
+ int cpu = raw_smp_processor_id();
if (user_mode(regs))
return 0;
- backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
/*
* On Book E and perhaps other processors, singlestep is handled on
* the critical exception stack. This causes current_thread_info()
@@ -175,7 +176,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
if (thread_info != exception_thread_info) {
/* Save the original current_thread_info. */
- memcpy(backup_current_thread_info, exception_thread_info, sizeof *thread_info);
+ memcpy(&kgdb_backup_thread_info[cpu], exception_thread_info, sizeof *thread_info);
memcpy(exception_thread_info, thread_info, sizeof *thread_info);
}
@@ -183,9 +184,8 @@ static int kgdb_singlestep(struct pt_regs *regs)
if (thread_info != exception_thread_info)
/* Restore current_thread_info lastly. */
- memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
+ memcpy(exception_thread_info, &kgdb_backup_thread_info[cpu], sizeof *thread_info);
- kfree(backup_current_thread_info);
return 1;
}
-----
Thanks,
Jason.
>
> if (user_mode(regs))
> return 0;
>
> + backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
> /*
> * On Book E and perhaps other processors, singlestep is handled on
> * the critical exception stack. This causes current_thread_info()
> @@ -185,6 +185,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
> /* Restore current_thread_info lastly. */
> memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
>
> + kfree(backup_current_thread_info);
> return 1;
> }
>
>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] powerpc: kernel/kgdb.c: fix memory leakage
2013-02-01 2:04 ` Jason Wessel
@ 2013-02-08 2:41 ` Benjamin Herrenschmidt
2013-02-27 2:44 ` tiejun.chen
0 siblings, 1 reply; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2013-02-08 2:41 UTC (permalink / raw)
To: Jason Wessel
Cc: Stephen Rothwell, Michael Neuling, Cong Ding, linux-kernel,
Tiejun Chen, Paul Mackerras, linuxppc-dev
On Thu, 2013-01-31 at 20:04 -0600, Jason Wessel wrote:
> > diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
> > index 8747447..5ca82cd 100644
> > --- a/arch/powerpc/kernel/kgdb.c
> > +++ b/arch/powerpc/kernel/kgdb.c
> > @@ -154,12 +154,12 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
> > static int kgdb_singlestep(struct pt_regs *regs)
> > {
> > struct thread_info *thread_info, *exception_thread_info;
> > - struct thread_info *backup_current_thread_info = \
> > - (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
> > + struct thread_info *backup_current_thread_info;
>
>
>
> Woh... This is definitely wrong. You have found a problem for sure,
> but this is not the right way to fix it.
>
> It is not a good idea to kmalloc while single stepping because you can
> hang the kernel if you single step any operation in kmalloc().
Ok. I applied the fix because it was obviously correct vs. the previous
version of the code (ie. the kmalloc was already there)
> I am in the process of going through all the kgdb mails from the last
> few months while I had been away from the project, so I didn't catch
> this one and I see it has upstream commit (fefd9e6f8). I'll submit
> another patch to fix this the right way and use a static variable.
> This is ok to use a static variable here because this is not something
> we can recursively call at a single CPU level.
But a static will be shared by all CPUs or do you mean a per-cpu one ?
> If Ben prefers we not burn the memory unless kgdb is active we can
> kmalloc / kfree the space we need at the time that kgdb is
> initialized. Else we can go with this patch you see below. We'll see
> what Ben desires.
What about the stack ? thread info isn't very big...
Cheers,
Ben.
> -----
> diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
> index a7bc752..bb12c8b 100644
> --- a/arch/powerpc/kernel/kgdb.c
> +++ b/arch/powerpc/kernel/kgdb.c
> @@ -151,15 +151,16 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
> return 1;
> }
>
> +static struct thread_info kgdb_backup_thread_info[NR_CPUS];
> +
> static int kgdb_singlestep(struct pt_regs *regs)
> {
> struct thread_info *thread_info, *exception_thread_info;
> - struct thread_info *backup_current_thread_info;
> + int cpu = raw_smp_processor_id();
>
> if (user_mode(regs))
> return 0;
>
> - backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
> /*
> * On Book E and perhaps other processors, singlestep is handled on
> * the critical exception stack. This causes current_thread_info()
> @@ -175,7 +176,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
>
> if (thread_info != exception_thread_info) {
> /* Save the original current_thread_info. */
> - memcpy(backup_current_thread_info, exception_thread_info, sizeof *thread_info);
> + memcpy(&kgdb_backup_thread_info[cpu], exception_thread_info, sizeof *thread_info);
> memcpy(exception_thread_info, thread_info, sizeof *thread_info);
> }
>
> @@ -183,9 +184,8 @@ static int kgdb_singlestep(struct pt_regs *regs)
>
> if (thread_info != exception_thread_info)
> /* Restore current_thread_info lastly. */
> - memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
> + memcpy(exception_thread_info, &kgdb_backup_thread_info[cpu], sizeof *thread_info);
>
> - kfree(backup_current_thread_info);
> return 1;
> }
>
>
> -----
>
>
> Thanks,
> Jason.
>
>
> >
> > if (user_mode(regs))
> > return 0;
> >
> > + backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
> > /*
> > * On Book E and perhaps other processors, singlestep is handled on
> > * the critical exception stack. This causes current_thread_info()
> > @@ -185,6 +185,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
> > /* Restore current_thread_info lastly. */
> > memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
> >
> > + kfree(backup_current_thread_info);
> > return 1;
> > }
> >
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] powerpc: kernel/kgdb.c: fix memory leakage
2013-02-08 2:41 ` Benjamin Herrenschmidt
@ 2013-02-27 2:44 ` tiejun.chen
0 siblings, 0 replies; 4+ messages in thread
From: tiejun.chen @ 2013-02-27 2:44 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Stephen Rothwell, Michael Neuling, Cong Ding, linux-kernel,
Paul Mackerras, Jason Wessel, linuxppc-dev
On 02/08/2013 10:41 AM, Benjamin Herrenschmidt wrote:
> On Thu, 2013-01-31 at 20:04 -0600, Jason Wessel wrote:
>
>>> diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
>>> index 8747447..5ca82cd 100644
>>> --- a/arch/powerpc/kernel/kgdb.c
>>> +++ b/arch/powerpc/kernel/kgdb.c
>>> @@ -154,12 +154,12 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
>>> static int kgdb_singlestep(struct pt_regs *regs)
>>> {
>>> struct thread_info *thread_info, *exception_thread_info;
>>> - struct thread_info *backup_current_thread_info = \
>>> - (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
>>> + struct thread_info *backup_current_thread_info;
>>
>>
>>
>> Woh... This is definitely wrong. You have found a problem for sure,
>> but this is not the right way to fix it.
>>
>> It is not a good idea to kmalloc while single stepping because you can
>> hang the kernel if you single step any operation in kmalloc().
>
> Ok. I applied the fix because it was obviously correct vs. the previous
> version of the code (ie. the kmalloc was already there)
>
>> I am in the process of going through all the kgdb mails from the last
>> few months while I had been away from the project, so I didn't catch
>> this one and I see it has upstream commit (fefd9e6f8). I'll submit
>> another patch to fix this the right way and use a static variable.
>> This is ok to use a static variable here because this is not something
>> we can recursively call at a single CPU level.
>
> But a static will be shared by all CPUs or do you mean a per-cpu one ?
>
>> If Ben prefers we not burn the memory unless kgdb is active we can
>> kmalloc / kfree the space we need at the time that kgdb is
>> initialized. Else we can go with this patch you see below. We'll see
>> what Ben desires.
>
> What about the stack ? thread info isn't very big...
Actually booke already copy the thread_info when we enter the debug exception,
and I will send a patch to do the same thing for book3e, so I also remove these
copying action here then we're happy without these nasty stuff :)
Tiejun
>
> Cheers,
> Ben.
>
>> -----
>> diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
>> index a7bc752..bb12c8b 100644
>> --- a/arch/powerpc/kernel/kgdb.c
>> +++ b/arch/powerpc/kernel/kgdb.c
>> @@ -151,15 +151,16 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
>> return 1;
>> }
>>
>> +static struct thread_info kgdb_backup_thread_info[NR_CPUS];
>> +
>> static int kgdb_singlestep(struct pt_regs *regs)
>> {
>> struct thread_info *thread_info, *exception_thread_info;
>> - struct thread_info *backup_current_thread_info;
>> + int cpu = raw_smp_processor_id();
>>
>> if (user_mode(regs))
>> return 0;
>>
>> - backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
>> /*
>> * On Book E and perhaps other processors, singlestep is handled on
>> * the critical exception stack. This causes current_thread_info()
>> @@ -175,7 +176,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
>>
>> if (thread_info != exception_thread_info) {
>> /* Save the original current_thread_info. */
>> - memcpy(backup_current_thread_info, exception_thread_info, sizeof *thread_info);
>> + memcpy(&kgdb_backup_thread_info[cpu], exception_thread_info, sizeof *thread_info);
>> memcpy(exception_thread_info, thread_info, sizeof *thread_info);
>> }
>>
>> @@ -183,9 +184,8 @@ static int kgdb_singlestep(struct pt_regs *regs)
>>
>> if (thread_info != exception_thread_info)
>> /* Restore current_thread_info lastly. */
>> - memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
>> + memcpy(exception_thread_info, &kgdb_backup_thread_info[cpu], sizeof *thread_info);
>>
>> - kfree(backup_current_thread_info);
>> return 1;
>> }
>>
>>
>> -----
>>
>>
>> Thanks,
>> Jason.
>>
>>
>>>
>>> if (user_mode(regs))
>>> return 0;
>>>
>>> + backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
>>> /*
>>> * On Book E and perhaps other processors, singlestep is handled on
>>> * the critical exception stack. This causes current_thread_info()
>>> @@ -185,6 +185,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
>>> /* Restore current_thread_info lastly. */
>>> memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
>>>
>>> + kfree(backup_current_thread_info);
>>> return 1;
>>> }
>>>
>>>
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-27 2:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-14 17:26 [PATCH] powerpc: kernel/kgdb.c: fix memory leakage Cong Ding
2013-02-01 2:04 ` Jason Wessel
2013-02-08 2:41 ` Benjamin Herrenschmidt
2013-02-27 2:44 ` tiejun.chen
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).