From patchwork Fri Apr 22 16:08:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 8913831 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D891E9F1D3 for ; Fri, 22 Apr 2016 16:14:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 23906201B9 for ; Fri, 22 Apr 2016 16:14:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 62CEE20160 for ; Fri, 22 Apr 2016 16:14:58 +0000 (UTC) Received: from localhost ([::1]:35558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atdjN-00026X-JY for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Apr 2016 12:14:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atddx-0008AO-Ug for qemu-devel@nongnu.org; Fri, 22 Apr 2016 12:09:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atddv-0008Gn-4b for qemu-devel@nongnu.org; Fri, 22 Apr 2016 12:09:21 -0400 Received: from mail-lf0-x235.google.com ([2a00:1450:4010:c07::235]:33192) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atddu-0008GW-Hr for qemu-devel@nongnu.org; Fri, 22 Apr 2016 12:09:19 -0400 Received: by mail-lf0-x235.google.com with SMTP id e190so82101981lfe.0 for ; Fri, 22 Apr 2016 09:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M1k9luzcZneGtKCf+zbkD3kgZYx2P+IxsJK4JYas0kk=; b=QkmbG+YcthauviuD71Nt3VNMRf8XiImHq3j9qihbrvj7xVZOa/QeKlla/zbuJJkvAU /mH5+DzmdNk1UDuz2OzILQXctPjcGJUbmY7YjeOP7jTSWqqjb+qILxsf8fnGOwq7bN5d ry4oEU80rFiLolD3Gf9VSK7kp+mBrwU2S2hts= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M1k9luzcZneGtKCf+zbkD3kgZYx2P+IxsJK4JYas0kk=; b=iTHEZW2jfYTr0nnXjn/uJ8qwX7wvCFdaA0N6zxY3hU1H87D6wuENuVF/RcnY9sZbXD IRePvuDXIUmTqd9RLBQO/3+SAhY3Fh9iJy/UL5aWynfUVINnZdn7ONGMK1JuCkC1UIYA kxoOJzwOMWA/CPo7FqYaLfSoBq7Ujn6HuzLSiHrIK9FBasKhZoJQ6DAXvs8S8WA62AD4 YlCNltaLGraPevQk5tm5mYOi7arhKxTdGdpwXw1xdjqHVj8Bq/lQsLrEsqy4AI1Posrs iVNfnV/x5nDkE5K9EswlmCjPcCfL/ByWXCrAF+PuqDGYa9+W/WHDGmGlZsPvkHeSmtru VvfA== X-Gm-Message-State: AOPr4FWokE19rn0TLCc39Vlj6YrwAitlpqLCIfxPrECms8ts8uxdAEnKCmJwXaQesMa/zy4m X-Received: by 10.25.21.39 with SMTP id l39mr3885434lfi.106.1461341357495; Fri, 22 Apr 2016 09:09:17 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-121-115.2com.net. [46.188.121.115]) by smtp.gmail.com with ESMTPSA id hw7sm1645709lbb.40.2016.04.22.09.09.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Apr 2016 09:09:16 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Fri, 22 Apr 2016 19:08:49 +0300 Message-Id: <1461341333-19646-8-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461341333-19646-1-git-send-email-sergey.fedorov@linaro.org> References: <1461341333-19646-1-git-send-email-sergey.fedorov@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::235 Subject: [Qemu-devel] [PATCH v2 07/11] tcg/arm: Make direct jump patching thread-safe X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Fedorov , Peter Crosthwaite , qemu-arm@nongnu.org, Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sergey Fedorov Ensure direct jump patching in ARM is atomic by using atomic_read()/atomic_set() for code patching. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov --- Changes in v 2: * Add tcg_debug_assert() to check offset * Use deposit32() for insturction patching include/exec/exec-all.h | 25 ++----------------------- tcg/arm/tcg-target.inc.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index e18cc24e50f0..6a054ee720a8 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -327,29 +327,8 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) void aarch64_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr); #define tb_set_jmp_target1 aarch64_tb_set_jmp_target #elif defined(__arm__) -static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) -{ -#if !QEMU_GNUC_PREREQ(4, 1) - register unsigned long _beg __asm ("a1"); - register unsigned long _end __asm ("a2"); - register unsigned long _flg __asm ("a3"); -#endif - - /* we could use a ldr pc, [pc, #-4] kind of branch and avoid the flush */ - *(uint32_t *)jmp_addr = - (*(uint32_t *)jmp_addr & ~0xffffff) - | (((addr - (jmp_addr + 8)) >> 2) & 0xffffff); - -#if QEMU_GNUC_PREREQ(4, 1) - __builtin___clear_cache((char *) jmp_addr, (char *) jmp_addr + 4); -#else - /* flush icache */ - _beg = jmp_addr; - _end = jmp_addr + 4; - _flg = 0; - __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg)); -#endif -} +void arm_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr); +#define tb_set_jmp_target1 arm_tb_set_jmp_target #elif defined(__sparc__) || defined(__mips__) void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr); #else diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 3edf6a6f971c..2750610a54f1 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -121,6 +121,14 @@ static inline void reloc_pc24(tcg_insn_unit *code_ptr, tcg_insn_unit *target) *code_ptr = (*code_ptr & ~0xffffff) | (offset & 0xffffff); } +static inline void reloc_pc24_atomic(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +{ + ptrdiff_t offset = (tcg_ptr_byte_diff(target, code_ptr) - 8) >> 2; + tcg_insn_unit insn = atomic_read(code_ptr); + tcg_debug_assert(offset == sextract32(offset, 0, 24)); + atomic_set(code_ptr, deposit32(insn, 0, 24, offset)); +} + static void patch_reloc(tcg_insn_unit *code_ptr, int type, intptr_t value, intptr_t addend) { @@ -1038,6 +1046,16 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *addr) } } +void arm_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr) +{ + tcg_insn_unit *code_ptr = (tcg_insn_unit *)jmp_addr; + tcg_insn_unit *target = (tcg_insn_unit *)addr; + + /* we could use a ldr pc, [pc, #-4] kind of branch and avoid the flush */ + reloc_pc24_atomic(code_ptr, target); + flush_icache_range(jmp_addr, jmp_addr + 4); +} + static inline void tcg_out_goto_label(TCGContext *s, int cond, TCGLabel *l) { if (l->has_value) {