Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(psram): correct heap vaddr calculation (IDFGH-14775) #15513

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(psram): correct heap vaddr calculation (IDFGH-14775) #15513

wants to merge 1 commit into from
+21 −11

Conversation

erkia
Copy link

@erkia erkia commented Mar 4, 2025 •
edited
Loading

Description

In case both .ext_ram_bss and .ext_ram_noinit segments exist, the heap start calculation may be incorrect when there is a gap between two sections. This is because the heap start calculation only considers segment sizes and not a possible gap between them. This gap may be introduced when using __attribute__((aligned(...))) on the first buffer in .ext_ram_noinit segment, i.e.:

...
 .bss.gEapSm    0x3c2038e4        0x4 esp-idf/wpa_supplicant/libwpa_supplicant.a(esp_eap_client.c.obj)
 *libwpa_supplicant.a:(COMMON)
                0x3c2038e8                        . = ALIGN (0x4)
                0x3c2038e8                        _ext_ram_bss_end = ABSOLUTE (.)

.ext_ram_noinit
                0x3c203900     0x8000
                0x3c203900                        _ext_ram_noinit_start = ABSOLUTE (.)
 *(.ext_ram_noinit*)
 .ext_ram_noinit.2
                0x3c203900     0x8000 esp-idf/main/libmain.a(logger.cpp.obj)
                0x3c203900                pucRingbufferStorage
                0x3c20b900                        . = ALIGN (0x4)
                0x3c20b900                        _ext_ram_noinit_end = ABSOLUTE (.)
...

In this case, s_psram_ctx.regions_to_heap[PSRAM_MEM_8BIT_ALIGNED].vaddr_start is incorrectly calculated to be 0x3c20b8e8, while this address obviously resides inside the allocated buffer.

Correct address would be: 0x3c203900 + 0x8000 = 0x3c20b900

This PR changes the calculation so that the beginning of the first segment and the end of the last segment is used to calculate the true allocated size of the both regions. It keeps the (theoretical?) possibility of these segments being in random order (don't know if this was the intention of the previous implementation).

Related

Fixes #15496

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 4, 2025 •
edited
Loading

Messages
📖 🎉 Good Job! All checks are passing!

👋 Hello erkia, we appreciate your contribution to this project!

📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.
🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project.
Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests via this public GitHub repository.

This GitHub project is public mirror of our internal git repository

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved, we synchronize it into our internal git repository.
4. In the internal git repository we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
5. If the change is approved and passes the tests it is merged into the default branch.
5. On next sync from the internal git repository merged change will appear in this public GitHub repository.

Generated by 🚫 dangerJS against 971ed95

@espressif-bot espressif-bot added the Status: Opened Issue is new label Mar 4, 2025
@github-actions github-actions bot changed the title fix(psram): correct heap vaddr calculation fix(psram): correct heap vaddr calculation (IDFGH-14775) Mar 4, 2025
@suda-morris suda-morris requested a review from Icarus113 March 5, 2025 01:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Icarus113 Icarus113 Awaiting requested review from Icarus113

Assignees

@Icarus113 Icarus113

Labels
Status: Opened Issue is new
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

PSRAM heap start calculation bug with CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY enabled (IDFGH-14757)
3 participants
@erkia @Icarus113 @espressif-bot