diff options
| author | mjg <mjg@FreeBSD.org> | 2017-03-14 20:39:06 +0000 |
|---|---|---|
| committer | mjg <mjg@FreeBSD.org> | 2017-03-14 20:39:06 +0000 |
| commit | 57f28a25af7dd32fc8adea80c5ebb2b237cc86a6 (patch) | |
| tree | 737cb08dda40f605ac675a646c2cc84187887b9a | |
| parent | 8c08bfe0a237cbc568a58adcefa2b61e7a46fa9d (diff) | |
| download | FreeBSD-src-57f28a25af7dd32fc8adea80c5ebb2b237cc86a6.zip FreeBSD-src-57f28a25af7dd32fc8adea80c5ebb2b237cc86a6.tar.gz | |
MFC r312888:
Introduce __read_mostly and __exclusive_cache_line macros.
The intended use is to annotate frequently used globals which either rarely
change (and thus can be grouped in the same cacheline) or are an atomic counter
(which means it may benefit from being the only variable in the cacheline).
Linker script support is provided only for amd64. Architectures without it risk
having other variables put in, i.e. as if they were not annotated. This is
harmless from correctness point of view.
| -rw-r--r-- | sys/compat/linuxkpi/common/include/linux/compiler.h | 1 | ||||
| -rw-r--r-- | sys/conf/ldscript.amd64 | 11 | ||||
| -rw-r--r-- | sys/dev/drm2/drm_os_freebsd.h | 1 | ||||
| -rw-r--r-- | sys/sys/systm.h | 6 |
4 files changed, 17 insertions, 2 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index c780abc..c32f1fa 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -67,7 +67,6 @@ #define typeof(x) __typeof(x) #define uninitialized_var(x) x = x -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) #define __always_unused __unused #define __must_check __result_use_check diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64 index a9521d8..80ddba9 100644 --- a/sys/conf/ldscript.amd64 +++ b/sys/conf/ldscript.amd64 @@ -145,6 +145,17 @@ SECTIONS .got : { *(.got) } . = DATA_SEGMENT_RELRO_END (24, .); .got.plt : { *(.got.plt) } + . = ALIGN(64); + .data.read_mostly : + { + *(.data.read_mostly) + } + . = ALIGN(64); + .data.exclusive_cache_line : + { + *(.data.exclusive_cache_line) + } + . = ALIGN(64); .data : { *(.data .data.* .gnu.linkonce.d.*) diff --git a/sys/dev/drm2/drm_os_freebsd.h b/sys/dev/drm2/drm_os_freebsd.h index 3c99838..78e4766 100644 --- a/sys/dev/drm2/drm_os_freebsd.h +++ b/sys/dev/drm2/drm_os_freebsd.h @@ -80,7 +80,6 @@ typedef void irqreturn_t; #define __init #define __exit -#define __read_mostly #define BUILD_BUG_ON(x) CTASSERT(!(x)) #define BUILD_BUG_ON_NOT_POWER_OF_2(x) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 5421b12..02c5db8 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -131,6 +131,12 @@ void kassert_panic(const char *fmt, ...) __printflike(1, 2); #define SCHEDULER_STOPPED() __predict_false(curthread->td_stopsched) /* + * Align variables. + */ +#define __read_mostly __section(".data.read_mostly") +#define __exclusive_cache_line __aligned(CACHE_LINE_SIZE) \ + __section(".data.exclusive_cache_line") +/* * XXX the hints declarations are even more misplaced than most declarations * in this file, since they are needed in one file (per arch) and only used * in two files. |
