michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: mem_protect: add a test case of adding memory partition

Browse source 
Add a test case to validate when adding a new partition into a memory
domain with over its maximum specified limit number, an assertion
failure happens.

Signed-off-by: Maksim Masalski <maksim.masalski@intel.com>
Signed-off-by: Enjia Mai <enjiax.mai@intel.com>
This commit is contained in:
Enjia Mai 2021-03-24 00:58:19 +08:00 • committed by Anas Nashif
commit e53d549e21
3 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/kernel/mem_protect/mem_protect/src/main.c
View file

@ -76,6 +76,7 @@ void test_main(void)
ztest_unit_test(test_create_new_higher_prio_thread_from_user),
ztest_unit_test(test_create_new_invalid_prio_thread_from_user),
ztest_unit_test(test_mark_thread_exit_uninitialized),
ztest_unit_test(test_mem_part_assert_add_overmax),
ztest_user_unit_test(test_kobject_init_error),
ztest_unit_test(test_alloc_kobjects),
ztest_unit_test(test_thread_alloc_out_of_idx),

45
tests/kernel/mem_protect/mem_protect/src/mem_domain.c
View file

@ -48,9 +48,9 @@ void test_mem_domain_setup(void)
struct k_mem_partition *parts[] = { &ro_part, &ztest_mem_partition };
num_rw_parts = max_parts - PARTS_USED;
zassert_true(NUM_RW_PARTS >= num_rw_parts,
"CONFIG_MAX_DOMAIN_PARTITIONS incorrectly tuned, %d should be at least %d",
CONFIG_MAX_DOMAIN_PARTITIONS, max_parts);
zassert_true(num_rw_parts <= NUM_RW_PARTS,
"CONFIG_MAX_DOMAIN_PARTITIONS incorrectly tuned, %d should be at least %d",
CONFIG_MAX_DOMAIN_PARTITIONS, max_parts);
zassert_true(num_rw_parts > 0, "no free memory partitions");
k_mem_domain_init(&test_domain, ARRAY_SIZE(parts), parts);
@ -383,7 +383,6 @@ void test_mem_part_overlap(void)
k_mem_domain_add_partition(&test_domain, &overlap_part);
}
extern struct k_spinlock z_mem_domain_lock;
static ZTEST_BMEM bool need_recover_spinlock;
@ -399,6 +398,44 @@ void post_fatal_error_handler(unsigned int reason, const z_arch_esf_t *pEsf)
}
}
static volatile uint8_t __aligned(MEM_REGION_ALLOC)
exceed_buf[MEM_REGION_ALLOC];
K_MEM_PARTITION_DEFINE(exceed_part, exceed_buf, sizeof(exceed_buf),
K_MEM_PARTITION_P_RW_U_RW);
/**
* @brief Test system assert when adding memory partitions more than possible
*
* @details
* - Add memory partitions one by one and more than architecture allows to add.
* - When partitions added more than it is allowed by architecture, test that
* system assert for that case works correctly.
*
* @ingroup kernel_memprotect_tests
*/
void test_mem_part_assert_add_overmax(void)
{
int max_parts = num_rw_parts + PARTS_USED;
/* Make sure the partitions of the domain is full, used in
* previous test cases.
*/
zassert_equal(max_parts, arch_mem_domain_max_partitions_get(),
"domain still have room of partitions(%d).",
max_parts);
need_recover_spinlock = true;
set_fault_valid(true);
/* Add one more partition will trigger assert due to exceeding */
k_mem_domain_add_partition(&test_domain, &exceed_part);
/* should not reach here */
ztest_test_fail();
}
#if defined(CONFIG_ASSERT)
static volatile uint8_t __aligned(MEM_REGION_ALLOC) misc_buf[MEM_REGION_ALLOC];
K_MEM_PARTITION_DEFINE(find_no_part, misc_buf, sizeof(misc_buf),

1
tests/kernel/mem_protect/mem_protect/src/mem_protect.h
View file

@ -54,6 +54,7 @@ extern void test_create_new_invalid_prio_thread_from_user(void);
extern void test_mark_thread_exit_uninitialized(void);
extern void test_krnl_obj_static_alloc_build_time(void);
extern void test_mem_part_overlap(void);
extern void test_mem_part_assert_add_overmax(void);
extern void test_kobject_access_grant_error(void);
extern void test_kobject_access_grant_error_user(void);
extern void test_kobject_access_grant_error_user_null(void);