From patchwork Tue Jun 14 12:07:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 69993 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2011582qgf; Tue, 14 Jun 2016 05:08:55 -0700 (PDT) X-Received: by 10.176.2.138 with SMTP id 10mr8715585uah.5.1465906129718; Tue, 14 Jun 2016 05:08:49 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id n71si5220113vka.190.2016.06.14.05.08.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jun 2016 05:08:49 -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 1bCn7z-00050y-Kr; Tue, 14 Jun 2016 12:07:31 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCn7y-0004wq-5I for xen-devel@lists.xen.org; Tue, 14 Jun 2016 12:07:30 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 5A/14-06230-183FF575; Tue, 14 Jun 2016 12:07:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTbfxc3y 4wY01khZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8brdSuYC+aIVNycspG1gfEsfxcjF4eQwCZG ieX7XjFDOKcZJY5PXgjkcHKwCWhK3Pn8iQnEFhGQlrj2+TIjiM0sECZx+80uMFtYIFri599HY DUsAqoSj5/8YAWxeQVcJCYu/g42R0JATuLksclAcQ4OTgFXibtThEHCQkAlM1tmMU5g5F7AyL CKUb04tagstUjXUC+pKDM9oyQ3MTNH19DATC83tbg4MT01JzGpWC85P3cTI9C7DECwg3Hnc6d DjJIcTEqivLcnxocL8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuBd8gkoJ1iUmp5akZaZAwwzmLQE B4+SCO8jkDRvcUFibnFmOkTqFKOilDjvRpCEAEgiozQPrg0W2pcYZaWEeRmBDhHiKUgtys0sQ ZV/xSjOwagkzPscZApPZl4J3PRXQIuZgBbbTAdbXJKIkJJqYGQQYfCffNTEzXd++MH6/68Dnl dxuusuTa+bUHNl3+/Vi7g3WsVtVJvs5/Bx7d7YUv21N61nyE9Sb/XdO03sXivzfZmzHzn6uxl Z837qfTBbvmWVxPErdT/Pbld4431U9pGq00p7c1MDm5PpswvKJ+55+8ntUV6Ekf38A7u0ZKMW rTG5vuhx01QlluKMREMt5qLiRACpg4g+aAIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1465906047!18338426!2 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40292 invoked from network); 14 Jun 2016 12:07:29 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-3.tower-21.messagelabs.com with SMTP; 14 Jun 2016 12:07:29 -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 2904F406; Tue, 14 Jun 2016 05:08:09 -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 3BD033F246; Tue, 14 Jun 2016 05:07:28 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 14 Jun 2016 13:07:07 +0100 Message-Id: <1465906027-16614-9-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465906027-16614-1-git-send-email-julien.grall@arm.com> References: <1465906027-16614-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org, wei.chen@linaro.org Subject: [Xen-devel] [PATCH 8/8] xen/arm: p2m_cache_flush: Use the correct terminology and typesafe gfn 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" p2m_cache_flush is expecting GFNs in parameter and not MFNs. Rename the variable to *gfn* and use typesafe to avoid possible misusage. Signed-off-by: Julien Grall --- xen/arch/arm/domctl.c | 2 +- xen/arch/arm/p2m.c | 10 +++++----- xen/include/asm-arm/p2m.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 30453d8..b94e97c 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -30,7 +30,7 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, if ( e < s ) return -EINVAL; - return p2m_cache_flush(d, s, e); + return p2m_cache_flush(d, _gfn(s), _gfn(e)); } case XEN_DOMCTL_bind_pt_irq: { diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 135d032..d50eda3 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1467,16 +1467,16 @@ int relinquish_p2m_mapping(struct domain *d) d->arch.p2m.default_access); } -int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn) +int p2m_cache_flush(struct domain *d, gfn_t start_gfn, gfn_t end_gfn) { struct p2m_domain *p2m = &d->arch.p2m; - start_mfn = MAX(start_mfn, p2m->lowest_mapped_gfn); - end_mfn = MIN(end_mfn, p2m->max_mapped_gfn); + start_gfn = max_gfn(start_gfn, _gfn(p2m->lowest_mapped_gfn)); + end_gfn = min_gfn(end_gfn, _gfn(p2m->max_mapped_gfn)); return apply_p2m_changes(d, CACHEFLUSH, - pfn_to_paddr(start_mfn), - pfn_to_paddr(end_mfn), + pfn_to_paddr(gfn_x(start_gfn)), + pfn_to_paddr(gfn_x(end_gfn)), pfn_to_paddr(INVALID_MFN), MATTR_MEM, 0, p2m_invalid, d->arch.p2m.default_access); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index f204482..03a5cce 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -139,7 +139,7 @@ void p2m_dump_info(struct domain *d); mfn_t p2m_lookup(struct domain *d, gfn_t gfn, p2m_type_t *t); /* Clean & invalidate caches corresponding to a region of guest address space */ -int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); +int p2m_cache_flush(struct domain *d, gfn_t start_gfn, gfn_t end_gfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end);