From patchwork Fri May 13 00:13:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9086981 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 86F2F9F1D3 for ; Fri, 13 May 2016 00:16:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C466020204 for ; Fri, 13 May 2016 00:16:57 +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 00CCF200D0 for ; Fri, 13 May 2016 00:16:57 +0000 (UTC) Received: from localhost ([::1]:60319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10ml-0004IT-VR for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 May 2016 20:16:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kT-0008V9-7i for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b10kP-0002fx-UX for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:33 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:34121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kP-0002fi-Pm for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:29 -0400 Received: by mail-qk0-x243.google.com with SMTP id i7so7138141qkd.1 for ; Thu, 12 May 2016 17:14:29 -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 :mime-version:content-transfer-encoding; bh=yY9xbu+ltDd5Fll0H3DaYrLqLORhdHQX0PwFO/tnM7c=; b=F373YgS1FUlSULQU9YhopHx+Nc80aOzKrrxZnMJBIA0i+Fw+nPICRnzQ/4Se+ucCwr /AWrW/GSbRT7JZ+6cYQuYpZ6lAr1ud+W2Cu5N+8DcITwv+NF6YiB2gC38+rmmuXFk+e2 5gM/C4M1IoH8jJFgt2cMReoO3ImrZjqDaDS9oWpbHWxEOSD9PsEvTmoJQSA5oJMf6eav gcp/Tbe7HqYsJjOpd9i26FGMiidGh/3P3k6b+CWUMZd+aO3FeMmbiloABoeC6WQO2pmT DW/qtnDpfoe+vjYdFEx/hYh80UAw61BUhBysXc/u1aRCge+cRCY/uQD18UKkutuwVZUF JSVA== 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:mime-version:content-transfer-encoding; bh=yY9xbu+ltDd5Fll0H3DaYrLqLORhdHQX0PwFO/tnM7c=; b=H5duu09vzFozGGvi75/32BnxVvAQ0omjpYEBJhrfISFPpXipM4dSfRLpnHd7x0kJAQ eQfluHxjXIbRLwwEdzGxKe7UtUTpzB2IUdyP8nHb55OxydyzWoPZH0mi9WzWz74oIEcZ XI0vb+lnlXIuapfSjTnMnP24yux3PE4BYxJjeui3JiU3SsdrAjSqJjijbJYeWw/cz8NA Jx6txPcpz2o30PkAdKzpmNVHBULhCJW/+veJ68t0moVzBAp1WxPzWg6c9vtcDeU0JJMG HtrPzIn11GjhONi7cbYPVMOarsp7dRVW6FCuJboewg0FBIUPugnakh5bYc+NPHIRdkc+ ytTg== X-Gm-Message-State: AOPr4FW/9o+TRWgCsaq9jsJ7zzJGqShMOZVlPhEWs/laDjqEgF5Ly14l0pzo+bDsiElDPA== X-Received: by 10.55.221.205 with SMTP id u74mr13211861qku.86.1463098469445; Thu, 12 May 2016 17:14:29 -0700 (PDT) Received: from bigtime.com ([172.56.44.137]) by smtp.gmail.com with ESMTPSA id w16sm7171321qka.35.2016.05.12.17.14.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2016 17:14:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 12 May 2016 14:13:06 -1000 Message-Id: <1463098420-29113-6-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> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PULL 05/39] tcg/ppc: 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 PPC is atomic by: * limiting translation buffer size in 32-bit mode to be addressable by Branch I-form instruction; * using atomic_read()/atomic_set() for code patching. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée Message-Id: <1461341333-19646-5-git-send-email-sergey.fedorov@linaro.org> Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.inc.c | 22 ++++++++++++++++++---- translate-all.c | 2 ++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 00bb90f..039fa77 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -1237,6 +1237,7 @@ static void tcg_out_brcond2 (TCGContext *s, const TCGArg *args, tcg_out_bc(s, BC | BI(7, CR_EQ) | BO_COND_TRUE, arg_label(args[5])); } +#ifdef __powerpc64__ void ppc_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr) { tcg_insn_unit i1, i2; @@ -1265,11 +1266,18 @@ void ppc_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr) pair = (uint64_t)i2 << 32 | i1; #endif - /* ??? __atomic_store_8, presuming there's some way to do that - for 32-bit, otherwise this is good enough for 64-bit. */ - *(uint64_t *)jmp_addr = pair; + atomic_set((uint64_t *)jmp_addr, pair); flush_icache_range(jmp_addr, jmp_addr + 8); } +#else +void ppc_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr) +{ + intptr_t diff = addr - jmp_addr; + tcg_debug_assert(in_range_b(diff)); + atomic_set((uint32_t *)jmp_addr, B | (diff & 0x3fffffc)); + flush_icache_range(jmp_addr, jmp_addr + 4); +} +#endif static void tcg_out_call(TCGContext *s, tcg_insn_unit *target) { @@ -1895,7 +1903,9 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, break; case INDEX_op_goto_tb: tcg_debug_assert(s->tb_jmp_offset); - /* Direct jump. Ensure the next insns are 8-byte aligned. */ + /* Direct jump. */ +#ifdef __powerpc64__ + /* Ensure the next insns are 8-byte aligned. */ if ((uintptr_t)s->code_ptr & 7) { tcg_out32(s, NOP); } @@ -1904,6 +1914,10 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, s->code_ptr += 2; tcg_out32(s, MTSPR | RS(TCG_REG_TMP1) | CTR); tcg_out32(s, BCCTR | BO_ALWAYS); +#else + /* To be replaced by a branch. */ + s->code_ptr++; +#endif s->tb_next_offset[args[0]] = tcg_current_code_size(s); break; case INDEX_op_br: diff --git a/translate-all.c b/translate-all.c index 1a8f68b..781819e 100644 --- a/translate-all.c +++ b/translate-all.c @@ -464,6 +464,8 @@ static inline PageDesc *page_find(tb_page_addr_t index) # define MAX_CODE_GEN_BUFFER_SIZE (2ul * 1024 * 1024 * 1024) #elif defined(__powerpc64__) # define MAX_CODE_GEN_BUFFER_SIZE (2ul * 1024 * 1024 * 1024) +#elif defined(__powerpc__) +# define MAX_CODE_GEN_BUFFER_SIZE (32u * 1024 * 1024) #elif defined(__aarch64__) # define MAX_CODE_GEN_BUFFER_SIZE (128ul * 1024 * 1024) #elif defined(__arm__)