-
Notifications
You must be signed in to change notification settings - Fork 367
vregion: Cross core user-space DP fix #11071
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.
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
Open
jsarha
wants to merge
2
commits into
thesofproject:main
Choose a base branch
from
jsarha:cross_core_dp_fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,8 +127,11 @@ struct vregion *vregion_create(size_t memsize) | |
| */ | ||
| total_size = ALIGN_UP(memsize, CONFIG_MM_DRV_PAGE_SIZE); | ||
|
|
||
| /* allocate vregion metadata separately to keep it inaccessible to the user */ | ||
| vr = rmalloc(0, sizeof(*vr)); | ||
| /* allocate vregion metadata separately to keep it inaccessible to the user. | ||
| * Use coherent memory so interim heap state written on one core is | ||
| * visible to other cores during cross-core buffer allocation. | ||
| */ | ||
| vr = rmalloc(SOF_MEM_FLAG_COHERENT, sizeof(*vr)); | ||
| if (!vr) | ||
| return NULL; | ||
|
|
||
|
|
@@ -254,6 +257,11 @@ static void interim_heap_init(struct vregion *vr) | |
| k_heap_init(&vr->interim.heap, interim_base, interim_size); | ||
| vr->type = VREGION_MEM_TYPE_INTERIM; | ||
|
|
||
| /* Flush the heap metadata written by k_heap_init to main memory | ||
| * so other cores can access the interim heap without stale cache. | ||
| */ | ||
| sys_cache_data_flush_range(interim_base, interim_size); | ||
|
Comment on lines
+260
to
+263
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please address this |
||
|
|
||
| /* Update lifetime heap with the interim heap usage. */ | ||
| vr->lifetime.ptr = (void *)(interim_base + interim_size); | ||
| vr->lifetime.used = (uint8_t *)vr->lifetime.ptr - (uint8_t *)vr->lifetime.base; | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, but should heap be initialited with coherent address and cached addresses given out when/if needed? It seems all heap actions are now unsafe with multicore unless you have explicit cache flushes whenever the heap is used via k_heap. Am I missing something?