From 001d402c894627cb2e05927a3923109272009368 Mon Sep 17 00:00:00 2001 From: Volodymyr Fialko Date: Tue, 9 Nov 2021 10:59:52 +0100 Subject: [PATCH] eal/arm64: support ASan This patch defines ASAN_SHADOW_OFFSET for arm64 according to the ASan documentation. This offset should cover all arm64 VMAs supported by ASan. Signed-off-by: Volodymyr Fialko Reviewed-by: David Marchand Acked-by: Jerin Jacob Acked-by: Ruifeng Wang --- config/meson.build | 2 +- doc/guides/prog_guide/asan.rst | 2 +- lib/eal/common/malloc_elem.h | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/meson.build b/config/meson.build index 5926892a68..3f5912fce7 100644 --- a/config/meson.build +++ b/config/meson.build @@ -433,7 +433,7 @@ if get_option('b_sanitize') == 'address' or get_option('b_sanitize') == 'address dpdk_extra_ldflags += '-lasan' endif - if is_linux and arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64') + if is_linux and arch_subdir in ['x86', 'arm'] and dpdk_conf.get('RTE_ARCH_64') dpdk_conf.set10('RTE_MALLOC_ASAN', true) endif endif diff --git a/doc/guides/prog_guide/asan.rst b/doc/guides/prog_guide/asan.rst index 6d1b871c93..28b2382fc7 100644 --- a/doc/guides/prog_guide/asan.rst +++ b/doc/guides/prog_guide/asan.rst @@ -33,7 +33,7 @@ Example:: "stty echo" command when an error occurs. ASan is aware of DPDK memory allocations, thanks to added instrumentation. -This is only enabled on x86_64 at the moment. +This is enabled on x86_64 and arm64 at the moment. Other architectures may have to define ASAN_SHADOW_OFFSET. Example heap-buffer-overflow error diff --git a/lib/eal/common/malloc_elem.h b/lib/eal/common/malloc_elem.h index 262d69bb3e..b982c83f70 100644 --- a/lib/eal/common/malloc_elem.h +++ b/lib/eal/common/malloc_elem.h @@ -104,8 +104,14 @@ malloc_elem_cookies_ok(const struct malloc_elem *elem) #ifdef RTE_MALLOC_ASAN +/* + * ASAN_SHADOW_OFFSET should match to the corresponding + * value defined in gcc/libsanitizer/asan/asan_mapping.h + */ #ifdef RTE_ARCH_X86_64 #define ASAN_SHADOW_OFFSET 0x00007fff8000 +#elif defined(RTE_ARCH_ARM64) +#define ASAN_SHADOW_OFFSET 0x001000000000 #endif #define ASAN_SHADOW_GRAIN_SIZE 8 -- 2.39.5