mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-24 13:28:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

exec: Atomic access to bounce buffer

Browse source 
There could be a race condition when two processes call
address_space_map concurrently and both want to use the bounce buffer.

Add an in_use flag in BounceBuffer to sync it.

Backports commit c2cba0ffe495b60c4cc58080281e99c7a6580d4b from qemu
This commit is contained in:
Paolo Bonzini 2018-02-12 20:59:51 -05:00 committed by Lioncash
parent 141754beea
commit 5c85c564b5
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/qemu.h
View file

@ -38,6 +38,7 @@ typedef struct {
void *buffer; void *buffer;
hwaddr addr; hwaddr addr;
hwaddr len; hwaddr len;
bool in_use;
} BounceBuffer; } BounceBuffer;
typedef struct RAMList { typedef struct RAMList {

3
qemu/exec.c
View file

@ -1891,7 +1891,7 @@ void *address_space_map(AddressSpace *as,
l = len; l = len;
mr = address_space_translate(as, addr, &xlat, &l, is_write); mr = address_space_translate(as, addr, &xlat, &l, is_write);
if (!memory_access_is_direct(mr, is_write)) { if (!memory_access_is_direct(mr, is_write)) {
if (as->uc->bounce.buffer) { if (atomic_xchg(&as->uc->bounce.in_use, true)) {
return NULL; return NULL;
} }
/* Avoid unbounded allocations */ /* Avoid unbounded allocations */
@ -1960,6 +1960,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,
qemu_vfree(as->uc->bounce.buffer); qemu_vfree(as->uc->bounce.buffer);
as->uc->bounce.buffer = NULL; as->uc->bounce.buffer = NULL;
memory_region_unref(as->uc->bounce.mr); memory_region_unref(as->uc->bounce.mr);
atomic_mb_set(&as->uc->bounce.in_use, false);
} }
void *cpu_physical_memory_map(AddressSpace *as, hwaddr addr, void *cpu_physical_memory_map(AddressSpace *as, hwaddr addr,