From patchwork Mon Jun 27 16:54:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 70942 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1167633qgy; Mon, 27 Jun 2016 09:56:41 -0700 (PDT) X-Received: by 10.107.134.101 with SMTP id i98mr1923958iod.41.1467046591382; Mon, 27 Jun 2016 09:56:31 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 18si18070088ios.147.2016.06.27.09.56.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2016 09:56:31 -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 1bHZnv-0005c2-18; Mon, 27 Jun 2016 16:54:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bHZnt-0005Zx-3p for xen-devel@lists.xen.org; Mon, 27 Jun 2016 16:54:33 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 70/A5-22255-84A51775; Mon, 27 Jun 2016 16:54:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTdc9qjD c4EWTvsWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmnG+t5+l4IhUxZztH9gaGDeJdDFycQgJbGKU aPz+gQXCOc0ocXLrYeYuRk4ONgFNiTufPzGB2CIC0hLXPl9mBLGZBcIkbr/ZBWYLC8RLrDj0A cxmEVCVaJq/lA3E5hVwlvizch3YHAkBOYmTxyazgticAi4Sey8sBYsLAdUcnPadfQIj9wJGhl WM6sWpRWWpRbrmeklFmekZJbmJmTm6hgamermpxcWJ6ak5iUnFesn5uZsYgf5lAIIdjMcmOx9 ilORgUhLl3fYoN1yILyk/pTIjsTgjvqg0J7X4EKMMB4eSBG9SZGG4kGBRanpqRVpmDjDQYNIS HDxKIrx7IoDSvMUFibnFmekQqVOMilLivEogfQIgiYzSPLg2WHBfYpSVEuZlBDpEiKcgtSg3s wRV/hWjOAejkjDvMZDxPJl5JXDTXwEtZgJazFqdD7K4JBEhJdXAmDZVlG8f18e0VvNzUzrnHD hxv7TJ5jZje/0O2xtXWRMurS3U6Czyj5GU8bUNOJ1lWV54eDKH+24mnYU7mb5x/6ncc37WlUX y/ZYad/lelezgSuZtFjr2Qn2X7WWL6afuTdL83snnsqqpi4H1iaiU32edx8UzzjxZ475svsEN jnSXiSKn6itblFiKMxINtZiLihMBn2f3kWkCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1467046471!10799999!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.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3246 invoked from network); 27 Jun 2016 16:54:31 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-12.tower-206.messagelabs.com with SMTP; 27 Jun 2016 16:54:31 -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 439D13A8; Mon, 27 Jun 2016 09:55:22 -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 161673F246; Mon, 27 Jun 2016 09:54:29 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 27 Jun 2016 17:54:03 +0100 Message-Id: <1467046452-1261-8-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467046452-1261-1-git-send-email-julien.grall@arm.com> References: <1467046452-1261-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org, wei.chen@linaro.org Subject: [Xen-devel] [PATCH v4 07/16] xen/arm: Rework the interface of p2m_cache_flush and use 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. Also, modify the prototype of the function to describe the range using the start and the number of GFNs. This will avoid to wonder whether the end if inclusive or exclusive. Note that the type of the parameters 'start' is changed from xen_pfn_t (aka uint64_t) to gfn_t (aka unsigned long). This means that a truncation will occur for ARM32. It is fine because it will always be encoded on 28 bits maximum (40 bits address). Signed-off-by: Julien Grall --- Changes in v4: - This patch was originally called "xen/arm: p2m_cache_flush: Use the correct terminology and typesafe gfn" - Describe the range using the start and the number of GFNs. Changes in v3: - Add a word in the commit message about the truncation. Changes in v2: - Drop _gfn suffix --- xen/arch/arm/domctl.c | 2 +- xen/arch/arm/p2m.c | 11 ++++++----- xen/include/asm-arm/p2m.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 30453d8..f61f98a 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), domctl->u.cacheflush.nr_pfns); } case XEN_DOMCTL_bind_pt_irq: { diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 65818dd..1a10019 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1469,16 +1469,17 @@ 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, unsigned long nr) { struct p2m_domain *p2m = &d->arch.p2m; + gfn_t end = gfn_add(start, nr); - start_mfn = MAX(start_mfn, p2m->lowest_mapped_gfn); - end_mfn = MIN(end_mfn, p2m->max_mapped_gfn); + start = gfn_max(start, _gfn(p2m->lowest_mapped_gfn)); + end = gfn_min(end, _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)), + pfn_to_paddr(gfn_x(end)), 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..8a96e68 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, unsigned long nr); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end);