sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm/mm_heap: change CONFIG_MM_BACKTRACE to int type

Browse Source 
Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2022-07-04 15:41:06 +08:00 committed by Xiang Xiao
parent 8a1e985e71
commit 9899dd0ec0
13 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/procfs/fs_procfsmeminfo.c
View File

@ -415,7 +415,7 @@ static ssize_t memdump_read(FAR struct file *filep, FAR char *buffer,
procfile = (FAR struct meminfo_file_s *)filep->f_priv; procfile = (FAR struct meminfo_file_s *)filep->f_priv;
DEBUGASSERT(procfile); DEBUGASSERT(procfile);
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
linesize = procfs_snprintf(procfile->line, MEMINFO_LINELEN, linesize = procfs_snprintf(procfile->line, MEMINFO_LINELEN,
"usage: <pid/used/free/on/off>\n" "usage: <pid/used/free/on/off>\n"
"on/off backtrace\n" "on/off backtrace\n"
@ -460,7 +460,7 @@ static ssize_t memdump_write(FAR struct file *filep, FAR const char *buffer,
procfile = filep->f_priv; procfile = filep->f_priv;
DEBUGASSERT(procfile); DEBUGASSERT(procfile);
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE > 0
if (strcmp(buffer, "on") == 0) if (strcmp(buffer, "on") == 0)
{ {
for (entry = g_procfs_meminfo; entry != NULL; entry = entry->next) for (entry = g_procfs_meminfo; entry != NULL; entry = entry->next)
@ -490,7 +490,7 @@ static ssize_t memdump_write(FAR struct file *filep, FAR const char *buffer,
case 'f': case 'f':
pid = (pid_t)-2; pid = (pid_t)-2;
break; break;
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
default: default:
pid = atoi(buffer); pid = atoi(buffer);
#endif #endif

14
fs/procfs/fs_procfsproc.c
View File

@ -90,7 +90,7 @@ enum proc_node_e
#ifdef CONFIG_SCHED_CRITMONITOR #ifdef CONFIG_SCHED_CRITMONITOR
PROC_CRITMON, /* Critical section monitor */ PROC_CRITMON, /* Critical section monitor */
#endif #endif
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
PROC_HEAP, /* Task heap info */ PROC_HEAP, /* Task heap info */
#endif #endif
PROC_STACK, /* Task stack info */ PROC_STACK, /* Task stack info */
@ -178,7 +178,7 @@ static ssize_t proc_critmon(FAR struct proc_file_s *procfile,
FAR struct tcb_s *tcb, FAR char *buffer, size_t buflen, FAR struct tcb_s *tcb, FAR char *buffer, size_t buflen,
off_t offset); off_t offset);
#endif #endif
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
static ssize_t proc_heap(FAR struct proc_file_s *procfile, static ssize_t proc_heap(FAR struct proc_file_s *procfile,
FAR struct tcb_s *tcb, FAR char *buffer, FAR struct tcb_s *tcb, FAR char *buffer,
size_t buflen, off_t offset); size_t buflen, off_t offset);
@ -279,7 +279,7 @@ static const struct proc_node_s g_critmon =
}; };
#endif #endif
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
static const struct proc_node_s g_heap = static const struct proc_node_s g_heap =
{ {
"heap", "heap", (uint8_t)PROC_HEAP, DTYPE_FILE /* Task heap info */ "heap", "heap", (uint8_t)PROC_HEAP, DTYPE_FILE /* Task heap info */
@ -326,7 +326,7 @@ static FAR const struct proc_node_s * const g_nodeinfo[] =
#ifdef CONFIG_SCHED_CRITMONITOR #ifdef CONFIG_SCHED_CRITMONITOR
&g_critmon, /* Critical section Monitor */ &g_critmon, /* Critical section Monitor */
#endif #endif
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
&g_heap, /* Task heap info */ &g_heap, /* Task heap info */
#endif #endif
&g_stack, /* Task stack info */ &g_stack, /* Task stack info */
@ -352,7 +352,7 @@ static const struct proc_node_s * const g_level0info[] =
#ifdef CONFIG_SCHED_CRITMONITOR #ifdef CONFIG_SCHED_CRITMONITOR
&g_critmon, /* Critical section monitor */ &g_critmon, /* Critical section monitor */
#endif #endif
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
&g_heap, /* Task heap info */ &g_heap, /* Task heap info */
#endif #endif
&g_stack, /* Task stack info */ &g_stack, /* Task stack info */
@ -904,7 +904,7 @@ static ssize_t proc_critmon(FAR struct proc_file_s *procfile,
* Name: proc_heap * Name: proc_heap
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
static ssize_t proc_heap(FAR struct proc_file_s *procfile, static ssize_t proc_heap(FAR struct proc_file_s *procfile,
FAR struct tcb_s *tcb, FAR char *buffer, FAR struct tcb_s *tcb, FAR char *buffer,
size_t buflen, off_t offset) size_t buflen, off_t offset)
@ -1575,7 +1575,7 @@ static ssize_t proc_read(FAR struct file *filep, FAR char *buffer,
ret = proc_critmon(procfile, tcb, buffer, buflen, filep->f_pos); ret = proc_critmon(procfile, tcb, buffer, buflen, filep->f_pos);
break; break;
#endif #endif
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
case PROC_HEAP: /* Task heap info */ case PROC_HEAP: /* Task heap info */
ret = proc_heap(procfile, tcb, buffer, buflen, filep->f_pos); ret = proc_heap(procfile, tcb, buffer, buflen, filep->f_pos);
break; break;

4
include/malloc.h
View File

@ -52,7 +52,7 @@ struct mallinfo
* by free (not in use) chunks. */ * by free (not in use) chunks. */
}; };
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
struct mallinfo_task struct mallinfo_task
{ {
pid_t pid; /* The pid of task */ pid_t pid; /* The pid of task */
@ -72,7 +72,7 @@ extern "C"
struct mallinfo mallinfo(void); struct mallinfo mallinfo(void);
size_t malloc_size(FAR void *ptr); size_t malloc_size(FAR void *ptr);
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
struct mallinfo_task mallinfo_task(pid_t pid); struct mallinfo_task mallinfo_task(pid_t pid);
#endif #endif

2
include/nuttx/fs/procfs.h
View File

@ -133,7 +133,7 @@ struct procfs_meminfo_entry_s
FAR const char *name; FAR const char *name;
FAR struct mm_heap_s *heap; FAR struct mm_heap_s *heap;
struct procfs_meminfo_entry_s *next; struct procfs_meminfo_entry_s *next;
#if defined(CONFIG_MM_BACKTRACE) #if CONFIG_MM_BACKTRACE >= 0
/* This is dynamic control flag whether to turn on backtrace in the heap, /* This is dynamic control flag whether to turn on backtrace in the heap,
* you can set it by /proc/memdump. * you can set it by /proc/memdump.

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

@ -297,7 +297,7 @@ void kmm_extend(FAR void *mem, size_t size, int region);
struct mallinfo; /* Forward reference */ struct mallinfo; /* Forward reference */
int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info); int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info);
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
struct mallinfo_task; /* Forward reference */ struct mallinfo_task; /* Forward reference */
int mm_mallinfo_task(FAR struct mm_heap_s *heap, int mm_mallinfo_task(FAR struct mm_heap_s *heap,
FAR struct mallinfo_task *info); FAR struct mallinfo_task *info);
@ -307,7 +307,7 @@ int mm_mallinfo_task(FAR struct mm_heap_s *heap,
#ifdef CONFIG_MM_KERNEL_HEAP #ifdef CONFIG_MM_KERNEL_HEAP
struct mallinfo kmm_mallinfo(void); struct mallinfo kmm_mallinfo(void);
# ifdef CONFIG_MM_BACKTRACE # if CONFIG_MM_BACKTRACE >= 0
struct mallinfo_task kmm_mallinfo_task(pid_t pid); struct mallinfo_task kmm_mallinfo_task(pid_t pid);
# endif # endif
#endif #endif

11
mm/Kconfig
View File

@ -187,14 +187,17 @@ config MM_KASAN
add -fsanitize=kernel-address to CFLAGS/CXXFLAGS too. add -fsanitize=kernel-address to CFLAGS/CXXFLAGS too.
config MM_BACKTRACE config MM_BACKTRACE
bool "Owner tracking and backtrace" int "The depth of backtrace"
default n default -1
depends on DEBUG_MM ---help---
Config the depth of backtrace in memory block by specified this
config: disable backtrace by -1, only record pid info by zero and
enable record backtrace info by 8(fixed depth).
config MM_BACKTRACE_DEFAULT config MM_BACKTRACE_DEFAULT
bool "Enable the backtrace record by default" bool "Enable the backtrace record by default"
default n default n
depends on MM_BACKTRACE depends on MM_BACKTRACE > 0
config MM_DUMP_ON_FAILURE config MM_DUMP_ON_FAILURE
bool "Dump heap info on allocation failure" bool "Dump heap info on allocation failure"

2
mm/kmm_heap/kmm_mallinfo.c
View File

@ -59,7 +59,7 @@ struct mallinfo kmm_mallinfo(void)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
struct mallinfo_task kmm_mallinfo_task(pid_t pid) struct mallinfo_task kmm_mallinfo_task(pid_t pid)
{ {
struct mallinfo_task info; struct mallinfo_task info;

42
mm/mm_heap/mm.h
View File

@ -90,9 +90,17 @@
# define MM_MAX_SHIFT (22) /* 4 Mb */ # define MM_MAX_SHIFT (22) /* 4 Mb */
#endif #endif
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE == 0
# define MM_MIN_SHIFT (MM_MIN_SHIFT_ + 2) # define MM_MIN_SHIFT (MM_MIN_SHIFT_ + 1)
# define MM_BACKTRACE_DEPTH 8 # define MM_ADD_BACKTRACE(heap, ptr) \
do \
{ \
FAR struct mm_allocnode_s *tmp = (FAR struct mm_allocnode_s *)(ptr); \
tmp->pid = getpid(); \
} \
while (0)
#elif CONFIG_MM_BACKTRACE > 0
# define MM_MIN_SHIFT (MM_MIN_SHIFT_ + 2)
# define MM_ADD_BACKTRACE(heap, ptr) \ # define MM_ADD_BACKTRACE(heap, ptr) \
do \ do \
{ \ { \
@ -101,7 +109,7 @@
if ((heap)->mm_procfs.backtrace) \ if ((heap)->mm_procfs.backtrace) \
{ \ { \
memset(tmp->backtrace, 0, sizeof(tmp->backtrace)); \ memset(tmp->backtrace, 0, sizeof(tmp->backtrace)); \
backtrace(tmp->backtrace, MM_BACKTRACE_DEPTH); \ backtrace(tmp->backtrace, CONFIG_MM_BACKTRACE); \
} \ } \
else \ else \
{ \ { \
@ -165,12 +173,14 @@ typedef uint32_t mmsize_t;
struct mm_allocnode_s struct mm_allocnode_s
{ {
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
pid_t pid; /* The pid for caller */ pid_t pid; /* The pid for caller */
FAR void *backtrace[MM_BACKTRACE_DEPTH]; /* The backtrace buffer for caller */ # if CONFIG_MM_BACKTRACE > 0
FAR void *backtrace[CONFIG_MM_BACKTRACE]; /* The backtrace buffer for caller */
# endif
#endif #endif
mmsize_t size; /* Size of this chunk */ mmsize_t size; /* Size of this chunk */
mmsize_t preceding; /* Size of the preceding chunk */ mmsize_t preceding; /* Size of the preceding chunk */
}; };
static_assert(SIZEOF_MM_ALLOCNODE <= MM_MIN_CHUNK, static_assert(SIZEOF_MM_ALLOCNODE <= MM_MIN_CHUNK,
@ -180,13 +190,15 @@ static_assert(SIZEOF_MM_ALLOCNODE <= MM_MIN_CHUNK,
struct mm_freenode_s struct mm_freenode_s
{ {
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
pid_t pid; /* The pid for caller */ pid_t pid; /* The pid for caller */
FAR void *backtrace[MM_BACKTRACE_DEPTH]; /* The backtrace buffer for caller */ # if CONFIG_MM_BACKTRACE > 0
FAR void *backtrace[CONFIG_MM_BACKTRACE]; /* The backtrace buffer for caller */
# endif
#endif #endif
mmsize_t size; /* Size of this chunk */ mmsize_t size; /* Size of this chunk */
mmsize_t preceding; /* Size of the preceding chunk */ mmsize_t preceding; /* Size of the preceding chunk */
FAR struct mm_freenode_s *flink; /* Supports a doubly linked list */ FAR struct mm_freenode_s *flink; /* Supports a doubly linked list */
FAR struct mm_freenode_s *blink; FAR struct mm_freenode_s *blink;
}; };

2
mm/mm_heap/mm_initialize.c
View File

@ -220,7 +220,7 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name,
# if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) # if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
heap->mm_procfs.name = name; heap->mm_procfs.name = name;
heap->mm_procfs.heap = heap; heap->mm_procfs.heap = heap;
# if defined (CONFIG_MM_BACKTRACE) && defined(CONFIG_MM_BACKTRACE_DEFAULT) # ifdef CONFIG_MM_BACKTRACE_DEFAULT
heap->mm_procfs.backtrace = true; heap->mm_procfs.backtrace = true;
# endif # endif
# endif # endif

4
mm/mm_heap/mm_mallinfo.c
View File

@ -75,7 +75,7 @@ static void mallinfo_handler(FAR struct mm_allocnode_s *node, FAR void *arg)
} }
} }
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
static void mallinfo_task_handler(FAR struct mm_allocnode_s *node, static void mallinfo_task_handler(FAR struct mm_allocnode_s *node,
FAR void *arg) FAR void *arg)
{ {
@ -137,7 +137,7 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
int mm_mallinfo_task(FAR struct mm_heap_s *heap, int mm_mallinfo_task(FAR struct mm_heap_s *heap,
FAR struct mallinfo_task *info) FAR struct mallinfo_task *info)
{ {

4
mm/mm_heap/mm_malloc.c
View File

@ -83,7 +83,7 @@ static void mm_free_delaylist(FAR struct mm_heap_s *heap)
#endif #endif
} }
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
void mm_dump_handler(FAR struct tcb_s *tcb, FAR void *arg) void mm_dump_handler(FAR struct tcb_s *tcb, FAR void *arg)
{ {
struct mallinfo_task info; struct mallinfo_task info;
@ -267,7 +267,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
mwarn("Total:%d, used:%d, free:%d, largest:%d, nused:%d, nfree:%d\n", mwarn("Total:%d, used:%d, free:%d, largest:%d, nused:%d, nfree:%d\n",
minfo.arena, minfo.uordblks, minfo.fordblks, minfo.arena, minfo.uordblks, minfo.fordblks,
minfo.mxordblk, minfo.aordblks, minfo.ordblks); minfo.mxordblk, minfo.aordblks, minfo.ordblks);
# ifdef CONFIG_MM_BACKTRACE # if CONFIG_MM_BACKTRACE >= 0
nxsched_foreach(mm_dump_handler, heap); nxsched_foreach(mm_dump_handler, heap);
# endif # endif
#endif #endif

14
mm/mm_heap/mm_memdump.c
View File

@ -65,27 +65,31 @@ static void memdump_handler(FAR struct mm_allocnode_s *node, FAR void *arg)
if ((node->preceding & MM_ALLOC_BIT) != 0) if ((node->preceding & MM_ALLOC_BIT) != 0)
{ {
DEBUGASSERT(node->size >= SIZEOF_MM_ALLOCNODE); DEBUGASSERT(node->size >= SIZEOF_MM_ALLOCNODE);
#ifndef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE < 0
if (info->pid == -1) if (info->pid == -1)
#else #else
if (info->pid == -1 || node->pid == info->pid) if (info->pid == -1 || node->pid == info->pid)
#endif #endif
{ {
#ifndef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE < 0
syslog(LOG_INFO, "%12zu%*p\n", syslog(LOG_INFO, "%12zu%*p\n",
(size_t)node->size, MM_PTR_FMT_WIDTH, (size_t)node->size, MM_PTR_FMT_WIDTH,
((FAR char *)node + SIZEOF_MM_ALLOCNODE)); ((FAR char *)node + SIZEOF_MM_ALLOCNODE));
#else #else
# if CONFIG_MM_BACKTRACE > 0
int i; int i;
FAR const char *format = " %0*p"; FAR const char *format = " %0*p";
char buf[MM_BACKTRACE_DEPTH * MM_PTR_FMT_WIDTH + 1]; # endif
char buf[CONFIG_MM_BACKTRACE * MM_PTR_FMT_WIDTH + 1];
buf[0] = '\0'; buf[0] = '\0';
for (i = 0; i < MM_BACKTRACE_DEPTH && node->backtrace[i]; i++) # if CONFIG_MM_BACKTRACE > 0
for (i = 0; i < CONFIG_MM_BACKTRACE && node->backtrace[i]; i++)
{ {
sprintf(buf + i * MM_PTR_FMT_WIDTH, format, sprintf(buf + i * MM_PTR_FMT_WIDTH, format,
MM_PTR_FMT_WIDTH - 1, node->backtrace[i]); MM_PTR_FMT_WIDTH - 1, node->backtrace[i]);
} }
# endif
syslog(LOG_INFO, "%6d%12zu%*p%s\n", syslog(LOG_INFO, "%6d%12zu%*p%s\n",
(int)node->pid, (size_t)node->size, MM_PTR_FMT_WIDTH, (int)node->pid, (size_t)node->size, MM_PTR_FMT_WIDTH,
@ -141,7 +145,7 @@ void mm_memdump(FAR struct mm_heap_s *heap, pid_t pid)
if (pid >= -1) if (pid >= -1)
{ {
syslog(LOG_INFO, "Dump all used memory node info:\n"); syslog(LOG_INFO, "Dump all used memory node info:\n");
#ifndef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE < 0
syslog(LOG_INFO, "%12s%*s\n", "Size", MM_PTR_FMT_WIDTH, "Address"); syslog(LOG_INFO, "%12s%*s\n", "Size", MM_PTR_FMT_WIDTH, "Address");
#else #else
syslog(LOG_INFO, "%6s%12s%*s %s\n", "PID", "Size", MM_PTR_FMT_WIDTH, syslog(LOG_INFO, "%6s%12s%*s %s\n", "PID", "Size", MM_PTR_FMT_WIDTH,

2
mm/umm_heap/umm_mallinfo.c
View File

@ -59,7 +59,7 @@ struct mallinfo mallinfo(void)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_MM_BACKTRACE #if CONFIG_MM_BACKTRACE >= 0
struct mallinfo_task mallinfo_task(pid_t pid) struct mallinfo_task mallinfo_task(pid_t pid)
{ {
struct mallinfo_task info; struct mallinfo_task info;