From patchwork Fri Jul 7 16:18:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 107212 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp250834qge; Fri, 7 Jul 2017 09:20:20 -0700 (PDT) X-Received: by 10.237.32.41 with SMTP id 38mr26899434qta.68.1499444419998; Fri, 07 Jul 2017 09:20:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499444419; cv=none; d=google.com; s=arc-20160816; b=zD/VF9rLAWp8nmKoC9k7HiEXRhTfXK4kKgzqgGOhlNx3wA24LbKpvHStOc3KW00wkC XN4xFxWDQQg0at3qrrSLWR4RlKjuSBnxpSS4SkqlndSY+NfPIfX9y/xHutXd7WUerKr2 3Dc+ZbS5YMqPCXjXiMBCMehlp8224FU8jf8aFnvgbXYaQrgivaesLsLsUNPfxjtxtU1q hAvM4zoVuUQGwERZ3biIx2Gv6n3oCBc3eXq+2pfyFe2ZpV1o3rYYL5umDjvs+kSt/fh1 hyg6vQpsaBBYDdcPNVQDOtaGRD+b5Fh/pT9196wyCNLb56cZkKog7kxCYqfmx6uIdOAJ tWGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=TQcOYMRr1X2uR2B4LJT6P2l3PWiyYrz9ru/UDTQjKlY=; b=BQdaPDhNPC2qP1lFrCL0YtvN1GWG1GrxJ2wrtA31gTSpO8SLUFHgqMppLyMWlnCE/J yPkOexVWtI2Wb9PR5hToR4mvUx7K+scd4g6l4E1VwNoB2WNEFAUuiH48KgoXjLY5h8r9 E9r1aTuELgLtg59JX11enxFSHmXV1IoAII3HxqRkiRkRRcWY29FWUGH8u0CvzcX896to t9CW7QP38hVceTvLXKyp1ZAeaGb6IyKKP4ZEpacsJjTa44IGFtvMm2NYO5pjTy9KZcGD DOVOlXK6YzVHmkVIQIaIMPEPFyANW8nlhVp3g44y3vu/tLH2iYySNGERXmupQnv5yaua NFpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=gy2m2xLz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s185si3557876qkh.184.2017.07.07.09.20.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 07 Jul 2017 09:20:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.b=gy2m2xLz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTVzN-0005Gb-Id for patch@linaro.org; Fri, 07 Jul 2017 12:20:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTVxq-00048K-E2 for qemu-devel@nongnu.org; Fri, 07 Jul 2017 12:18:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTVxm-0008JG-FB for qemu-devel@nongnu.org; Fri, 07 Jul 2017 12:18:42 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:36782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTVxm-0008Ii-7I for qemu-devel@nongnu.org; Fri, 07 Jul 2017 12:18:38 -0400 Received: by mail-wr0-x230.google.com with SMTP id c11so53448781wrc.3 for ; Fri, 07 Jul 2017 09:18:38 -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:mime-version :content-transfer-encoding; bh=TQcOYMRr1X2uR2B4LJT6P2l3PWiyYrz9ru/UDTQjKlY=; b=gy2m2xLzULkayiwLqxMKhyQaS33f5pVcO/AcvpTijquv/gGZbLBeqnKWqqLd6hOk5l vzVKg5gsewdyF8qJ7PaLjEVQyq2VUYGJJZfJqpAdVDlPvG0ztx7OE2bgvElNJastZr+d leB7VOlGP2XLmICOhqonVKtG/BYo9+JpjOEp8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TQcOYMRr1X2uR2B4LJT6P2l3PWiyYrz9ru/UDTQjKlY=; b=VP4slwrJEx1pegqG9dKtu2Fu63D8hYKGHlmH7t6lR5Vhm1P0ywwIL51dxAfqWPoCPT LYinOiusR7Pns68QV1e+O/yQk9wFsxQLkSyawh9KTP59gCKFNtbPkE9gjfruFpYQNL85 o0eDXJd5Iys7ywx0kAsxvOzkunWljbbRgdtx2HVujFeYjCnm2Vjf5JnlC4eaqFHDAlta 0nzXcJCNU5VdbnbRdMCkdKEQYBfMIF/pakrDV1vb6K/i5dZBsMSdSNtAeXDcHjvf7iER 3AC365dWhMSe6t/Z2tQBNyFacVKXnCUH7KTXHvuYltogMXlSfthanLGtZaF1hfPkSlMG FVhQ== X-Gm-Message-State: AIVw112stII7RhY/5R5Bt9YQDi0nD7PVMU2e6Is4AnFlbkEg/NPQi35g ej1h104s9/BV4O2C X-Received: by 10.28.166.137 with SMTP id p131mr2859234wme.5.1499444317003; Fri, 07 Jul 2017 09:18:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n2sm5264575wmd.19.2017.07.07.09.18.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jul 2017 09:18:35 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 296843E0157; Fri, 7 Jul 2017 17:18:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 7 Jul 2017 17:18:22 +0100 Message-Id: <20170707161822.29659-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::230 Subject: [Qemu-devel] [RFC PATCH] target/arm: ensure eret exits the run-loop 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: "Emilio G . Cota" , qemu-devel@nongnu.org, qemu-arm@nongnu.org, Joakim Bech , Etienne Carriere , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Previously DISAS_JUMP did ensure this but with the optimisation of 8a6b28c7 (optimize indirect branches) we might not leave the loop. This means if any pending interrupts are cleared by changing IRQ flags we might never get around to servicing them. You usually notice this by seeing the lookup_tb_ptr() helper gainfully chaining TBs together while cpu->interrupt_request remains high and the exit_request has not been set. This breaks amongst other things the OPTEE test suite which executes an eret from the secure world after a non-secure world IRQ has gone pending which then never gets serviced. An alternate approach might be for the exception helpers to ensure the exit request flag is set if an IRQ is now unmasked. Signed-off-by: Alex Bennée CC: Etienne Carriere CC: Joakim Bech CC: Peter Maydell CC: Emilio G. Cota CC: Richard Henderson --- target/arm/translate-a64.c | 3 ++- target/arm/translate.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) -- 2.13.0 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index e55547d95d..3ee88b2590 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1788,7 +1788,8 @@ static void disas_uncond_b_reg(DisasContext *s, uint32_t insn) return; } gen_helper_exception_return(cpu_env); - s->is_jmp = DISAS_JUMP; + /* Must exit loop to check un-masked IRQs */ + s->is_jmp = DISAS_EXIT; return; case 5: /* DRPS */ if (rn != 0x1f) { diff --git a/target/arm/translate.c b/target/arm/translate.c index 0862f9e4aa..920fb41395 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -4475,7 +4475,8 @@ static void gen_rfe(DisasContext *s, TCGv_i32 pc, TCGv_i32 cpsr) */ gen_helper_cpsr_write_eret(cpu_env, cpsr); tcg_temp_free_i32(cpsr); - s->is_jmp = DISAS_JUMP; + /* Must exit loop to check un-masked IRQs */ + s->is_jmp = DISAS_EXIT; } /* Generate an old-style exception return. Marks pc as dead. */ @@ -9519,7 +9520,8 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) tmp = load_cpu_field(spsr); gen_helper_cpsr_write_eret(cpu_env, tmp); tcg_temp_free_i32(tmp); - s->is_jmp = DISAS_JUMP; + /* Must exit loop to check un-masked IRQs */ + s->is_jmp = DISAS_EXIT; } } break;