michaelh/zephyr
1
0
Fork 0
Code Releases Activity

AArch64: Do not use CONFIG_GEN_PRIV_STACKS

Browse source 
We are setting CONFIG_GEN_PRIV_STACKS when AArch64 actually uses a
statically allocated privileged stack.

This error was not captured by the tests because we only verify whether
a read/write to a privileged stack is failing, but it can fail for a lot
of reasons including when the pointer to the privileged stack is not
initialized at all, like in this case.

With this patch we deselect CONFIG_GEN_PRIV_STACKS and we fix the
mem_protect/userspace test to correctly probe the privileged stack.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2021-03-24 15:55:44 +01:00 • committed by Anas Nashif
commit 807991e15f
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/Kconfig
View file

@ -32,7 +32,7 @@ config ARM
select HAS_DTS select HAS_DTS
# FIXME: current state of the code for all ARM requires this, but # FIXME: current state of the code for all ARM requires this, but
# is really only necessary for Cortex-M with ARM MPU! # is really only necessary for Cortex-M with ARM MPU!
select GEN_PRIV_STACKS select GEN_PRIV_STACKS if !ARM64
select ARCH_HAS_THREAD_LOCAL_STORAGE if ARM64 || CPU_CORTEX_R || CPU_CORTEX_M select ARCH_HAS_THREAD_LOCAL_STORAGE if ARM64 || CPU_CORTEX_R || CPU_CORTEX_M
help help
ARM architecture ARM architecture

8
include/arch/arm/aarch64/thread_stack.h
View file

@ -47,4 +47,12 @@
#define ARCH_KERNEL_STACK_RESERVED 0 #define ARCH_KERNEL_STACK_RESERVED 0
#define ARCH_KERNEL_STACK_OBJ_ALIGN ARCH_STACK_PTR_ALIGN #define ARCH_KERNEL_STACK_OBJ_ALIGN ARCH_STACK_PTR_ALIGN
#ifndef _ASMLANGUAGE
struct z_arm64_thread_stack_header {
char privilege_stack[CONFIG_PRIVILEGED_STACK_SIZE];
} __packed __aligned(Z_ARM64_STACK_BASE_ALIGN);
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_ */

11
tests/kernel/mem_protect/userspace/src/main.c
View file

@ -666,7 +666,8 @@ static void test_init_and_access_other_memdomain(void)
spawn_user(&default_bool); spawn_user(&default_bool);
} }
#if defined(CONFIG_ARM) || (defined(CONFIG_GEN_PRIV_STACKS) && defined(CONFIG_RISCV)) #if (defined(CONFIG_ARM) || (defined(CONFIG_GEN_PRIV_STACKS) && defined(CONFIG_RISCV)) && \
!defined(CONFIG_ARM64))
extern uint8_t *z_priv_stack_find(void *obj); extern uint8_t *z_priv_stack_find(void *obj);
#endif #endif
extern k_thread_stack_t ztest_thread_stack[]; extern k_thread_stack_t ztest_thread_stack[];
@ -942,7 +943,13 @@ void test_main(void)
/* Most of these scenarios use the default domain */ /* Most of these scenarios use the default domain */
k_mem_domain_add_partition(&k_mem_domain_default, &default_part); k_mem_domain_add_partition(&k_mem_domain_default, &default_part);
#if defined(CONFIG_ARM) #if defined(CONFIG_ARM64)
struct z_arm64_thread_stack_header *hdr;
hdr = ((struct z_arm64_thread_stack_header *)ztest_thread_stack);
priv_stack_ptr = (((char *)&hdr->privilege_stack) +
(sizeof(hdr->privilege_stack) - 1));
#elif defined(CONFIG_ARM)
priv_stack_ptr = (char *)z_priv_stack_find(ztest_thread_stack); priv_stack_ptr = (char *)z_priv_stack_find(ztest_thread_stack);
#elif defined(CONFIG_X86) #elif defined(CONFIG_X86)
struct z_x86_thread_stack_header *hdr; struct z_x86_thread_stack_header *hdr;