diff options
| author |   Brian Brooks <brian.brooks@arm.com> | 2017-11-07 21:28:42 -0600 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-11-10 22:26:10 +0000 |
| commit | a3eb63c58543ca9a651692502805bf8272ed6d79 (patch) | |
| tree | 727c8fd9c42edbc0130a0d811f3d93ba83c3efe0 /src/svm | |
| parent | 375e468da3105ed33e164feb572e1c70d826307c (diff) | |
Map SVM regions at a sane offset on arm64
Mapping shared virtual memory at 0x30000000, which appears to be derived
from x86-32, turns out to be too close to the heap on arm64 systems. The
symptoms of memory corruption were random and included crashes in the
Python runtime and what appeared to be corruption of malloc's internal
mutex. Thanks to Gabriel Ganne for pointing out that disabling ASLR seemed
to mitigate the situation.
This patch maps SVM regions at an offset from the arm64 kernel constant
TASK_UNMAPPED_BASE and also assumes a 48-bit VA (for Ubuntu).
Change-Id: I642e5fe83344ab9b5c66c93e0cf1575c17251f3b
Signed-off-by: Brian Brooks <brian.brooks@arm.com>
Diffstat (limited to 'src/svm')
| -rw-r--r-- | src/svm/svm_common.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/svm/svm_common.h b/src/svm/svm_common.h index a7160286a44..58cd0e94f5c 100644 --- a/src/svm/svm_common.h +++ b/src/svm/svm_common.h @@ -83,9 +83,15 @@ typedef struct svm_map_region_args_ * Base should be "out of the way," and size should be big enough to * cover everything we plan to put here. */ -#define SVM_GLOBAL_REGION_BASEVA 0x30000000 #define SVM_GLOBAL_REGION_SIZE (64<<20) #define SVM_GLOBAL_REGION_NAME "/global_vm" +#if defined (__aarch64__) +#define VA_BITS 48 +#define BASEVA ((1ul << VA_BITS) / 4) +#define SVM_GLOBAL_REGION_BASEVA (BASEVA - (2 * SVM_GLOBAL_REGION_SIZE)) +#else +#define SVM_GLOBAL_REGION_BASEVA 0x30000000 +#endif /* * Memory shared across individual router instances. |