Messages in this thread | | | Date | Mon, 29 Mar 2010 23:36:17 -0400 | From | Mathieu Desnoyers <> | Subject | Re: [PATCH] modules fix incorrect percpu usage |
| |
* 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
| |