From patchwork Sat Mar 28 14:02:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 11463563 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DC20159A for ; Sat, 28 Mar 2020 14:03:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BAB8120723 for ; Sat, 28 Mar 2020 14:03:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B6GaNvBZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BAB8120723 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:53412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIC3g-0000VW-HU for patchwork-qemu-devel@patchwork.kernel.org; Sat, 28 Mar 2020 10:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59970) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIC3A-0008Vl-6l for qemu-devel@nongnu.org; Sat, 28 Mar 2020 10:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIC39-0002Ai-6R for qemu-devel@nongnu.org; Sat, 28 Mar 2020 10:03:00 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:39975) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIC37-0002A2-4e; Sat, 28 Mar 2020 10:02:57 -0400 Received: by mail-pl1-x642.google.com with SMTP id h11so4616221plk.7; Sat, 28 Mar 2020 07:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J4NbX63enxz8LHoh8wHu1+3eT2IUoLyMTy2RULZE4I4=; b=B6GaNvBZNP7kQEbX3iGRK2z8wcsPa7xthpN3NwQBPk1qjZZa8im7DxofvOsMhU8GB6 g4K4rFncw3jCY4ZkmtpRysftgdTgG/InPMPis49J5f+bW5p8fIegEYAf+8k2GUVaSW8X XCMty4w5D25gfH48ZsR2UxDbmp5Yfn+5+bSbp3XFQkNAcSa/LCY54ZwF/VyqPnaEXkf8 u4KD5TjPigvJQazQe4sAEe7M82bgI00hrXdgxsbJETGnBnF5kKjsVSrqdAeX5k3IBM90 UTQo246Ae/GP45/IK9ralxq8c2Gks4p0bR/IeVBo9TlLuLycy5EM6UCX6TxkSJmLOvw9 uYMA== 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=J4NbX63enxz8LHoh8wHu1+3eT2IUoLyMTy2RULZE4I4=; b=B8/VAvVgP5Re1Nk3G6ni2i2Job5nMK3K5JNJ5mKKcnIc4X91qSfBnoiWMVslz/V8MU Jp3ChwIlmHUqPdXcrTD23v9yaMRCyCKGWcZc3MH0Vz+fT+r5nVYrLPpEStWZJPCQMEz8 xTwaNSkq+GwzxSRBqxuOg5VdljwQbSNuWZbXM5aTBtXD7fPBDVUW9pe14QZFXDo9uUFT MPklISkp2xgA0BpTI/amoM4NB0oOdryThkDGtDPVFJPsuGXJLke0B9IIr4RaUqSbgz4V MhaYe/5tATFf67z//3e6BgF8tLixkGn40EEdeF9yRoVhAvn4/84CicmL4UCn+fol+22X CKAA== X-Gm-Message-State: ANhLgQ2Sl2tBbS3gVCuTHoMAaMudwx761DaGP9xnWSYomUCZfpUDfkbp LoXEPUBydteqTiT0lt7VZNo= X-Google-Smtp-Source: ADFU+vsRocEIbI/qmFasnDKf8b1PDjp3UZcUCP6FDY07LLHKvsF9uArlPBxeQLJLOPXy9axo2ciDgA== X-Received: by 2002:a17:90b:24f:: with SMTP id fz15mr5085224pjb.138.1585404174316; Sat, 28 Mar 2020 07:02:54 -0700 (PDT) Received: from vultr.guest ([149.248.10.52]) by smtp.gmail.com with ESMTPSA id i14sm5978258pgh.47.2020.03.28.07.02.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2020 07:02:53 -0700 (PDT) From: Changbin Du To: Peter Maydell Subject: [PATCH] target/arm: fix incorrect current EL bug in aarch32 exception emulation Date: Sat, 28 Mar 2020 22:02:32 +0800 Message-Id: <20200328140232.17278-1-changbin.du@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Changbin Du Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The arm_current_el() should be invoked after mode switching. Otherwise, we get a wrong current EL value, since current EL is also determined by current mode. Fixes: 4a2696c0d4 ("target/arm: Set PAN bit as required on exception entry") Signed-off-by: Changbin Du Reviewed-by: Richard Henderson --- target/arm/helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index b7b6887241..163c91a1cc 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9172,7 +9172,6 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode, /* Change the CPU state so as to actually take the exception. */ switch_mode(env, new_mode); - new_el = arm_current_el(env); /* * For exceptions taken to AArch32 we must clear the SS bit in both @@ -9184,6 +9183,10 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode, env->condexec_bits = 0; /* Switch to the new mode, and to the correct instruction set. */ env->uncached_cpsr = (env->uncached_cpsr & ~CPSR_M) | new_mode; + + /* This must be after mode switching. */ + new_el = arm_current_el(env); + /* Set new mode endianness */ env->uncached_cpsr &= ~CPSR_E; if (env->cp15.sctlr_el[new_el] & SCTLR_EE) {