394e3902c5
When we stop allocating percpu memory for not-possible CPUs we must not touch the percpu data for not-possible CPUs at all. The correct way of doing this is to test cpu_possible() or to use for_each_cpu(). This patch is a kernel-wide sweep of all instances of NR_CPUS. I found very few instances of this bug, if any. But the patch converts lots of open-coded test to use the preferred helper macros. Cc: Mikael Starvik <starvik@axis.com> Cc: David Howells <dhowells@redhat.com> Acked-by: Kyle McMartin <kyle@parisc-linux.org> Cc: Anton Blanchard <anton@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: William Lee Irwin III <wli@holomorphy.com> Cc: Andi Kleen <ak@muc.de> Cc: Christian Zankel <chris@zankel.net> Cc: Philippe Elie <phil.el@wanadoo.fr> Cc: Nathan Scott <nathans@sgi.com> Cc: Jens Axboe <axboe@suse.de> Cc: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
70 lines
2.0 KiB
C
70 lines
2.0 KiB
C
#ifndef __ARCH_S390_PERCPU__
|
|
#define __ARCH_S390_PERCPU__
|
|
|
|
#include <linux/compiler.h>
|
|
#include <asm/lowcore.h>
|
|
|
|
#define __GENERIC_PER_CPU
|
|
|
|
/*
|
|
* s390 uses its own implementation for per cpu data, the offset of
|
|
* the cpu local data area is cached in the cpu's lowcore memory.
|
|
* For 64 bit module code s390 forces the use of a GOT slot for the
|
|
* address of the per cpu variable. This is needed because the module
|
|
* may be more than 4G above the per cpu area.
|
|
*/
|
|
#if defined(__s390x__) && defined(MODULE)
|
|
|
|
#define __reloc_hide(var,offset) \
|
|
(*({ unsigned long *__ptr; \
|
|
asm ( "larl %0,per_cpu__"#var"@GOTENT" \
|
|
: "=a" (__ptr) : "X" (per_cpu__##var) ); \
|
|
(typeof(&per_cpu__##var))((*__ptr) + (offset)); }))
|
|
|
|
#else
|
|
|
|
#define __reloc_hide(var, offset) \
|
|
(*({ unsigned long __ptr; \
|
|
asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) ); \
|
|
(typeof(&per_cpu__##var)) (__ptr + (offset)); }))
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
extern unsigned long __per_cpu_offset[NR_CPUS];
|
|
|
|
/* Separate out the type, so (int[3], foo) works. */
|
|
#define DEFINE_PER_CPU(type, name) \
|
|
__attribute__((__section__(".data.percpu"))) \
|
|
__typeof__(type) per_cpu__##name
|
|
|
|
#define __get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset)
|
|
#define per_cpu(var,cpu) __reloc_hide(var,__per_cpu_offset[cpu])
|
|
|
|
/* A macro to avoid #include hell... */
|
|
#define percpu_modcopy(pcpudst, src, size) \
|
|
do { \
|
|
unsigned int __i; \
|
|
for_each_cpu(__i) \
|
|
memcpy((pcpudst)+__per_cpu_offset[__i], \
|
|
(src), (size)); \
|
|
} while (0)
|
|
|
|
#else /* ! SMP */
|
|
|
|
#define DEFINE_PER_CPU(type, name) \
|
|
__typeof__(type) per_cpu__##name
|
|
|
|
#define __get_cpu_var(var) __reloc_hide(var,0)
|
|
#define per_cpu(var,cpu) __reloc_hide(var,0)
|
|
|
|
#endif /* SMP */
|
|
|
|
#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name
|
|
|
|
#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var)
|
|
#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)
|
|
|
|
#endif /* __ARCH_S390_PERCPU__ */
|