yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-11-04 08:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

translate-all: exit from tb_phys_invalidate if qht_remove fails

Browse source 
Two or more threads might race while invalidating the same TB. We currently
do not check for this at all despite taking tb_lock, which means we would
wrongly invalidate the same TB more than once. This bug has actually been
hit by users: I recently saw a report on IRC, although I have yet to see
the corresponding test case.

Fix this by using qht_remove as the synchronization point; if it fails,
that means the TB has already been invalidated, and therefore there
is nothing left to do in tb_phys_invalidate.

Note that this solution works now that we still have tb_lock, and will
continue working once we remove tb_lock.

Backports commit cc689485ee3e9dca05765326ee8fd619a6ec48f0 from qemu
This commit is contained in:
Emilio G. Cota 2018-03-15 15:50:36 -04:00 committed by Lioncash
parent cd538f0b7e
commit fc30b3d5cf
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/accel/tcg/translate-all.c
View file

@ -1114,7 +1114,9 @@ void tb_phys_invalidate(struct uc_struct *uc,
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HASH_MASK, h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HASH_MASK,
tb->trace_vcpu_dstate); tb->trace_vcpu_dstate);
qht_remove(&uc->tb_ctx.htable, tb, h); if (!qht_remove(&uc->tb_ctx.htable, tb, h)) {
return;
}
/* remove the TB from the page list */ /* remove the TB from the page list */
if (tb->page_addr[0] != page_addr) { if (tb->page_addr[0] != page_addr) {