Skip to content

allocator: Improve rfree() debug and trace #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Oct 30, 2018
Merged

allocator: Improve rfree() debug and trace #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions src/lib/alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,13 +327,12 @@ static void free_block(void *ptr)
int i;
int block;

/* sanity check */
if (ptr == NULL)
return;

heap = get_heap_from_ptr(ptr);
if (heap == NULL)
if (!heap) {
trace_error(TRACE_CLASS_MEM, "invalid heap %p cpu %d",
(uintptr_t)ptr, cpu_get_id());
return;
}

/* find block that ptr belongs to */
for (i = 0; i < heap->blocks; i++) {
Expand All @@ -346,7 +345,8 @@ static void free_block(void *ptr)
}

/* not found */
trace_mem_error("eMF");
trace_error(TRACE_CLASS_MEM, "invalid ptr %p cpu %d",
(uintptr_t)ptr, cpu_get_id());
return;

found:
Expand Down Expand Up @@ -540,8 +540,25 @@ void *rballoc(int zone, uint32_t caps, size_t bytes)

void rfree(void *ptr)
{
struct mm_heap *cpu_heap;
uint32_t flags;

/* sanity check - NULL ptrs are fine */
if (!ptr)
return;

/* use the heap dedicated for the selected core */
cpu_heap = cache_to_uncache(memmap.system + cpu_get_id());

/* panic if pointer is from system heap */
if (ptr >= (void *)cpu_heap->heap &&
ptr <= (void *)cpu_heap->heap + cpu_heap->size) {
trace_error(TRACE_CLASS_MEM, "attempt to free system heap %p cpu %d",
(uintptr_t)ptr, cpu_get_id());
panic(SOF_IPC_PANIC_MEM);
}

/* free the block */
spin_lock_irq(&memmap.lock, flags);
free_block(ptr);
spin_unlock_irq(&memmap.lock, flags);
Expand Down