From patchwork Fri Apr 22 15:58:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 66460 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp801357qge; Fri, 22 Apr 2016 09:00:00 -0700 (PDT) X-Received: by 10.55.77.216 with SMTP id a207mr26226774qkb.80.1461340800939; Fri, 22 Apr 2016 09:00:00 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id i5si3917631qgf.83.2016.04.22.09.00.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 09:00:00 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1atdTi-00026a-1c; Fri, 22 Apr 2016 15:58:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1atdTg-000264-9O for xen-devel@lists.xen.org; Fri, 22 Apr 2016 15:58:44 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id DD/FF-03277-33A4A175; Fri, 22 Apr 2016 15:58:43 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRWlGSWpSXmKPExsVysyfVTdfISyr cYNN7a4slHxezODB6HN39mymAMYo1My8pvyKBNWPydcGCKWIVnxZsYWpgfCLYxcjFISSwiVHi aV8rG4RzmlHi1Jleli5GTg42AU2JO58/MYHYIgLSEtc+X2bsYuTgYBbIlzg6UwckLCyQLHHj0 Xd2EJtFQFXi5/E2MJtXwFniz/VHrCC2hICcxMljk8FsTgEXiT3Xm8BGCgHVnP69i3ECI/cCRo ZVjOrFqUVlqUW65npJRZnpGSW5iZk5uoaGJnq5qcXFiempOYlJxXrJ+bmbGIG+ZQCCHYxfljg fYpTkYFIS5f2sKRUuxJeUn1KZkVicEV9UmpNafIhRhoNDSYL3rAdQTrAoNT21Ii0zBxhkMGkJ Dh4lEd65IGne4oLE3OLMdIjUKUZFKXHegyAJAZBERmkeXBsssC8xykoJ8zICHSLEU5BalJtZg ir/ilGcg1FJmDcJZApPZl4J3PRXQIuZgBb/uyAJsrgkESEl1cDI2nXXUZR94pXr+SsnXonXWx Gmwf3/04vr19OXVj5PsZaKvastUdUYM691ru2ZHwwiaeuLp0y/4HBnkb7gBJYDq6Z26doeVdF arPNHi+9pBasQVzLP5hbP791KTkrHnm7c8UgqcXuD532TT3/1SzpE2r64/0/JMXwp1FI9N3u1 NItVtafmRzslluKMREMt5qLiRACjS6b/ZwIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1461340722!36917777!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65009 invoked from network); 22 Apr 2016 15:58:42 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-3.tower-27.messagelabs.com with SMTP; 22 Apr 2016 15:58:42 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6D3193B2; Fri, 22 Apr 2016 08:57:24 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 29FE23F211; Fri, 22 Apr 2016 08:58:41 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 22 Apr 2016 16:58:33 +0100 Message-Id: <1461340713-9587-3-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461340713-9587-1-git-send-email-julien.grall@arm.com> References: <1461340713-9587-1-git-send-email-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, tamas@tklengyel.com Subject: [Xen-devel] [for-4.7 v2 2/2] xen/arm: traps: Correctly interpret the content of the register HPFAR_EL2 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" The register HPFAR_EL2 (resp. HPFAR on arm32) contains the bits [47:12] (resp. [39:12]) of the faulting IPA. Unlike other registers that represent an address, the upper bits of the IPA are stored in the register bits [4:39] (resp. [4:21]). However, Xen assumes that the register contains the faulting IPA correctly offsetted. This will result to get a wrong IPA when the fault is happening during a translation table walk. Note this is only affecting memaccess. Introduce a new helper to get the faulting IPA from HPFAR_EL2 and replace direct read from the register by the helper. Signed-off-by: Julien Grall Reviewed-by: Andre Przywara Reviewed-by: Stefano Stabellini --- Cc: tamas@tklengyel.com This is a bug fix for Xen 4.7 and should also be backported to Xen 4.6. Without this patch, the faulting IPA reported to memaccess may be wrong. Changes in v2: - Add Andre's and Stefano's reviewed-by --- xen/arch/arm/traps.c | 11 +++++++++-- xen/include/asm-arm/processor.h | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 1516abd..5e865cf 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2363,6 +2363,13 @@ done: if (first) unmap_domain_page(first); } +static inline paddr_t get_faulting_ipa(void) +{ + register_t hpfar = READ_SYSREG(HPFAR_EL2); + + return ((paddr_t)(hpfar & HPFAR_MASK) << (12 - 4)); +} + static void do_trap_instr_abort_guest(struct cpu_user_regs *regs, const union hsr hsr) { @@ -2381,7 +2388,7 @@ static void do_trap_instr_abort_guest(struct cpu_user_regs *regs, }; if ( hsr.iabt.s1ptw ) - gpa = READ_SYSREG(HPFAR_EL2); + gpa = get_faulting_ipa(); else { /* @@ -2431,7 +2438,7 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, #endif if ( dabt.s1ptw ) - info.gpa = READ_SYSREG(HPFAR_EL2); + info.gpa = get_faulting_ipa(); else { rc = gva_to_ipa(info.gva, &info.gpa, GV2M_READ); diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 7e6eb66..6789cd0 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -565,6 +565,13 @@ union hsr { #define FSC_LL_MASK (_AC(0x03,U)<<0) +/* HPFAR_EL2: Hypervisor IPA Fault Address Register */ +#ifdef CONFIG_ARM_64 +#define HPFAR_MASK GENMASK(39, 4) +#else +#define HPFAR_MASK GENMASK(31, 4) +#endif + /* Time counter hypervisor control register */ #define CNTHCTL_EL2_EL1PCTEN (1u<<0) /* Kernel/user access to physical counter */ #define CNTHCTL_EL2_EL1PCEN (1u<<1) /* Kernel/user access to CNTP timer regs */