From patchwork Tue Jul 12 13:59:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 71841 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp492885qga; Tue, 12 Jul 2016 07:03:38 -0700 (PDT) X-Received: by 10.36.86.134 with SMTP id o128mr3238212itb.5.1468332212158; Tue, 12 Jul 2016 07:03:32 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 20si599779ios.3.2016.07.12.07.03.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 07:03:32 -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 1bMyEB-000796-EN; Tue, 12 Jul 2016 13:59:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMyEA-00077m-LQ for xen-devel@lists.xen.org; Tue, 12 Jul 2016 13:59:58 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id EB/C6-12215-ED7F4875; Tue, 12 Jul 2016 13:59:58 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTffu95Z wgxlnVC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ow/21uYC7ZJV3yevZGpgbFHtIuRi0NIYBOj xIdFO1ghnNOMEof6rwI5nBxsApoSdz5/YgKxRQSkJa59vswIYjMLOEi8+XiPBcQWFoiXmHVtN lgNi4CqROee5WC9vAIuEieapoPFJQTkJE4emwwW5xRwlfg6/STYHCGgmgvLvrJOYORewMiwil G9OLWoLLVI11wvqSgzPaMkNzEzR9fQwFQvN7W4ODE9NScxqVgvOT93EyPQvwxAsIPx2GTnQ4y SHExKorzNzC3hQnxJ+SmVGYnFGfFFpTmpxYcYZTg4lCR4w78B5QSLUtNTK9Iyc4CBBpOW4OBR EuE1AknzFhck5hZnpkOkTjEqSonzioEkBEASGaV5cG2w4L7EKCslzMsIdIgQT0FqUW5mCar8K 0ZxDkYlYd5mkCk8mXklcNNfAS1mAlpc69AMsrgkESEl1cBo43A703DBi/LP90vcikVKDUTiXl mUtDZ673t86318iPWM7fUpHzrm1901d7k41dz641/3r2fUz8Usu71Ccsa2lJZioyBT31wBJZ4 rW1emar3bdbr1XGiozMrgCuXMJ0u/zbbO6vI88+0l//3EghN8fcYPDi2qm/bPeHfbtdgZCbNE f027PHmeEktxRqKhFnNRcSIAT36X92kCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1468331995!49521094!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.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6538 invoked from network); 12 Jul 2016 13:59:57 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-206.messagelabs.com with SMTP; 12 Jul 2016 13:59:57 -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 E56C7BA8; Tue, 12 Jul 2016 07:01:00 -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 6A5523F213; Tue, 12 Jul 2016 06:59:56 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Jul 2016 14:59:27 +0100 Message-Id: <1468331975-27331-7-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468331975-27331-1-git-send-email-julien.grall@arm.com> References: <1468331975-27331-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v7 06/14] 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 Acked-by: Stefano Stabellini --- Changes in v6: - Add Stefano's acked-by 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 54a363a..1cfb62b 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(mfn_x(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);