michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: mem_domain: extend sane_partition for non-overlapping regions

Browse source 
This commit extends the implementation of sane_partition(..) in
kernel/mem_domain.c so that it generates an ASSERT if partitions
inside a mem_domain overlap. This extension is only implemented
for the case when the MPU requires non-overlapping regions.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2018-11-13 16:28:55 +01:00 • committed by Andrew Boie
commit 6c54cac73d
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kernel/mem_domain.c
View file

@ -13,7 +13,8 @@
static u8_t max_partitions; static u8_t max_partitions;
#if defined(CONFIG_EXECUTE_XOR_WRITE) && __ASSERT_ON #if (defined(CONFIG_EXECUTE_XOR_WRITE) || \
defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)) && __ASSERT_ON
static bool sane_partition(const struct k_mem_partition *part, static bool sane_partition(const struct k_mem_partition *part,
const struct k_mem_partition *parts, const struct k_mem_partition *parts,
u32_t num_parts) u32_t num_parts)
@ -42,6 +43,13 @@ static bool sane_partition(const struct k_mem_partition *part,
if (last < parts[i].start || cur_last < part->start) { if (last < parts[i].start || cur_last < part->start) {
continue; continue;
} }
#if defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
/* Partitions overlap */
__ASSERT(false, "overlapping partitions <%x...%x>, <%x...%x>",
part->start, last,
parts[i].start, cur_last);
return false;
#endif
cur_write = K_MEM_PARTITION_IS_WRITABLE(parts[i].attr); cur_write = K_MEM_PARTITION_IS_WRITABLE(parts[i].attr);
cur_exec = K_MEM_PARTITION_IS_EXECUTABLE(parts[i].attr); cur_exec = K_MEM_PARTITION_IS_EXECUTABLE(parts[i].attr);
@ -92,7 +100,8 @@ void k_mem_domain_init(struct k_mem_domain *domain, u8_t num_parts,
__ASSERT((parts[i]->start + parts[i]->size) > __ASSERT((parts[i]->start + parts[i]->size) >
parts[i]->start, ""); parts[i]->start, "");
#if defined(CONFIG_EXECUTE_XOR_WRITE) #if defined(CONFIG_EXECUTE_XOR_WRITE) || \
defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
__ASSERT(sane_partition_domain(domain, __ASSERT(sane_partition_domain(domain,
parts[i]), parts[i]),
""); "");
@ -144,7 +153,8 @@ void k_mem_domain_add_partition(struct k_mem_domain *domain,
__ASSERT(part != NULL, ""); __ASSERT(part != NULL, "");
__ASSERT((part->start + part->size) > part->start, ""); __ASSERT((part->start + part->size) > part->start, "");
#if defined(CONFIG_EXECUTE_XOR_WRITE) #if defined(CONFIG_EXECUTE_XOR_WRITE) || \
defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
__ASSERT(sane_partition_domain(domain, part), ""); __ASSERT(sane_partition_domain(domain, part), "");
#endif #endif