Heap addendum to handle changes in NON-OS SDK 3.0.x #8746
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
The NON-OS SDK 3.0.x has breaking changes to pvPortMalloc. They added one more argument for selecting a heap. To avoid breaking the build, I renamed their broken version pvEsprMalloc. To be used, the LIBS need to be edited. They also added pvPortZallocIram and pvPortCallocIram, which are not a problem. Issues with WPA2 Enterprise in new SDKs: * v3.0.0 and v3.0.1 - have the same memory leak and duplicate free bugs from before * v3.0.2 through v3.0.5 - have the same memory leak; however, _no_ duplicate free crash. * memory leak can be seen by cycling through setup, connect, disconnect, and clear setup - repeatedly. Updated `wpa2_eap_patch.cpp` and binary patch scripts to handle v3.0.0 through v3.0.5. Patched SDKs v3.0.0 through v3.0.5
mhightower83 force-pushed the pr-enterprise-305 branch from f967e98 to c2e083e Compare non32xfer_exception_handler in v3.0.x
Reduce resource requirements for non32xfer_exception_handler on SDKs 3.0.x
mhightower83 commented Dec 12, 2022
Updated script to replaced pvPortMalloc with sdk3_pvPortMalloc in SDK v3.0 libraries
mcspr reviewed Dec 16, 2022
| | ||
| if [[ ${VERSION} == "NONOSDK3V0" ]]; then | ||
| xtensa-lx106-elf-objcopy --weaken-symbol load_non_32_wide_handler libmain.a | ||
| elif [[ ${VERSION:0:9} == "NONOSDK30" ]]; then |
There was a problem hiding this comment.
nit: for this and the above, bash has a pretty good string matcher through case
case $VERSION in "NONOSDK3V0") echo "foo" ;; "NONOSDK30"*) echo "bar" ;; "I write this in Github Web, syntax may be wrong") echo "baz" ;; esac mcspr reviewed Dec 16, 2022
hasenradball pushed a commit to hasenradball/Arduino that referenced this pull request Nov 18, 2024
## WPA2 Enterprise connections References - merged PRs: * esp8266#8529 * esp8266#8566 - these occurred with connect/disconnect with WPA-Enterprise * esp8266#8736 (comment) The NON-OS SDK 3.0.x has breaking changes to the [`pvPortMalloc`](https://github.com/espressif/ESP8266_NONOS_SDK/blob/bf890b22e57a41d5cda00f9c8191f3f7035a87b4/include/mem.h#L42) function. They added a new `bool` argument for selecting a heap. ```cpp void *pvPortMalloc (size_t sz, const char *, unsigned, bool); ``` To avoid breaking the build, I added a new thin wrapper function `sdk3_pvPortMalloc` to `heap.cpp`. Edited new SDK LIBs to call `pvPortMalloc`'s replacement `sdk3_pvPortMalloc`. They also added `pvPortZallocIram` and `pvPortCallocIram`, which are not a problem to support. Support added to `heap.cpp`. Issues with WPA2 Enterprise in new SDKs: * v3.0.0 and v3.0.1 - have the same memory leak and duplicate free bugs from before * v3.0.2 through v3.0.5 - have the same memory leak; however, _no_ duplicate free crash. * memory leak can be seen by cycling through setup, connect, disconnect, and clear setup - repeatedly. Updated `wpa2_eap_patch.cpp` and binary patch scripts to handle v3.0.0 through v3.0.5. Patched SDKs v3.0.0 through v3.0.5 ## Duplicate Non-32-bit exception handler Issue: At v3.0.0 and above `libmain.a` supplies a built-in exception handler (`load_non_32_wide_handler`) for non-32-bit access. Our non-32-bit access handler (`non32xfer_exception_handler`) overrides it. Solution: Add "weak" attribute to symbol `load_non_32_wide_handler`. Adjust the build to default to the SDK's built-in non-32-bit handler. If there is a need to use our non-32-bit handler, make the selection from the Arduino IDE Tools menu `Non-32-Bit Access: "Byte/Word access to IRAM/PROGMEM (very slow)"`. With SDKs v3.0.0 and above a "non-32-bit exception handler" is always present.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Changes to better support new SDKs v3.0.0-v3.0.5
WPA2 Enterprise connections
References - merged PRs:
The NON-OS SDK 3.0.x has breaking changes to the
pvPortMallocfunction. They added a newboolargument for selecting a heap.To avoid breaking the build, I added a new thin wrapper function
sdk3_pvPortMalloctoheap.cpp.Edited new SDK LIBs to call
pvPortMalloc's replacementsdk3_pvPortMalloc.They also added
pvPortZallocIramandpvPortCallocIram, which are not a problem to support. Support added toheap.cpp.Issues with WPA2 Enterprise in new SDKs:
Updated
wpa2_eap_patch.cppand binary patch scripts to handle v3.0.0 through v3.0.5.Patched SDKs v3.0.0 through v3.0.5
Duplicate Non-32-bit exception handler
Issue: At v3.0.0 and above
libmain.asupplies a built-in exception handler (load_non_32_wide_handler) for non-32-bit access. Our non-32-bit access handler (non32xfer_exception_handler) overrides it.Solution: Add "weak" attribute to symbol
load_non_32_wide_handler. Adjust the build to default to the SDK's built-in non-32-bit handler. If there is a need to use our non-32-bit handler, make the selection from the Arduino IDE Tools menuNon-32-Bit Access: "Byte/Word access to IRAM/PROGMEM (very slow)".With SDKs v3.0.0 and above a "non-32-bit exception handler" is always present.
Edited to describe the current contents of the PR.