Commit 0bd74fa8 authored by Brian Gerst's avatar Brian Gerst Committed by Tejun Heo
Browse files

percpu: refactor percpu.h 



Impact: cleanup

Refactor the DEFINE_PER_CPU_* macros and add .data.percpu.first
section.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8ce03197

include/asm-generic/vmlinux.lds.h

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ 
 */

#define PERCPU_VADDR(vaddr, phdr)					\

	PERCPU_PROLOG(vaddr)						\

		*(.data.percpu.first)					\

		*(.data.percpu.page_aligned)				\

		*(.data.percpu)						\

		*(.data.percpu.shared_aligned)				\

include/linux/percpu.h

+23 −18
Original line number Diff line number Diff line
@@ -9,34 +9,39 @@ 
#include <asm/percpu.h>



#ifdef CONFIG_SMP

#define DEFINE_PER_CPU(type, name)					\

	__attribute__((__section__(".data.percpu")))			\

	PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name

#define PER_CPU_BASE_SECTION ".data.percpu"



#ifdef MODULE

#define SHARED_ALIGNED_SECTION ".data.percpu"

#define PER_CPU_SHARED_ALIGNED_SECTION ""

#else

#define SHARED_ALIGNED_SECTION ".data.percpu.shared_aligned"

#define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned"

#endif

#define PER_CPU_FIRST_SECTION ".first"



#define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)			\

	__attribute__((__section__(SHARED_ALIGNED_SECTION)))		\

	PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name		\

	____cacheline_aligned_in_smp

#else



#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)			\

	__attribute__((__section__(".data.percpu.page_aligned")))	\

#define PER_CPU_BASE_SECTION ".data"

#define PER_CPU_SHARED_ALIGNED_SECTION ""

#define PER_CPU_FIRST_SECTION ""



#endif



#define DEFINE_PER_CPU_SECTION(type, name, section)			\

	__attribute__((__section__(PER_CPU_BASE_SECTION section)))	\

	PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name

#else



#define DEFINE_PER_CPU(type, name)					\

	PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name

	DEFINE_PER_CPU_SECTION(type, name, "")



#define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)			\

	DEFINE_PER_CPU(type, name)

	DEFINE_PER_CPU_SECTION(type, name, PER_CPU_SHARED_ALIGNED_SECTION) \

	____cacheline_aligned_in_smp



#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)				\

	DEFINE_PER_CPU(type, name)

#endif

	DEFINE_PER_CPU_SECTION(type, name, ".page_aligned")



#define DEFINE_PER_CPU_FIRST(type, name)				\

	DEFINE_PER_CPU_SECTION(type, name, PER_CPU_FIRST_SECTION)



#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var)

#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)