OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm: add invalid pid dump when malloc failed 

We can dump the memory that has exited but
has not been released

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2023-05-09 13:46:05 +08:00 committed by Xiang Xiao
parent 70cb62e2a3
commit 1a927a6cf3
5 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/nuttx/mm/mm.h
View File

@ -98,6 +98,7 @@
# endif
#endif
#define MM_BACKTRACE_INVALID_PID ((pid_t)-4)
#define MM_BACKTRACE_MEMPOOL_PID ((pid_t)-3)
#define MM_BACKTRACE_FREE_PID ((pid_t)-2)
#define MM_BACKTRACE_ALLOC_PID ((pid_t)-1)

14
mm/mempool/mempool.c
View File

@ -30,6 +30,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/mm/mempool.h>
#include <nuttx/sched.h>
#include "kasan/kasan.h"
@ -436,12 +437,15 @@ mempool_info_task(FAR struct mempool_s *pool,
list_for_every_entry(&pool->alist, buf, struct mempool_backtrace_s,
node)
{
if (buf->pid == dump->pid &&
buf->seqno >= dump->seqmin &&
buf->seqno <= dump->seqmax)
if (buf->pid == dump->pid ||
(dump->pid == MM_BACKTRACE_INVALID_PID &&
nxsched_get_tcb(buf->pid) == NULL))
{
info.aordblks++;
info.uordblks += pool->blocksize;
if (buf->seqno >= dump->seqmin && buf->seqno <= dump->seqmax)
{
info.aordblks++;
info.uordblks += pool->blocksize;
}
}
}
}

20
mm/mm_heap/mm_mallinfo.c
View File

@ -98,16 +98,24 @@ static void mallinfo_task_handler(FAR struct mm_allocnode_s *node,
DEBUGASSERT(nodesize >= SIZEOF_MM_ALLOCNODE);
#if CONFIG_MM_BACKTRACE < 0
if (handle->dump->pid == MM_BACKTRACE_ALLOC_PID)
#else
if ((handle->dump->pid == MM_BACKTRACE_ALLOC_PID ||
handle->dump->pid == node->pid) &&
node->seqno >= handle->dump->seqmin &&
node->seqno <= handle->dump->seqmax)
#endif
{
handle->info->aordblks++;
handle->info->uordblks += nodesize;
}
#else
if (handle->dump->pid == MM_BACKTRACE_ALLOC_PID ||
handle->dump->pid == node->pid ||
(handle->dump->pid == MM_BACKTRACE_INVALID_PID &&
nxsched_get_tcb(node->pid) == NULL))
{
if (node->seqno >= handle->dump->seqmin &&
node->seqno <= handle->dump->seqmax)
{
handle->info->aordblks++;
handle->info->uordblks += nodesize;
}
}
#endif
}
else if (handle->dump->pid == MM_BACKTRACE_FREE_PID)
{

5
mm/mm_heap/mm_malloc.c
View File

@ -81,12 +81,12 @@ void mm_dump_handler(FAR struct tcb_s *tcb, FAR void *arg)
struct mallinfo_task info;
struct mm_memdump_s dump;
dump.pid = tcb->pid;
dump.pid = tcb ? tcb->pid : MM_BACKTRACE_INVALID_PID;
dump.seqmin = 0;
dump.seqmax = ULONG_MAX;
info = mm_mallinfo_task(arg, &dump);
mwarn("pid:%5d, used:%10d, nused:%10d\n",
tcb->pid, info.uordblks, info.aordblks);
dump.pid, info.uordblks, info.aordblks);
}
#endif
@ -283,6 +283,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
minfo.mxordblk, minfo.aordblks, minfo.ordblks);
# if CONFIG_MM_BACKTRACE >= 0
nxsched_foreach(mm_dump_handler, heap);
mm_dump_handler(NULL, heap);
# endif
# if CONFIG_MM_HEAP_MEMPOOL_THRESHOLD != 0
mwarn("%11s%9s%9s%9s%9s%9s%9s\n", "bsize", "total", "nused",

20
mm/tlsf/mm_tlsf.c
View File

@ -294,16 +294,24 @@ static void mallinfo_task_handler(FAR void *ptr, size_t size, int used,
{
#if CONFIG_MM_BACKTRACE < 0
if (handler->dump->pid = MM_BACKTRACE_ALLOC_PID)
#else
if ((handler->dump->pid == MM_BACKTRACE_ALLOC_PID ||
handler->dump->pid == dump->pid) &&
dump->seqno >= handler->dump->seqmin &&
dump->seqno <= handler->dump->seqmax)
#endif
{
handler->info->aordblks++;
handler->info->uordblks += size;
}
#else
if (handler->dump->pid == MM_BACKTRACE_ALLOC_PID ||
handler->dump->pid == dump->pid ||
(handler->dump->pid == MM_BACKTRACE_INVALID_PID &&
nxsched_get_tcb(dump->pid) == NULL))
{
if (dump->seqno >= handler->dump->seqmin &&
dump->seqno <= handler->dump->seqmax)
{
handler->info->aordblks++;
handler->info->uordblks += size;
}
}
#endif
}
else if (handler->dump->pid == MM_BACKTRACE_FREE_PID)
{