From patchwork Mon Jul 10 07:34:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3x5cTx4zX9z9s0g for ; Mon, 10 Jul 2017 17:36:37 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LHBECG97"; dkim-atps=neutral Received: from localhost ([::1]:39030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTFD-0007RD-MD for incoming@patchwork.ozlabs.org; Mon, 10 Jul 2017 03:36:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTEh-0007PZ-A1 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUTEc-0007Ui-Iz for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:03 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:34317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUTEc-0007UG-CA for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:35:58 -0400 Received: by mail-pf0-x244.google.com with SMTP id c24so13381587pfe.1 for ; Mon, 10 Jul 2017 00:35:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eb1hXbkMxmFO3JcbDrJp9EQ7V25/E0cDoCKUAtrRRNI=; b=LHBECG97NqeRWAQS/KZNjm9JF7qxndx1k03jXdA4MoaKXGUIsmUl0bX/chC5ppc+u9 lwhobVdE2YR9Ug/VkA5v/apgOOaCCkmY7/0p0T/u+uYtCbz6itEJIFangktDVoluqf84 jFAQB1sLfzSygIa6zqIdkd/wlhacSlptlydczB9mhw2v28eh9C+JJucWkK9q+ZbaV8I/ GyeuZN0NGVU1TjaztFXRzSMtTENlVEuLGDUk5lehmPAtc7kjrvAXMxUq/i8+4O2KMBIK dh0qR8M39r6jA0uBPf4FEEwoX1LVNDM/Hanu/qnSx9Ys8mL9ezQRVJRzZx+m+d1mwSGY tgvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eb1hXbkMxmFO3JcbDrJp9EQ7V25/E0cDoCKUAtrRRNI=; b=DMUYWvxBJZTEeyOBJknO2N4fb6ooEWBJd1vs9JwqEzr5AsJFcPvJFtetBuwKmIWJ6S w5Poes2RNUJlMegnUtKD8pxAvngmwiblALE8V5LzgF7OFHjdeDaUKnzskd1YUgvUihs2 loJXhCoknhqXX/ArZZOw+cvFz761ynsoxQ0zZsxOvJ2XinhAwtRq5GA4hu+c11COHJVM RH5dDiqToXmZJcUva6kH/1cv/D6PhHrzPwSvUvfpfn9ZjwJSe5mZcPnPnUhWozqzoxzz illwhG3WmqwmXQPgRboQdFivjA8GEO5klWsgv8YO6FcitFpHxPsBVU/msEateX+RpYfJ rHrA== X-Gm-Message-State: AIVw112/QX2fJFr7tkBluMeSgf83yyMuKDfO+uIZtquFTghbfMterKUL FG2NPRb0NTNLWw7vPOM= X-Received: by 10.99.56.21 with SMTP id f21mr13214202pga.235.1499672156733; Mon, 10 Jul 2017 00:35:56 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id o8sm21619584pgn.52.2017.07.10.00.35.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 00:35:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jul 2017 21:34:58 -1000 Message-Id: <20170710073501.5207-3-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710073501.5207-1-rth@twiddle.net> References: <20170710073501.5207-1-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PULL 2/5] tcg/aarch64: Use ADRP+ADD to compute target address 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, Pranith Kumar , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Pranith Kumar We use ADRP+ADD to compute the target address for goto_tb. This patch introduces the NOP instruction which is used to align the above instruction pair so that we can use one atomic instruction to patch the destination offsets. CC: Alex Bennée Reviewed-by: Richard Henderson Signed-off-by: Pranith Kumar Message-Id: <20170630143614.31059-2-bobby.prani@gmail.com> Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 2 +- tcg/aarch64/tcg-target.inc.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index dfb9f0d..0caf80d 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -504,7 +504,7 @@ static inline PageDesc *page_find(tb_page_addr_t index) #elif defined(__powerpc__) # define MAX_CODE_GEN_BUFFER_SIZE (32u * 1024 * 1024) #elif defined(__aarch64__) -# define MAX_CODE_GEN_BUFFER_SIZE (128ul * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (2ul * 1024 * 1024 * 1024) #elif defined(__s390x__) /* We have a +- 4GB range on the branches; leave some slop. */ # define MAX_CODE_GEN_BUFFER_SIZE (3ul * 1024 * 1024 * 1024) diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index 8fce11a..a84422d 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -372,6 +372,7 @@ typedef enum { I3510_EON = 0x4a200000, I3510_ANDS = 0x6a000000, + NOP = 0xd503201f, /* System instructions. */ DMB_ISH = 0xd50338bf, DMB_LD = 0x00000100, @@ -865,11 +866,27 @@ static inline void tcg_out_call(TCGContext *s, tcg_insn_unit *target) void aarch64_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; + tcg_insn_unit i1, i2; + TCGType rt = TCG_TYPE_I64; + TCGReg rd = TCG_REG_TMP; + uint64_t pair; - reloc_pc26_atomic(code_ptr, target); - flush_icache_range(jmp_addr, jmp_addr + 4); + ptrdiff_t offset = addr - jmp_addr; + + if (offset == sextract64(offset, 0, 26)) { + i1 = I3206_B | ((offset >> 2) & 0x3ffffff); + i2 = NOP; + } else { + offset = (addr >> 12) - (jmp_addr >> 12); + + /* patch ADRP */ + i1 = I3406_ADRP | (offset & 3) << 29 | (offset & 0x1ffffc) << (5 - 2) | rd; + /* patch ADDI */ + i2 = I3401_ADDI | rt << 31 | (addr & 0xfff) << 10 | rd << 5 | rd; + } + pair = (uint64_t)i2 << 32 | i1; + atomic_set((uint64_t *)jmp_addr, pair); + flush_icache_range(jmp_addr, jmp_addr + 8); } static inline void tcg_out_goto_label(TCGContext *s, TCGLabel *l) @@ -1388,10 +1405,17 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, #endif /* consistency for USE_DIRECT_JUMP */ tcg_debug_assert(s->tb_jmp_insn_offset != NULL); + /* Ensure that ADRP+ADD are 8-byte aligned so that an atomic + write can be used to patch the target address. */ + if ((uintptr_t)s->code_ptr & 7) { + tcg_out32(s, NOP); + } s->tb_jmp_insn_offset[a0] = tcg_current_code_size(s); /* actual branch destination will be patched by - aarch64_tb_set_jmp_target later, beware retranslation. */ - tcg_out_goto_noaddr(s); + aarch64_tb_set_jmp_target later. */ + tcg_out_insn(s, 3406, ADRP, TCG_REG_TMP, 0); + tcg_out_insn(s, 3401, ADDI, TCG_TYPE_I64, TCG_REG_TMP, TCG_REG_TMP, 0); + tcg_out_insn(s, 3207, BR, TCG_REG_TMP); s->tb_jmp_reset_offset[a0] = tcg_current_code_size(s); break;