OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asahi: Make track_free safer

Browse Source 
Ensure that we don't free the same BO multiple times, which can lead to later
segfaults in decode.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11815>
This commit is contained in:
Alyssa Rosenzweig
2021-07-10 11:16:56 -04:00
parent 9b6ca87672
commit 0b35a8f81a
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/asahi/lib/decode.c
View File

@@ -453,20 +453,31 @@ void
agxdecode_track_alloc(struct agx_bo *alloc) agxdecode_track_alloc(struct agx_bo *alloc)
{ {
assert((mmap_count + 1) < MAX_MAPPINGS); assert((mmap_count + 1) < MAX_MAPPINGS);
for (unsigned i = 0; i < mmap_count; ++i) {
struct agx_bo *bo = &mmap_array[i];
bool match = (bo->handle == alloc->handle && bo->type == alloc->type);
assert(!match && "tried to alloc already allocated BO");
}
mmap_array[mmap_count++] = *alloc; mmap_array[mmap_count++] = *alloc;
} }
void void
agxdecode_track_free(struct agx_bo *bo) agxdecode_track_free(struct agx_bo *bo)
{ {
bool found = false;
for (unsigned i = 0; i < mmap_count; ++i) { for (unsigned i = 0; i < mmap_count; ++i) {
if (mmap_array[i].handle == bo->handle && mmap_array[i].type == bo->type) { if (mmap_array[i].handle == bo->handle && mmap_array[i].type == bo->type) {
mmap_array[i].ptr.cpu = 0; assert(!found && "mapped multiple times!");
mmap_array[i].ptr.gpu = 0; found = true;
mmap_array[i].size = 0;
break; memset(&mmap_array[i], 0, sizeof(mmap_array[i]));
} }
} }
assert(found && "freed unmapped memory");
} }
static int agxdecode_dump_frame_count = 0; static int agxdecode_dump_frame_count = 0;