* [PATCH -stable] modules fix incorrect percpu usage
@ 2010-03-30 3:32 Mathieu Desnoyers
2010-03-30 3:36 ` [PATCH] " Mathieu Desnoyers
0 siblings, 1 reply; 8+ messages in thread
From: Mathieu Desnoyers @ 2010-03-30 3:32 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Randy Dunlap, Eric Dumazet, Rusty Russell, Peter Zijlstra,
Tejun Heo, Ingo Molnar, Andrew Morton, Linus Torvalds,
Greg Kroah-Hartman, Steven Rostedt
Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
for per cpu pointers).
Introduced by commit:
module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
This patch should be queued for the stable branch, for kernels 2.6.29.x to
2.6.33.x.
(tested on 2.6.33.1 x86_64)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Randy Dunlap <randy.dunlap@oracle.com>
CC: Eric Dumazet <dada1@cosmosbay.com>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Tejun Heo <tj@kernel.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Greg Kroah-Hartman <gregkh@suse.de>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: stable <stable@kernel.org>
---
kernel/module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6-lttng/kernel/module.c
===================================================================
--- linux-2.6-lttng.orig/kernel/module.c 2010-03-29 23:47:05.000000000 -0400
+++ linux-2.6-lttng/kernel/module.c 2010-03-29 23:47:27.000000000 -0400
@@ -412,7 +412,7 @@ static void percpu_modcopy(void *pcpudes
int cpu;
for_each_possible_cpu(cpu)
- memcpy(pcpudest + per_cpu_offset(cpu), from, size);
+ memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
}
#else /* ... !CONFIG_SMP */
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] modules fix incorrect percpu usage
2010-03-30 3:32 [PATCH -stable] modules fix incorrect percpu usage Mathieu Desnoyers
@ 2010-03-30 3:36 ` Mathieu Desnoyers
2010-03-30 13:20 ` Steven Rostedt
0 siblings, 1 reply; 8+ messages in thread
From: Mathieu Desnoyers @ 2010-03-30 3:36 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Randy Dunlap, Eric Dumazet, Rusty Russell, Peter Zijlstra,
Tejun Heo, Ingo Molnar, Andrew Morton, Linus Torvalds,
Greg Kroah-Hartman, Steven Rostedt
* Mathieu Desnoyers (mathieu.desnoyers@efficios.com) wrote:
> Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
> for per cpu pointers).
>
> Introduced by commit:
>
> module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
>
> This patch should be queued for the stable branch, for kernels 2.6.29.x to
> 2.6.33.x.
> (tested on 2.6.33.1 x86_64)
It's actually needed for mainline too (2.6.34-rc2).
Thanks,
Mathieu
>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> CC: Randy Dunlap <randy.dunlap@oracle.com>
> CC: Eric Dumazet <dada1@cosmosbay.com>
> CC: Rusty Russell <rusty@rustcorp.com.au>
> CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
> CC: Tejun Heo <tj@kernel.org>
> CC: Ingo Molnar <mingo@elte.hu>
> CC: Andrew Morton <akpm@linux-foundation.org>
> CC: Linus Torvalds <torvalds@linux-foundation.org>
> CC: Greg Kroah-Hartman <gregkh@suse.de>
> CC: Steven Rostedt <rostedt@goodmis.org>
> CC: stable <stable@kernel.org>
> ---
> kernel/module.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6-lttng/kernel/module.c
> ===================================================================
> --- linux-2.6-lttng.orig/kernel/module.c 2010-03-29 23:47:05.000000000 -0400
> +++ linux-2.6-lttng/kernel/module.c 2010-03-29 23:47:27.000000000 -0400
> @@ -412,7 +412,7 @@ static void percpu_modcopy(void *pcpudes
> int cpu;
>
> for_each_possible_cpu(cpu)
> - memcpy(pcpudest + per_cpu_offset(cpu), from, size);
> + memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
> }
>
> #else /* ... !CONFIG_SMP */
>
> --
> Mathieu Desnoyers
> Operating System Efficiency R&D Consultant
> EfficiOS Inc.
> http://www.efficios.com
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] modules fix incorrect percpu usage
2010-03-30 3:36 ` [PATCH] " Mathieu Desnoyers
@ 2010-03-30 13:20 ` Steven Rostedt
2010-03-30 13:50 ` Mathieu Desnoyers
0 siblings, 1 reply; 8+ messages in thread
From: Steven Rostedt @ 2010-03-30 13:20 UTC (permalink / raw)
To: Mathieu Desnoyers
Cc: linux-kernel, stable, Randy Dunlap, Eric Dumazet, Rusty Russell,
Peter Zijlstra, Tejun Heo, Ingo Molnar, Andrew Morton,
Linus Torvalds, Greg Kroah-Hartman
On Mon, 2010-03-29 at 23:36 -0400, Mathieu Desnoyers wrote:
> * Mathieu Desnoyers (mathieu.desnoyers@efficios.com) wrote:
> > Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
> > for per cpu pointers).
> >
> > Introduced by commit:
> >
> > module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
> >
> > This patch should be queued for the stable branch, for kernels 2.6.29.x to
> > 2.6.33.x.
> > (tested on 2.6.33.1 x86_64)
>
> It's actually needed for mainline too (2.6.34-rc2).
Then all you need to do is submit it for mainline with a
"Cc: stable@kernel.org" as you did below. It will then automatically be
added to the stable queue when Linus pulls it.
-- Steve
>
> Thanks,
>
> Mathieu
>
> >
> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> > CC: Randy Dunlap <randy.dunlap@oracle.com>
> > CC: Eric Dumazet <dada1@cosmosbay.com>
> > CC: Rusty Russell <rusty@rustcorp.com.au>
> > CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > CC: Tejun Heo <tj@kernel.org>
> > CC: Ingo Molnar <mingo@elte.hu>
> > CC: Andrew Morton <akpm@linux-foundation.org>
> > CC: Linus Torvalds <torvalds@linux-foundation.org>
> > CC: Greg Kroah-Hartman <gregkh@suse.de>
> > CC: Steven Rostedt <rostedt@goodmis.org>
> > CC: stable <stable@kernel.org>
> > ---
> > kernel/module.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] modules fix incorrect percpu usage
2010-03-30 13:20 ` Steven Rostedt
@ 2010-03-30 13:50 ` Mathieu Desnoyers
2010-04-19 18:28 ` [stable] " Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Mathieu Desnoyers @ 2010-03-30 13:50 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, stable, Randy Dunlap, Eric Dumazet, Rusty Russell,
Peter Zijlstra, Tejun Heo, Ingo Molnar, Andrew Morton,
Linus Torvalds, Greg Kroah-Hartman
* Steven Rostedt (rostedt@goodmis.org) wrote:
> On Mon, 2010-03-29 at 23:36 -0400, Mathieu Desnoyers wrote:
> > * Mathieu Desnoyers (mathieu.desnoyers@efficios.com) wrote:
> > > Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
> > > for per cpu pointers).
> > >
> > > Introduced by commit:
> > >
> > > module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
> > >
> > > This patch should be queued for the stable branch, for kernels 2.6.29.x to
> > > 2.6.33.x.
> > > (tested on 2.6.33.1 x86_64)
> >
> > It's actually needed for mainline too (2.6.34-rc2).
>
> Then all you need to do is submit it for mainline with a
> "Cc: stable@kernel.org" as you did below. It will then automatically be
> added to the stable queue when Linus pulls it.
OK, thanks for the info.
Mathieu
>
> -- Steve
>
> >
> > Thanks,
> >
> > Mathieu
> >
> > >
> > > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> > > CC: Randy Dunlap <randy.dunlap@oracle.com>
> > > CC: Eric Dumazet <dada1@cosmosbay.com>
> > > CC: Rusty Russell <rusty@rustcorp.com.au>
> > > CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > > CC: Tejun Heo <tj@kernel.org>
> > > CC: Ingo Molnar <mingo@elte.hu>
> > > CC: Andrew Morton <akpm@linux-foundation.org>
> > > CC: Linus Torvalds <torvalds@linux-foundation.org>
> > > CC: Greg Kroah-Hartman <gregkh@suse.de>
> > > CC: Steven Rostedt <rostedt@goodmis.org>
> > > CC: stable <stable@kernel.org>
> > > ---
> > > kernel/module.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > >
>
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [stable] [PATCH] modules fix incorrect percpu usage
2010-03-30 13:50 ` Mathieu Desnoyers
@ 2010-04-19 18:28 ` Greg KH
2010-04-20 14:34 ` Mathieu Desnoyers
0 siblings, 1 reply; 8+ messages in thread
From: Greg KH @ 2010-04-19 18:28 UTC (permalink / raw)
To: Mathieu Desnoyers
Cc: Steven Rostedt, Randy Dunlap, Greg Kroah-Hartman, Peter Zijlstra,
Rusty Russell, linux-kernel, Andrew Morton, Eric Dumazet,
Tejun Heo, Ingo Molnar, Linus Torvalds, stable
On Tue, Mar 30, 2010 at 09:50:47AM -0400, Mathieu Desnoyers wrote:
> * Steven Rostedt (rostedt@goodmis.org) wrote:
> > On Mon, 2010-03-29 at 23:36 -0400, Mathieu Desnoyers wrote:
> > > * Mathieu Desnoyers (mathieu.desnoyers@efficios.com) wrote:
> > > > Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
> > > > for per cpu pointers).
> > > >
> > > > Introduced by commit:
> > > >
> > > > module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
> > > >
> > > > This patch should be queued for the stable branch, for kernels 2.6.29.x to
> > > > 2.6.33.x.
> > > > (tested on 2.6.33.1 x86_64)
> > >
> > > It's actually needed for mainline too (2.6.34-rc2).
> >
> > Then all you need to do is submit it for mainline with a
> > "Cc: stable@kernel.org" as you did below. It will then automatically be
> > added to the stable queue when Linus pulls it.
>
> OK, thanks for the info.
And I need to wait until it goes into Linus's tree before it can be
applied to the stable tree. This hasn't happened yet, right?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [stable] [PATCH] modules fix incorrect percpu usage
2010-04-19 18:28 ` [stable] " Greg KH
@ 2010-04-20 14:34 ` Mathieu Desnoyers
2010-04-21 10:51 ` Tejun Heo
2010-04-21 22:39 ` Greg KH
0 siblings, 2 replies; 8+ messages in thread
From: Mathieu Desnoyers @ 2010-04-20 14:34 UTC (permalink / raw)
To: Greg KH
Cc: Steven Rostedt, Randy Dunlap, Greg Kroah-Hartman, Peter Zijlstra,
Rusty Russell, linux-kernel, Andrew Morton, Eric Dumazet,
Tejun Heo, Ingo Molnar, Linus Torvalds, stable
* Greg KH (greg@kroah.com) wrote:
> On Tue, Mar 30, 2010 at 09:50:47AM -0400, Mathieu Desnoyers wrote:
> > * Steven Rostedt (rostedt@goodmis.org) wrote:
> > > On Mon, 2010-03-29 at 23:36 -0400, Mathieu Desnoyers wrote:
> > > > * Mathieu Desnoyers (mathieu.desnoyers@efficios.com) wrote:
> > > > > Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
> > > > > for per cpu pointers).
> > > > >
> > > > > Introduced by commit:
> > > > >
> > > > > module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
> > > > >
> > > > > This patch should be queued for the stable branch, for kernels 2.6.29.x to
> > > > > 2.6.33.x.
> > > > > (tested on 2.6.33.1 x86_64)
> > > >
> > > > It's actually needed for mainline too (2.6.34-rc2).
> > >
> > > Then all you need to do is submit it for mainline with a
> > > "Cc: stable@kernel.org" as you did below. It will then automatically be
> > > added to the stable queue when Linus pulls it.
> >
> > OK, thanks for the info.
>
> And I need to wait until it goes into Linus's tree before it can be
> applied to the stable tree. This hasn't happened yet, right?
>
> thanks,
>
> greg k-h
Same here, for module.c fix. Feel free to choose between this fix or the
corresponding refactoring from Tejun.
modules fix incorrect percpu usage
Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
for per cpu pointers).
Introduced by commit:
module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
This patch should be queued for the stable branch, for kernels 2.6.29.x to
2.6.33.x. (tested on 2.6.33.1 x86_64)
Mainline does not need this fix, as commit
259354deaaf03d49a02dbb9975d6ec2a54675672 fixed the problem by refactoring.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Randy Dunlap <randy.dunlap@oracle.com>
CC: Eric Dumazet <dada1@cosmosbay.com>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Tejun Heo <tj@kernel.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Greg Kroah-Hartman <gregkh@suse.de>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: stable <stable@kernel.org>
---
kernel/module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux.trees.git/kernel/module.c
===================================================================
--- linux.trees.git.orig/kernel/module.c 2010-03-27 11:27:23.000000000 -0400
+++ linux.trees.git/kernel/module.c 2010-03-30 09:48:41.000000000 -0400
@@ -405,7 +405,7 @@ static void percpu_modcopy(void *pcpudes
int cpu;
for_each_possible_cpu(cpu)
- memcpy(pcpudest + per_cpu_offset(cpu), from, size);
+ memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
}
#else /* ... !CONFIG_SMP */
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [stable] [PATCH] modules fix incorrect percpu usage
2010-04-20 14:34 ` Mathieu Desnoyers
@ 2010-04-21 10:51 ` Tejun Heo
2010-04-21 22:39 ` Greg KH
1 sibling, 0 replies; 8+ messages in thread
From: Tejun Heo @ 2010-04-21 10:51 UTC (permalink / raw)
To: Mathieu Desnoyers
Cc: Greg KH, Steven Rostedt, Randy Dunlap, Greg Kroah-Hartman,
Peter Zijlstra, Rusty Russell, linux-kernel, Andrew Morton,
Eric Dumazet, Ingo Molnar, Linus Torvalds, stable
Hello,
On 04/20/2010 04:34 PM, Mathieu Desnoyers wrote:
> Same here, for module.c fix. Feel free to choose between this fix or the
> corresponding refactoring from Tejun.
Please take this one for -stable. I don't think the percpu
refactoring is worthwhile to backport to -stable. It only affects
debug feature and the worst outcome is spurious warning messages.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [stable] [PATCH] modules fix incorrect percpu usage
2010-04-20 14:34 ` Mathieu Desnoyers
2010-04-21 10:51 ` Tejun Heo
@ 2010-04-21 22:39 ` Greg KH
1 sibling, 0 replies; 8+ messages in thread
From: Greg KH @ 2010-04-21 22:39 UTC (permalink / raw)
To: Mathieu Desnoyers
Cc: Steven Rostedt, Randy Dunlap, Greg Kroah-Hartman, Peter Zijlstra,
Rusty Russell, linux-kernel, Andrew Morton, Eric Dumazet,
Tejun Heo, Ingo Molnar, Linus Torvalds, stable
On Tue, Apr 20, 2010 at 10:34:57AM -0400, Mathieu Desnoyers wrote:
> * Greg KH (greg@kroah.com) wrote:
> > On Tue, Mar 30, 2010 at 09:50:47AM -0400, Mathieu Desnoyers wrote:
> > > * Steven Rostedt (rostedt@goodmis.org) wrote:
> > > > On Mon, 2010-03-29 at 23:36 -0400, Mathieu Desnoyers wrote:
> > > > > * Mathieu Desnoyers (mathieu.desnoyers@efficios.com) wrote:
> > > > > > Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
> > > > > > for per cpu pointers).
> > > > > >
> > > > > > Introduced by commit:
> > > > > >
> > > > > > module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3
> > > > > >
> > > > > > This patch should be queued for the stable branch, for kernels 2.6.29.x to
> > > > > > 2.6.33.x.
> > > > > > (tested on 2.6.33.1 x86_64)
> > > > >
> > > > > It's actually needed for mainline too (2.6.34-rc2).
> > > >
> > > > Then all you need to do is submit it for mainline with a
> > > > "Cc: stable@kernel.org" as you did below. It will then automatically be
> > > > added to the stable queue when Linus pulls it.
> > >
> > > OK, thanks for the info.
> >
> > And I need to wait until it goes into Linus's tree before it can be
> > applied to the stable tree. This hasn't happened yet, right?
> >
> > thanks,
> >
> > greg k-h
>
> Same here, for module.c fix. Feel free to choose between this fix or the
> corresponding refactoring from Tejun.
Thanks, I took this one.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-04-22 8:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-30 3:32 [PATCH -stable] modules fix incorrect percpu usage Mathieu Desnoyers
2010-03-30 3:36 ` [PATCH] " Mathieu Desnoyers
2010-03-30 13:20 ` Steven Rostedt
2010-03-30 13:50 ` Mathieu Desnoyers
2010-04-19 18:28 ` [stable] " Greg KH
2010-04-20 14:34 ` Mathieu Desnoyers
2010-04-21 10:51 ` Tejun Heo
2010-04-21 22:39 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.