espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/heap_caps_free-rtc-diiram-check' into 'release/v5.2'

Browse Source 
fix(heap): Wrong address calculation in heap_caps_free

See merge request espressif/esp-idf!37553
This commit is contained in:
Mahavir Jain
2025-03-17 14:29:50 +08:00
parent 899b08a033 102d290eb9
commit 0aad54e2c1
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/bootloader_support/include/bootloader_memory_utils.h
View File

@@ -27,12 +27,21 @@ extern "C" {
*/ */
__attribute__((always_inline)) __attribute__((always_inline))
inline static bool esp_dram_match_iram(void) { inline static bool esp_dram_match_iram(void) {
bool dram_match_iram = (SOC_DRAM_LOW == SOC_IRAM_LOW) && return ((SOC_DRAM_LOW == SOC_IRAM_LOW) && (SOC_DRAM_HIGH == SOC_IRAM_HIGH));
(SOC_DRAM_HIGH == SOC_IRAM_HIGH); }
/**
* @brief Check if the RTC IRAM and RTC DRAM are separate or using the same memory space
*
* @return true if the RTC DRAM and RTC IRAM are sharing the same memory space, false otherwise
*/
__attribute__((always_inline))
inline static bool esp_rtc_dram_match_rtc_iram(void) {
#if SOC_RTC_FAST_MEM_SUPPORTED #if SOC_RTC_FAST_MEM_SUPPORTED
dram_match_iram &= (SOC_RTC_IRAM_LOW == SOC_RTC_DRAM_LOW); return ((SOC_RTC_IRAM_LOW == SOC_RTC_DRAM_LOW) && (SOC_RTC_IRAM_HIGH == SOC_RTC_DRAM_HIGH));
#else
return false;
#endif #endif
return dram_match_iram;
} }
/** /**

17
components/esp_hw_support/include/esp_memory_utils.h
View File

@@ -27,12 +27,21 @@ extern "C" {
*/ */
__attribute__((always_inline)) __attribute__((always_inline))
inline static bool esp_dram_match_iram(void) { inline static bool esp_dram_match_iram(void) {
bool dram_match_iram = (SOC_DRAM_LOW == SOC_IRAM_LOW) && return ((SOC_DRAM_LOW == SOC_IRAM_LOW) && (SOC_DRAM_HIGH == SOC_IRAM_HIGH));
(SOC_DRAM_HIGH == SOC_IRAM_HIGH); }
/**
* @brief Check if the RTC IRAM and RTC DRAM are separate or using the same memory space
*
* @return true if the RTC DRAM and RTC IRAM are sharing the same memory space, false otherwise
*/
__attribute__((always_inline))
inline static bool esp_rtc_dram_match_rtc_iram(void) {
#if SOC_RTC_FAST_MEM_SUPPORTED #if SOC_RTC_FAST_MEM_SUPPORTED
dram_match_iram &= (SOC_RTC_IRAM_LOW == SOC_RTC_DRAM_LOW); return ((SOC_RTC_IRAM_LOW == SOC_RTC_DRAM_LOW) && (SOC_RTC_IRAM_HIGH == SOC_RTC_DRAM_HIGH));
#else
return false;
#endif #endif
return dram_match_iram;
} }
/** /**

10
components/heap/heap_caps_base.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -56,7 +56,8 @@ HEAP_IRAM_ATTR void heap_caps_free( void *ptr)
return; return;
} }
if (esp_ptr_in_diram_iram(ptr) || esp_ptr_in_rtc_iram_fast(ptr)) { if ((!esp_dram_match_iram() && esp_ptr_in_diram_iram(ptr)) ||
(!esp_rtc_dram_match_rtc_iram() && esp_ptr_in_rtc_iram_fast(ptr))) {
//Memory allocated here is actually allocated in the DRAM alias region and //Memory allocated here is actually allocated in the DRAM alias region and
//cannot be de-allocated as usual. dram_alloc_to_iram_addr stores a pointer to //cannot be de-allocated as usual. dram_alloc_to_iram_addr stores a pointer to
//the equivalent DRAM address, though; free that. //the equivalent DRAM address, though; free that.
@@ -119,8 +120,9 @@ HEAP_IRAM_ATTR NOINLINE_ATTR void *heap_caps_malloc_base( size_t size, uint32_t
//This heap can satisfy all the requested capabilities. See if we can grab some memory using it. //This heap can satisfy all the requested capabilities. See if we can grab some memory using it.
// If MALLOC_CAP_EXEC is requested but the DRAM and IRAM are on the same addresses (like on esp32c6) // If MALLOC_CAP_EXEC is requested but the DRAM and IRAM are on the same addresses (like on esp32c6)
// proceed as for a default allocation. // proceed as for a default allocation.
if (((caps & MALLOC_CAP_EXEC) && !esp_dram_match_iram()) && if ((caps & MALLOC_CAP_EXEC) &&
(esp_ptr_in_diram_dram((void *)heap->start) || esp_ptr_in_rtc_dram_fast((void *)heap->start))) { ((!esp_dram_match_iram() && esp_ptr_in_diram_dram((void *)heap->start)) ||
(!esp_rtc_dram_match_rtc_iram() && esp_ptr_in_rtc_dram_fast((void *)heap->start)))) {
//This is special, insofar that what we're going to get back is a DRAM address. If so, //This is special, insofar that what we're going to get back is a DRAM address. If so,
//we need to 'invert' it (lowest address in DRAM == highest address in IRAM and vice-versa) and //we need to 'invert' it (lowest address in DRAM == highest address in IRAM and vice-versa) and
//add a pointer to the DRAM equivalent before the address we're going to return. //add a pointer to the DRAM equivalent before the address we're going to return.