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

mm_heap: mm dump and panic only valid for the heap own by OS

Browse Source 
When other code use nuttx memory manager by call mm_xx api directly,
it better to let other code to control weather dump or panic when
malloc failed.

Signed-off-by: Bowen Wang <wangbowen6@xiaomi.com>
This commit is contained in:
Bowen Wang 2023-06-19 17:03:35 +08:00 committed by Xiang Xiao
parent ea2ec888b8
commit 477602e657
4 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nuttx/addrenv.h
View File

@ -29,7 +29,6 @@
#ifdef CONFIG_BUILD_KERNEL
# include <signal.h>
# include <nuttx/mm/mm.h>
#endif
#include <stdbool.h>
@ -283,6 +282,8 @@ typedef CODE void (*addrenv_sigtramp_t)(_sa_sigaction_t sighand, int signo,
FAR siginfo_t *info,
FAR void *ucontext);
struct mm_heaps_s; /* Forward reference */
/* This structure describes the format of the .bss/.data reserved area */
struct addrenv_reserve_s

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

@ -25,7 +25,9 @@
* Included Files
****************************************************************************/
#include <nuttx/addrenv.h>
#include <nuttx/config.h>
#include <nuttx/userspace.h>
#include <sys/types.h>
#include <stdbool.h>
@ -101,6 +103,36 @@
#define mm_memdump_s malltask
#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
/* In the kernel build, there are multiple user heaps; one for each task
* group. In this build configuration, the user heap structure lies
* in a reserved region at the beginning of the .bss/.data address
* space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by
* ARCH_DATA_RESERVE_SIZE
*/
# define USR_HEAP (ARCH_DATA_RESERVE->ar_usrheap)
#elif defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)
/* In the protected mode, there are two heaps: A kernel heap and a single
* user heap. Kernel code must obtain the address of the user heap data
* structure from the userspace interface.
*/
# define USR_HEAP (*USERSPACE->us_heap)
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP g_mmheap
#endif
#ifdef CONFIG_MM_KERNEL_HEAP
# define MM_INTERNAL_HEAP(heap) ((heap) == USR_HEAP || (heap) == g_kmmheap)
#else
# define MM_INTERNAL_HEAP(heap) ((heap) == USR_HEAP)
#endif
/****************************************************************************
* Public Types
****************************************************************************/

2
mm/mm_heap/mm_malloc.c
View File

@ -267,7 +267,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
#endif
}
#ifdef CONFIG_DEBUG_MM
else
else if (MM_INTERNAL_HEAP(heap))
{
#ifdef CONFIG_MM_DUMP_ON_FAILURE
struct mallinfo minfo;

26
mm/umm_heap/umm_heap.h
View File

@ -27,38 +27,12 @@
#include <nuttx/config.h>
#include <nuttx/addrenv.h>
#include <nuttx/userspace.h>
#include <nuttx/mm/mm.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
/* In the kernel build, there are multiple user heaps; one for each task
* group. In this build configuration, the user heap structure lies
* in a reserved region at the beginning of the .bss/.data address
* space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by
* ARCH_DATA_RESERVE_SIZE
*/
# define USR_HEAP (ARCH_DATA_RESERVE->ar_usrheap)
#elif defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)
/* In the protected mode, there are two heaps: A kernel heap and a single
* user heap. Kernel code must obtain the address of the user heap data
* structure from the userspace interface.
*/
# define USR_HEAP (*USERSPACE->us_heap)
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP g_mmheap
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/