michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: mem_protect/mem_map: skip z_phys_map when linking in virt

Browse source 
When the kernel links in virtual address space, the data
structures needed for the z_phys_map() no longer point to physical
addresses (which are required for z_phys_map() to work). So skips
these tests if CONFIG_KERNEL_LINK_IN_VIRT=y.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-03-01 12:46:24 -08:00 • committed by Anas Nashif
commit 9de70a78fe
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/kernel/mem_protect/mem_map/src/main.c
View file

@ -16,8 +16,10 @@
#define BASE_FLAGS (K_MEM_CACHE_WB)
volatile bool expect_fault;
#ifndef CONFIG_KERNEL_LINK_IN_VIRT
static uint8_t __aligned(CONFIG_MMU_PAGE_SIZE)
test_page[2 * CONFIG_MMU_PAGE_SIZE];
#endif
void k_sys_fatal_error_handler(unsigned int reason, const z_arch_esf_t *pEsf)
{
@ -46,6 +48,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const z_arch_esf_t *pEsf)
*/
void test_z_phys_map_rw(void)
{
#ifndef CONFIG_KERNEL_LINK_IN_VIRT
uint8_t *mapped_rw, *mapped_ro;
uint8_t *buf = test_page + BUF_OFFSET;
@ -76,9 +79,17 @@ void test_z_phys_map_rw(void)
printk("shouldn't get here\n");
ztest_test_fail();
#else
ztest_test_skip();
#endif /* CONFIG_KERNEL_LINK_IN_VIRT */
}
#ifndef SKIP_EXECUTE_TESTS
#if defined(SKIP_EXECUTE_TESTS) || defined(CONFIG_KERNEL_LINK_IN_VIRT)
void test_z_phys_map_exec(void)
{
ztest_test_skip();
}
#else
extern char __test_mem_map_start[];
extern char __test_mem_map_end[];
extern char __test_mem_map_size[];
@ -128,12 +139,7 @@ void test_z_phys_map_exec(void)
printk("shouldn't get here\n");
ztest_test_fail();
}
#else
void test_z_phys_map_exec(void)
{
ztest_test_skip();
}
#endif /* SKIP_EXECUTE_TESTS */
#endif /* SKIP_EXECUTE_TESTS || CONFIG_KERNEL_LINK_IN_VIRT */
/**
* Show that memory mapping doesn't have unintended side effects
@ -142,6 +148,7 @@ void test_z_phys_map_exec(void)
*/
void test_z_phys_map_side_effect(void)
{
#ifndef CONFIG_KERNEL_LINK_IN_VIRT
uint8_t *mapped;
expect_fault = false;
@ -161,6 +168,9 @@ void test_z_phys_map_side_effect(void)
mapped[0] = 42;
printk("shouldn't get here\n");
ztest_test_fail();
#else
ztest_test_skip();
#endif /* CONFIG_KERNEL_LINK_IN_VIRT */
}
/**