From patchwork Tue Jun 28 16:17:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 71116 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1681810qgy; Tue, 28 Jun 2016 09:20:00 -0700 (PDT) X-Received: by 10.36.155.198 with SMTP id o189mr16014088itd.54.1467130793916; Tue, 28 Jun 2016 09:19:53 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id q130si15146783itb.12.2016.06.28.09.19.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 09:19:53 -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 1bHvi2-0007NZ-KA; Tue, 28 Jun 2016 16:17:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bHvi1-0007Co-5y for xen-devel@lists.xen.org; Tue, 28 Jun 2016 16:17:57 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C2/66-03780-433A2775; Tue, 28 Jun 2016 16:17:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTddkcVG 4wdfZIhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8a147cYCx7JVtzru8bYwDhNrIuRi0NIYBOj xONPv9kgnNOMEv9nr2HvYuTkYBPQlLjz+RMTiC0iIC1x7fNlRhCbWcBB4s3HeyxdjBwcwgIhE j8eiYGEWQRUJe7tPMwMYvMKuEq82H+PDcSWEJCTOHlsMiuIzQkU3zLlJ1hcSMBF4sKJGywTGL kXMDKsYtQoTi0qSy3SNTTXSyrKTM8oyU3MzNE1NDDWy00tLk5MT81JTCrWS87P3cQI9C8DEOx gfHna8xCjJAeTkijvt96icCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvLKLgHKCRanpqRVpmTnA QINJS3DwKInwuoKkeYsLEnOLM9MhUqcYFaXEeXcvBEoIgCQySvPg2mDBfYlRVkqYlxHoECGeg tSi3MwSVPlXjOIcjErCvH4g43ky80rgpr8CWswEtJi1Oh9kcUkiQkqqgfH8wj1Hr/HfOjcvbq baw8lNF08/mrDlmkHIT6f3vYJxd+R79TXL3Gs5J73PyXXdEVi8PnZqruOTGe9KQzf/vJ6rdO+ 7Ba/6qztTmqbJcIXteT7L3FU059bN1+WJtksC76bN0PvCoPcuZM5y44T3Dvwi0+zNmr8qS3ya WXhiowHznPIjPbXfQtSUWIozEg21mIuKEwGuHC61aQIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1467130669!47102581!6 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 55551 invoked from network); 28 Jun 2016 16:17:56 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-10.tower-31.messagelabs.com with SMTP; 28 Jun 2016 16:17:56 -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 EFA9EB9D; Tue, 28 Jun 2016 09:18:47 -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 1A1503F21A; Tue, 28 Jun 2016 09:17:54 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 28 Jun 2016 17:17:22 +0100 Message-Id: <1467130643-23868-17-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467130643-23868-1-git-send-email-julien.grall@arm.com> References: <1467130643-23868-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v5 16/17] xen/arm: p2m: Use typesafe gfn for {max, lowest}_mapped_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" Signed-off-by: Julien Grall --- Changes in v4: - Patch added --- xen/arch/arm/mm.c | 2 +- xen/arch/arm/p2m.c | 18 +++++++++--------- xen/include/asm-arm/p2m.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b5fc034..4e256c2 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1004,7 +1004,7 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) unsigned long domain_get_maximum_gpfn(struct domain *d) { - return d->arch.p2m.max_mapped_gfn; + return gfn_x(d->arch.p2m.max_mapped_gfn); } void share_xen_page_with_guest(struct page_info *page, diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index a5b584b..9fdc417 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -976,7 +976,7 @@ static int apply_p2m_changes(struct domain *d, * This is set in preempt_count_limit. * */ - p2m->lowest_mapped_gfn = addr >> PAGE_SHIFT; + p2m->lowest_mapped_gfn = _gfn(addr >> PAGE_SHIFT); rc = -ERESTART; goto out; @@ -1117,8 +1117,8 @@ static int apply_p2m_changes(struct domain *d, if ( op == INSERT ) { - p2m->max_mapped_gfn = max(p2m->max_mapped_gfn, egfn); - p2m->lowest_mapped_gfn = min(p2m->lowest_mapped_gfn, sgfn); + p2m->max_mapped_gfn = gfn_max(p2m->max_mapped_gfn, _gfn(egfn)); + p2m->lowest_mapped_gfn = gfn_min(p2m->lowest_mapped_gfn, _gfn(sgfn)); } rc = 0; @@ -1383,8 +1383,8 @@ int p2m_init(struct domain *d) p2m->root = NULL; - p2m->max_mapped_gfn = 0; - p2m->lowest_mapped_gfn = ULONG_MAX; + p2m->max_mapped_gfn = _gfn(0); + p2m->lowest_mapped_gfn = _gfn(ULONG_MAX); p2m->default_access = p2m_access_rwx; p2m->mem_access_enabled = false; @@ -1401,8 +1401,8 @@ int relinquish_p2m_mapping(struct domain *d) struct p2m_domain *p2m = &d->arch.p2m; return apply_p2m_changes(d, RELINQUISH, - pfn_to_paddr(p2m->lowest_mapped_gfn), - pfn_to_paddr(p2m->max_mapped_gfn), + pfn_to_paddr(gfn_x(p2m->lowest_mapped_gfn)), + pfn_to_paddr(gfn_x(p2m->max_mapped_gfn)), pfn_to_paddr(mfn_x(INVALID_MFN)), MATTR_MEM, 0, p2m_invalid, d->arch.p2m.default_access); @@ -1413,8 +1413,8 @@ int p2m_cache_flush(struct domain *d, gfn_t start, unsigned long nr) struct p2m_domain *p2m = &d->arch.p2m; gfn_t end = gfn_add(start, nr); - start = gfn_max(start, _gfn(p2m->lowest_mapped_gfn)); - end = gfn_min(end, _gfn(p2m->max_mapped_gfn)); + start = gfn_max(start, p2m->lowest_mapped_gfn); + end = gfn_min(end, p2m->max_mapped_gfn); return apply_p2m_changes(d, CACHEFLUSH, pfn_to_paddr(gfn_x(start)), diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 6e258b9..34096bc 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -34,13 +34,13 @@ struct p2m_domain { /* Highest guest frame that's ever been mapped in the p2m * Only takes into account ram and foreign mapping */ - unsigned long max_mapped_gfn; + gfn_t max_mapped_gfn; /* Lowest mapped gfn in the p2m. When releasing mapped gfn's in a * preemptible manner this is update to track recall where to * resume the search. Apart from during teardown this can only * decrease. */ - unsigned long lowest_mapped_gfn; + gfn_t lowest_mapped_gfn; /* Gather some statistics for information purposes only */ struct {