From patchwork Wed Jul 20 16:10:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 72452 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp66614qga; Wed, 20 Jul 2016 09:14:30 -0700 (PDT) X-Received: by 10.36.116.131 with SMTP id o125mr4122567itc.7.1469031264079; Wed, 20 Jul 2016 09:14:24 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id k130si17890549itk.113.2016.07.20.09.14.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jul 2016 09:14:24 -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 1bPu5p-0007T1-1A; Wed, 20 Jul 2016 16:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bPu5n-0007S9-N6 for xen-devel@lists.xen.org; Wed, 20 Jul 2016 16:11:27 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 06/BB-20915-EA2AF875; Wed, 20 Jul 2016 16:11:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTXfdov5 wg8NnhSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oyL064zFnRKV6y9Pou5gXGlaBcjF4eQwCZG iTWPPrJAOKcZJW7M/MHYxcjJwSagKXHn8ycmEFtEQFri2ufLjCBFzALtjBLLN/5jAUkIC4RIf F4wmR3EZhFQlXjaeocNxOYVcJFYfWk1WFxCQE7i5LHJrCA2p4CrxPmTP8EWCAHVbHr7jXkCI/ cCRoZVjOrFqUVlqUW6pnpJRZnpGSW5iZk5uoYGxnq5qcXFiempOYlJxXrJ+bmbGIEermdgYNz BePmr0yFGSQ4mJVFeVdHecCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvFIL+8OFBItS01Mr0jJz gKEGk5bg4FES4eUCSfMWFyTmFmemQ6ROMSpKifO6gyQEQBIZpXlwbbDwvsQoKyXMy8jAwCDEU 5BalJtZgir/ilGcg1FJmDcQZApPZl4J3PRXQIuZgBbPEQBbXJKIkJJqYHQ0uyv2UGzZyWkRAt m/dMrVdE88/vRc5oWx3trIN88uzQja6jZDbvmEG2GvAicKTJVYGa1nlu0kuP/SkcdT5nmKl6n N28c86amc13+pFJ3K+K5ANpn3CZfZLx+OYLFpyOBaEeP5wmJzie6urRfv75Q/wtP9MVJDuuHp LuHgooTzAq7fvpn5pCuxFGckGmoxFxUnAgATdVKmagIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1469031085!51570269!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.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49020 invoked from network); 20 Jul 2016 16:11:25 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-3.tower-31.messagelabs.com with SMTP; 20 Jul 2016 16:11:25 -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 ED685433; Wed, 20 Jul 2016 09:12:35 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.218.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4E0363F387; Wed, 20 Jul 2016 09:11:24 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 20 Jul 2016 17:10:44 +0100 Message-Id: <1469031064-23344-3-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469031064-23344-1-git-send-email-julien.grall@arm.com> References: <1469031064-23344-1-git-send-email-julien.grall@arm.com> Cc: proskurin@sec.in.tum.de, Julien Grall , sstabellini@kernel.org, wei.chen@linaro.org, steve.capper@arm.com Subject: [Xen-devel] [PATCH 02/22] xen/arm: p2m: Pass the vCPU in parameter to get_page_from_gva 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 function get_page_from_gva translates a guest virtual address to a machine address. The translation involves the register VTTBR_EL2, TTBR0_EL1, TTBR1_EL1 and SCTLR_EL1. Whilst the first register is per domain (the p2m is common to every vCPUs), the last 3 are per-vCPU. Therefore, the function should take the vCPU in parameter and not the domain. Fixing the actual code path will be done a separate patch. Signed-off-by: Julien Grall --- xen/arch/arm/guestcopy.c | 6 +++--- xen/arch/arm/p2m.c | 3 ++- xen/arch/arm/traps.c | 2 +- xen/include/asm-arm/mm.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index ce1c3c3..413125f 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -17,7 +17,7 @@ static unsigned long raw_copy_to_guest_helper(void *to, const void *from, unsigned size = min(len, (unsigned)PAGE_SIZE - offset); struct page_info *page; - page = get_page_from_gva(current->domain, (vaddr_t) to, GV2M_WRITE); + page = get_page_from_gva(current, (vaddr_t) to, GV2M_WRITE); if ( page == NULL ) return len; @@ -64,7 +64,7 @@ unsigned long raw_clear_guest(void *to, unsigned len) unsigned size = min(len, (unsigned)PAGE_SIZE - offset); struct page_info *page; - page = get_page_from_gva(current->domain, (vaddr_t) to, GV2M_WRITE); + page = get_page_from_gva(current, (vaddr_t) to, GV2M_WRITE); if ( page == NULL ) return len; @@ -96,7 +96,7 @@ unsigned long raw_copy_from_guest(void *to, const void __user *from, unsigned le unsigned size = min(len, (unsigned)(PAGE_SIZE - offset)); struct page_info *page; - page = get_page_from_gva(current->domain, (vaddr_t) from, GV2M_READ); + page = get_page_from_gva(current, (vaddr_t) from, GV2M_READ); if ( page == NULL ) return len; diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index a4bc55a..1111d6f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1521,9 +1521,10 @@ err: return page; } -struct page_info *get_page_from_gva(struct domain *d, vaddr_t va, +struct page_info *get_page_from_gva(struct vcpu *v, vaddr_t va, unsigned long flags) { + struct domain *d = v->domain; struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page = NULL; paddr_t maddr = 0; diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index a2eb1da..06a8ee5 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -955,7 +955,7 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) return; } - page = get_page_from_gva(v->domain, sp, GV2M_READ); + page = get_page_from_gva(v, sp, GV2M_READ); if ( page == NULL ) { printk("Failed to convert stack to physical address\n"); diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 68cf203..19eadd2 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -281,7 +281,7 @@ static inline void *page_to_virt(const struct page_info *pg) return mfn_to_virt(page_to_mfn(pg)); } -struct page_info *get_page_from_gva(struct domain *d, vaddr_t va, +struct page_info *get_page_from_gva(struct vcpu *v, vaddr_t va, unsigned long flags); /*