Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/tlsf: don't do mm_checkcorruption in IRQ

Browse Source 
because this not safe in SMP mode, port from:
commit 34f63bdc13

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I288f373e10aa4a68034fc9d9a0f87a0dc3f36cd5
This commit is contained in:
Xiang Xiao
2021-07-04 08:50:31 -07:00
parent 9ad74b2c3a
commit 8cea82708a
1 changed files with 95 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/tlsf/mm_tlsf.c
+95 -106
View File
@@ -102,6 +102,94 @@ struct mm_heap_impl_s
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: mm_add_delaylist
****************************************************************************/
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
static void mm_add_delaylist(FAR struct mm_heap_s *heap, FAR void *mem)
{
FAR struct mm_heap_impl_s *impl;
FAR struct mm_delaynode_s *tmp = mem;
irqstate_t flags;
DEBUGASSERT(MM_IS_VALID(heap));
impl = heap->mm_impl;
/* Delay the deallocation until a more appropriate time. */
flags = enter_critical_section();
tmp->flink = impl->mm_delaylist[up_cpu_index()];
impl->mm_delaylist[up_cpu_index()] = tmp;
leave_critical_section(flags);
}
#endif
/****************************************************************************
* Name: mm_free_delaylist
****************************************************************************/
static void mm_free_delaylist(FAR struct mm_heap_s *heap)
{
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
FAR struct mm_heap_impl_s *impl;
FAR struct mm_delaynode_s *tmp;
irqstate_t flags;
DEBUGASSERT(MM_IS_VALID(heap));
impl = heap->mm_impl;
/* Move the delay list to local */
flags = enter_critical_section();
tmp = impl->mm_delaylist[up_cpu_index()];
impl->mm_delaylist[up_cpu_index()] = NULL;
leave_critical_section(flags);
/* Test if the delayed is empty */
while (tmp)
{
FAR void *address;
/* Get the first delayed deallocation */
address = tmp;
tmp = tmp->flink;
/* The address should always be non-NULL since that was checked in the
* 'while' condition above.
*/
mm_free(heap, address);
}
#endif
}
/****************************************************************************
* Name: mm_mallinfo_walker
****************************************************************************/
static void mm_mallinfo_walker(FAR void *ptr, size_t size, int used,
FAR void *user)
{
FAR struct mallinfo *info = user;
if (!used)
{
info->ordblks++;
info->fordblks += size;
if (size > info->mxordblk)
{
info->mxordblk = size;
}
}
}
/****************************************************************************
* Name: mm_seminitialize
*
@@ -296,94 +384,6 @@ static void mm_givesemaphore(FAR struct mm_heap_impl_s *impl)
}
}
/****************************************************************************
* Name: mm_add_delaylist
****************************************************************************/
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
static void mm_add_delaylist(FAR struct mm_heap_s *heap, FAR void *mem)
{
FAR struct mm_heap_impl_s *impl;
FAR struct mm_delaynode_s *tmp = mem;
irqstate_t flags;
DEBUGASSERT(MM_IS_VALID(heap));
impl = heap->mm_impl;
/* Delay the deallocation until a more appropriate time. */
flags = enter_critical_section();
tmp->flink = impl->mm_delaylist[up_cpu_index()];
impl->mm_delaylist[up_cpu_index()] = tmp;
leave_critical_section(flags);
}
#endif
/****************************************************************************
* Name: mm_free_delaylist
****************************************************************************/
static void mm_free_delaylist(FAR struct mm_heap_s *heap)
{
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
FAR struct mm_heap_impl_s *impl;
FAR struct mm_delaynode_s *tmp;
irqstate_t flags;
DEBUGASSERT(MM_IS_VALID(heap));
impl = heap->mm_impl;
/* Move the delay list to local */
flags = enter_critical_section();
tmp = impl->mm_delaylist[up_cpu_index()];
impl->mm_delaylist[up_cpu_index()] = NULL;
leave_critical_section(flags);
/* Test if the delayed is empty */
while (tmp)
{
FAR void *address;
/* Get the first delayed deallocation */
address = tmp;
tmp = tmp->flink;
/* The address should always be non-NULL since that was checked in the
* 'while' condition above.
*/
mm_free(heap, address);
}
#endif
}
/****************************************************************************
* Name: mm_mallinfo_walker
****************************************************************************/
static void mm_mallinfo_walker(FAR void *ptr, size_t size, int used,
FAR void *user)
{
FAR struct mallinfo *info = user;
if (!used)
{
info->ordblks++;
info->fordblks += size;
if (size > info->mxordblk)
{
info->mxordblk = size;
}
}
}
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -541,22 +541,18 @@ void mm_checkcorruption(FAR struct mm_heap_s *heap)
for (region = 0; region < impl->mm_nregions; region++)
#endif
{
irqstate_t flags = 0;
/* Retake the semaphore for each region to reduce latencies */
if (up_interrupt_context() || sched_idletask())
if (up_interrupt_context())
{
if (impl->mm_counts_held)
return;
}
else if (sched_idletask())
{
if (mm_trysemaphore(impl))
{
#if CONFIG_MM_REGIONS > 1
continue;
#else
return;
#endif
}
flags = enter_critical_section();
}
else
{
@@ -576,14 +572,7 @@ void mm_checkcorruption(FAR struct mm_heap_s *heap)
/* Release the semaphore */
if (up_interrupt_context() || sched_idletask())
{
leave_critical_section(flags);
}
else
{
mm_givesemaphore(impl);
}
mm_givesemaphore(impl);
}
#undef region
}