From patchwork Fri May 13 00:13:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9087001 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7CB9FBF29F for ; Fri, 13 May 2016 00:19:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5B0620204 for ; Fri, 13 May 2016 00:19:02 +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 EEE3B200D0 for ; Fri, 13 May 2016 00:19:01 +0000 (UTC) Received: from localhost ([::1]:60333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10on-0007qC-2R for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 May 2016 20:19:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10ka-0000JM-W5 for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b10kY-0002io-Ht for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:39 -0400 Received: from mail-qg0-x242.google.com ([2607:f8b0:400d:c04::242]:35161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kY-0002ik-Cp for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:38 -0400 Received: by mail-qg0-x242.google.com with SMTP id b14so6074357qge.2 for ; Thu, 12 May 2016 17:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=dPinkN2fI8FU422XtkYplGdYdOlNeBOEq618Ndexdao=; b=AucAatMRNbMxOZAR30pp5FfvJtgbL6yZc3+by2DB2WyXbi4J6isC4h7QYsI2PqiCeF M+/PIunbplHvOIQAnRr6sCRiOi6FnnDzQTp50VdSHSndhjXS6aePWInTT5UY0EXu2+Ev QndSDvqr+/KL6FkbGTIRAvmMHfw4YqZlpWG8iJi9J+nf2il4h3lh9y5CaU5sZiKYfi20 zBCADlq14RbktuLTu9qF34DAxspHtsH5LYefNZadHC2gZgJEJWGhQBF7/6ribq32qQsQ W4Mddcwgx/FD5lgK9xaf84qDrG4CdTH7exWTk/COpxF7MpvK707u8mY+weGeTu0y/WZh Zy2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=dPinkN2fI8FU422XtkYplGdYdOlNeBOEq618Ndexdao=; b=Mb8eeVJEFxSkZlt5iFQHyEJdtN8jOjkh3AJp5Iv41MnfnRWnudDkc0Qo5fISlHt1OC qGSygEqgXVCnEFUi4nP9eFMGhnU0WTgJowdRwVYZhbNs7cJJw2yGZGAxUhfEe7o68uCr XhAH6Eex2AewlhUIAjwM6zZ695fHxXyzzOffUSOll3mvFXQhNabaqt5LSdjXDUAZYDFE 7bhJt0AVhVbNUNkDCo1YfXriXPJjS9ayelLXK4qvoM6jNju81Sn1ZpNtOCivX+6ffXeF SwUu/A022SyPUdmvuVbO9GEsoL428i5MBxJwTxIGccFF1STexUdI3hNkP4dt+bsyQoeU 9agQ== X-Gm-Message-State: AOPr4FXMjIfhBlTFUeVMaJGkI23dNQKF74GQ6fQ4T2blLO7pvG2vF1+9kjwhoYJxTbLXhA== X-Received: by 10.140.132.73 with SMTP id 70mr13273889qhe.42.1463098478120; Thu, 12 May 2016 17:14:38 -0700 (PDT) Received: from bigtime.com ([172.56.44.137]) by smtp.gmail.com with ESMTPSA id w16sm7171321qka.35.2016.05.12.17.14.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2016 17:14:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 12 May 2016 14:13:09 -1000 Message-Id: <1463098420-29113-9-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463098420-29113-1-git-send-email-rth@twiddle.net> References: <1463098420-29113-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::242 Subject: [Qemu-devel] [PULL 08/39] 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: peter.maydell@linaro.org, Sergey Fedorov , Sergey Fedorov 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 Message-Id: <1461341333-19646-8-git-send-email-sergey.fedorov@linaro.org> Signed-off-by: Richard Henderson --- 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 6c095e8..30cdd69 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -328,29 +328,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 2b7fbdd..977baa0 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) {