[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/39] tcg/s390: Make direct jump patching thread-saf
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 07/39] tcg/s390: Make direct jump patching thread-safe |
Date: |
Thu, 12 May 2016 14:13:08 -1000 |
From: Sergey Fedorov <address@hidden>
Ensure direct jump patching in s390 is atomic by:
* naturally aligning a location of direct jump address;
* using atomic_read()/atomic_set() for code patching.
Signed-off-by: Sergey Fedorov <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/exec-all.h | 2 +-
tcg/s390/tcg-target.inc.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 0ab7803..6c095e8 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -321,7 +321,7 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr,
uintptr_t addr)
{
/* patch the branch destination */
intptr_t disp = addr - (jmp_addr - 2);
- stl_be_p((void*)jmp_addr, disp / 2);
+ atomic_set((int32_t *)jmp_addr, disp / 2);
/* no need to flush icache explicitly */
}
#elif defined(__aarch64__)
diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
index 5805532..8e8064c 100644
--- a/tcg/s390/tcg-target.inc.c
+++ b/tcg/s390/tcg-target.inc.c
@@ -219,6 +219,8 @@ typedef enum S390Opcode {
RX_ST = 0x50,
RX_STC = 0x42,
RX_STH = 0x40,
+
+ NOP = 0x0707,
} S390Opcode;
#ifdef CONFIG_DEBUG_TCG
@@ -1716,6 +1718,12 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode
opc,
case INDEX_op_goto_tb:
if (s->tb_jmp_offset) {
+ /* branch displacement must be aligned for atomic patching;
+ * see if we need to add extra nop before branch
+ */
+ if (!QEMU_PTR_IS_ALIGNED(s->code_ptr + 1, 4)) {
+ tcg_out16(s, NOP);
+ }
tcg_out16(s, RIL_BRCL | (S390_CC_ALWAYS << 4));
s->tb_jmp_offset[args[0]] = tcg_current_code_size(s);
s->code_ptr += 2;
--
2.5.5
- [Qemu-devel] [PULL 00/39] tcg-next patch queue, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 02/39] include/qemu/osdep.h: Add a macro to check for alignment, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 03/39] include/qemu/osdep.h: Add macros for pointer alignment, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 01/39] tb: consistently use uint32_t for tb->flags, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 04/39] tci: Make direct jump patching thread-safe, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 06/39] tcg/i386: Make direct jump patching thread-safe, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 08/39] tcg/arm: Make direct jump patching thread-safe, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 10/39] tcg/sparc: Make direct jump patching thread-safe, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 05/39] tcg/ppc: Make direct jump patching thread-safe, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 07/39] tcg/s390: Make direct jump patching thread-safe,
Richard Henderson <=
- [Qemu-devel] [PULL 09/39] tcg/aarch64: Make direct jump patching thread-safe, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 11/39] tcg/mips: Make direct jump patching thread-safe, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 12/39] tcg: Note requirement on atomic direct jump patching, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 13/39] translate-all: remove redundant setting of tcg_ctx.code_gen_buffer_size, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 15/39] translate-all: Adjust 256mb testing for mips64, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 14/39] translate-all: add missing munmap of the code_gen guard page for MIPS, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 16/39] tcg: Clean up direct block chaining data fields, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 17/39] tcg: Use uintptr_t type for jmp_list_{next|first} fields of TB, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 18/39] tcg: Rearrange tb_link_page() to avoid forward declaration, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 19/39] tcg: Init TB's direct jumps before making it visible, Richard Henderson, 2016/05/12