michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: mem_domain: centralize assertions

Browse source 
Later this year I hope to overhaul the memory domain APIs,
but at least for now let's at least consolidate these checks.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2020-07-17 13:48:36 -07:00 • committed by Ioannis Glaropoulos
commit 476fc405e7
1 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

39
kernel/mem_domain.c
View file

@ -80,6 +80,23 @@ static inline bool sane_partition_domain(const struct k_mem_domain *domain,
#define sane_partition_domain(...) (true) #define sane_partition_domain(...) (true)
#endif #endif
static void partition_asserts(struct k_mem_domain *domain,
struct k_mem_partition *part)
{
__ASSERT(domain != NULL, "null domain");
__ASSERT(part != NULL, "null partition");
__ASSERT(part->size != 0, "zero sized partition at %p with base 0x%lx",
part, part->start);
__ASSERT((part->start + part->size) > part->start,
"invalid partition %p, wraparound detected. base 0x%lx size %zu",
part, part->start, part->size);
#if defined(CONFIG_EXECUTE_XOR_WRITE) || \
defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
__ASSERT(sane_partition_domain(domain, part),
"domain check failed");
#endif
}
void k_mem_domain_init(struct k_mem_domain *domain, uint8_t num_parts, void k_mem_domain_init(struct k_mem_domain *domain, uint8_t num_parts,
struct k_mem_partition *parts[]) struct k_mem_partition *parts[])
{ {
@ -98,18 +115,8 @@ void k_mem_domain_init(struct k_mem_domain *domain, uint8_t num_parts,
uint32_t i; uint32_t i;
for (i = 0U; i < num_parts; i++) { for (i = 0U; i < num_parts; i++) {
__ASSERT(parts[i] != NULL, ""); partition_asserts(domain, parts[i]);
__ASSERT((parts[i]->start + parts[i]->size) >
parts[i]->start,
"invalid partition %p size %zu",
parts[i], parts[i]->size);
#if defined(CONFIG_EXECUTE_XOR_WRITE) || \
defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
__ASSERT(sane_partition_domain(domain,
parts[i]),
"");
#endif
domain->partitions[i] = *parts[i]; domain->partitions[i] = *parts[i];
domain->num_partitions++; domain->num_partitions++;
} }
@ -148,15 +155,7 @@ void k_mem_domain_add_partition(struct k_mem_domain *domain,
int p_idx; int p_idx;
k_spinlock_key_t key; k_spinlock_key_t key;
__ASSERT(domain != NULL, ""); partition_asserts(domain, part);
__ASSERT(part != NULL, "");
__ASSERT((part->start + part->size) > part->start,
"invalid partition %p size %zu", part, part->size);
#if defined(CONFIG_EXECUTE_XOR_WRITE) || \
defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
__ASSERT(sane_partition_domain(domain, part), "");
#endif
key = k_spin_lock(&lock); key = k_spin_lock(&lock);