diff options
author | Sergey Fedorov <serge.fdrv@gmail.com> | 2016-04-22 19:08:45 +0300 |
---|---|---|
committer | Richard Henderson <rth@twiddle.net> | 2016-05-12 14:06:40 -1000 |
commit | 76442a939ef8fc062b35a890a824de203bb5bd5f (patch) | |
tree | 3bfd290f9dd64655502b2ef9fc16c60172ed30dc /tci.c | |
parent | 6b587d3cda48e7ba26de8d30bf0d8a7063970715 (diff) | |
download | qemu-76442a939ef8fc062b35a890a824de203bb5bd5f.zip qemu-76442a939ef8fc062b35a890a824de203bb5bd5f.tar.gz qemu-76442a939ef8fc062b35a890a824de203bb5bd5f.tar.bz2 |
tci: Make direct jump patching thread-safe
Ensure direct jump patching in TCI is atomic by:
* naturally aligning a location of direct jump address;
* using atomic_read()/atomic_set() to load/store the address.
Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org>
Message-Id: <1461341333-19646-4-git-send-email-sergey.fedorov@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'tci.c')
-rw-r--r-- | tci.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1089,7 +1089,10 @@ uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) goto exit; break; case INDEX_op_goto_tb: - t0 = tci_read_i32(&tb_ptr); + /* Jump address is aligned */ + tb_ptr = QEMU_ALIGN_PTR_UP(tb_ptr, 4); + t0 = atomic_read((int32_t *)tb_ptr); + tb_ptr += sizeof(int32_t); tci_assert(tb_ptr == old_code_ptr + op_size); tb_ptr += (int32_t)t0; continue; |