Improve alloc_percpu: switch over to (renamed) percpu_modfree.
Subsystems (4)
PATCH 4/7 Improve alloc_percpu: switch over to (renamed) percpu_modfree.
Now the switch: rename percpu_modalloc to __alloc_percpu, and percpu_modfree to free_percpu and export them.
We delete the old ones, including the unused percpu_alloc, percpu_alloc_mask and percpu_ptr.
per_cpu_ptr now uses RELOC_HIDE on per_cpu_offset, just like static per-cpu variables (not SHIFT_PERCPU_PTR: this has side effects on S/390 and Alpha).
The Alpha changes are untested.
Signed-off-by Rusty Russell <[email protected]>
Cc Christoph Lameter <[email protected]>
--- arch/alpha/include/asm/percpu.h | 3 include/asm-generic/percpu.h | 4 + include/linux/percpu.h | 58 +--------------- kernel/module.c | 8 +- mm/allocpercpu.c | 143 +--------------------------------------- 5 files changed, 23 insertions(+), 193 deletions(-)
arch/alpha/include/asm/percpu.h +3 -0
@@ -62,12 +62,15 @@ (*SHIFT_PERCPU_PTR(var, my_cpu_offset))#define __raw_get_cpu_var (var) \ (*SHIFT_PERCPU_PTR(var, __my_cpu_offset)) +#define per_cpu_ptr (ptr, cpu) \ + RELOC_HIDE((ptr), (per_cpu_offset(cpu)))#else /* ! SMP */ #define per_cpu (var, cpu) (*((void)(cpu), &per_cpu_var(var)))#define __get_cpu_var (var) per_cpu_var(var)#define __raw_get_cpu_var (var) per_cpu_var(var) +#define per_cpu_ptr (ptr, cpu) (ptr)#define PER_CPU_ATTRIBUTES
include/asm-generic/percpu.h +4 -0
@@ -60,6 +60,9 @@#define __raw_get_cpu_var (var) \ (*SHIFT_PERCPU_PTR(&per_cpu_var(var), __my_cpu_offset)) +/* Use RELOC_HIDE: some arch's SHIFT_PERCPU_PTR really want an identifier. */ +#define per_cpu_ptr (ptr, cpu) \ + RELOC_HIDE((ptr), (per_cpu_offset(cpu)))#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA extern void setup_per_cpu_areas (void );
@@ -70,6 +73,7 @@#define per_cpu (var, cpu) (*((void)(cpu), &per_cpu_var(var)))#define __get_cpu_var (var) per_cpu_var(var)#define __raw_get_cpu_var (var) per_cpu_var(var) +#define per_cpu_ptr (ptr, cpu) (ptr)#endif /* SMP */
include/linux/percpu.h +7 -51
73 lines not on this page · raw message
kernel/module.c +4 -4
@@ -1312,7 +1312,7 @@/* This may be NULL, but that's OK */ module_free (mod, mod->module_init);kfree (mod->args); -percpu_modfree (mod->percpu); +free_percpu (mod->percpu);/* Free lock-classes: */ lockdep_free_key_range (mod->module_core, mod->core_size);
@@ -1851,8 +1851,8 @@if (pcpuindex) {/* We have a special allocation for this section. */ - percpu =percpu_modalloc (sechdrs[pcpuindex].sh_size, - sechdrs[pcpuindex].sh_addralign); + percpu =__alloc_percpu (sechdrs[pcpuindex].sh_size, + sechdrs[pcpuindex].sh_addralign);if (!percpu) { err = -ENOMEM ; goto free_mod;
@@ -2130,7 +2130,7 @@ free_core:module_free (mod, mod->module_core); free_percpu: -percpu_modfree (percpu); +free_percpu (percpu); free_mod:kfree (args); free_hdr:
mm/allocpercpu.c +5 -138
172 lines not on this page · raw message