diff options
| author | Angus Gratton <angus@redyak.com.au> | 2024-11-06 14:27:01 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-11-18 23:27:13 +1100 |
| commit | 72799f99739f99496fd82b06b0c55ad7f58d2290 (patch) | |
| tree | 5e0e5c199438b37cc0306683246e71e6160ec7cb /ports | |
| parent | 164c5492481cb0d66e13f068818f9e2bbfa4dad6 (diff) | |
| download | micropython-72799f99739f99496fd82b06b0c55ad7f58d2290.tar.gz micropython-72799f99739f99496fd82b06b0c55ad7f58d2290.zip | |
esp32: Workaround native code execution crash on ESP32-S2.
Seemingly ESP-IDF incorrectly marks RTC FAST memory region
as MALLOC_CAP_EXEC on ESP32-S2 when it isn't. This memory is
the lowest priority, so it only is returned if D/IRAM is exhausted.
Apply this workaround to treat the allocation as failed if it gives us
non-executable RAM back, rather than crashing.
This work was funded through GitHub Sponsors.
Signed-off-by: Angus Gratton <angus@redyak.com.au>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/esp32/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ports/esp32/main.c b/ports/esp32/main.c index 03dc0807a0..18ef9d7354 100644 --- a/ports/esp32/main.c +++ b/ports/esp32/main.c @@ -39,6 +39,7 @@ #include "esp_task.h" #include "esp_event.h" #include "esp_log.h" +#include "esp_memory_utils.h" #include "esp_psram.h" #include "py/cstack.h" @@ -237,6 +238,13 @@ void *esp_native_code_commit(void *buf, size_t len, void *reloc) { len = (len + 3) & ~3; size_t len_node = sizeof(native_code_node_t) + len; native_code_node_t *node = heap_caps_malloc(len_node, MALLOC_CAP_EXEC); + #if CONFIG_IDF_TARGET_ESP32S2 + // Workaround for ESP-IDF bug https://github.com/espressif/esp-idf/issues/14835 + if (node != NULL && !esp_ptr_executable(node)) { + free(node); + node = NULL; + } + #endif // CONFIG_IDF_TARGET_ESP32S2 if (node == NULL) { m_malloc_fail(len_node); } |