From patchwork Fri Jun 30 15:54:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 106725 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2507426qge; Fri, 30 Jun 2017 08:57:01 -0700 (PDT) X-Received: by 10.36.6.200 with SMTP id 191mr7987280itv.44.1498838221564; Fri, 30 Jun 2017 08:57:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498838221; cv=none; d=google.com; s=arc-20160816; b=00dzC/0M03K2iEYzjXMrsZJgOvl7brhMO/jzJkd+D24FJouo3ff4jU98RmVM4duBBn 2bFNkfygisUL7GpjJ+Co72CZ1xCvJggQo1Q2e9Gw5Y+ICqFIWcESZdhwzKJHRSjoMtir 00UehFfmLLD2a7Gro5F7Bye7ajK2j0hUi+xg0cjwBHNiguXL8uHkgn5mFoLJOxfd3ilt Ct7UXTVOx3ngfkfGij3jD2sb4Tef6O5rMwDEJTr8+WImZIVGzw9vwY6ISLtTyYPL6N7L OOCpgtx4FyJc0ZunM9dtbYBVtJm7qaV6Py3W3eHRjNHUbWOqskaGTVTTn2GZaLQAwfUH TMlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=LPTV946BD/9EzrXAldb41f0EAAgxhNGSbXTfQqNg9iQ=; b=jr3MsXCULqifhdnUIQdD085DXtcDM+ALi6uOy1WbAvVBGrDNAcKTMaIRHVSNBnXhv/ +jiyfmCz+BTo/gyfDX2T7u06O77wyevzteW7sBmI/4jl1NrtLQvaNQj0Flruhai7H3Ev W0PP0mHQ57ToK+uhRb/Bro0KQuoCAdPsguD0mZ45QUHRnqYHh8OTsoNcozZuw7J6IjP6 2Cs96vglZ13Ir7p4bCCKnKc+rDVSPzlIxeyL7Z+6DZ1ziJNTXb9bSAtfQgqWcUCtRdJq gTqU6I7mxicl63JyP+jNonC6k0NOTZYKqF5Bkv2tZ2G/jtz7QOOtqDQ2uFnTq+aWt6YT EN4w== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id j21si11240920iti.82.2017.06.30.08.57.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 08:57:01 -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 1dQyFn-0000PQ-G9; Fri, 30 Jun 2017 15:54:43 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQyFm-0000NT-6s for xen-devel@lists.xen.org; Fri, 30 Jun 2017 15:54:42 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 62/8A-03044-14476595; Fri, 30 Jun 2017 15:54:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTdexJCz S4OgyFoslHxezODB6HN39mymAMYo1My8pvyKBNWNC9wbWgn6Fin3PzrI1MB6R7GLk5BAS2Mwo sXuDRhcjF5B9mlFi3fspjCAJNgFNiTufPzGB2CIC0hLXPl8GizMLOEi8+XiPBcQWFvCX2HJ2J juIzSKgKrF37QSwel4BS4k572+D2RIC8hK72i6ygticAlYSx/89YIJYbCnxetZVlgmM3AsYGV YxahSnFpWlFukamuklFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFesl5+duYgT6lwEIdjDe3xh wiFGSg0lJlHfltdBIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8isVhkUKCRanpqRVpmTnAQINJ S3DwKInwygYBpXmLCxJzizPTIVKnGHU5Xk34/41JiCUvPy9VSpw3BGSGAEhRRmke3AhY0F9il JUS5mUEOkqIpyC1KDezBFX+FaM4B6OSMC8byBSezLwSuE2vgI5gAjpCeEYIyBEliQgpqQbG5p m5K5SNk+bfMvsSFB1RsnHmq49nzbMD7pqF6G+LvhYgPen/HP91ur+1Z12yshB4qnR7rQ7T92V L3+YZ7TFIYp507LPMDnu7s6xmvV89Fu3QTt/wpXKCTUFN1KlXq3lNT1WHBhnEx75sOOn6OK8j VUNb5vq/ihk8kzSWOkyNbV7Y6NFRclJBiaU4I9FQi7moOBEAkks3+XUCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1498838079!48087897!2 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57711 invoked from network); 30 Jun 2017 15:54:40 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-6.tower-21.messagelabs.com with SMTP; 30 Jun 2017 15:54:40 -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 87C5515AD; Fri, 30 Jun 2017 08:54:40 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E66993F41F; Fri, 30 Jun 2017 08:54:39 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 30 Jun 2017 16:54:19 +0100 Message-Id: <20170630155431.23824-5-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170630155431.23824-1-julien.grall@arm.com> References: <20170630155431.23824-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 04/16] xen/arm: mm: Redefine virt_to_mfn to support typesafe 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 file xen/arch/arm/mm.c is using the typesafe MFN in most of the place. This requires all caller of virt_to_mfn to prefixed by _mfn(...). To avoid the extra _mfn(...), re-defined virt_to_mfn within arch/arm/mm.c to handle typesafe MFN. This patch also introduce __virt_to_mfn, so virt_to_mfn can be re-defined easily. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v2: - Use __virt_to_mfn rather than mfn_x(virt_to_mfn()). Changes in v3: - Add Stefano's reviewed-by --- xen/arch/arm/mm.c | 16 ++++++++++------ xen/include/asm-arm/mm.h | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index d3674e732e..1e9e342fd3 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -44,6 +44,10 @@ struct domain *dom_xen, *dom_io, *dom_cow; +/* Override macros from asm/page.h to make them work with mfn_t */ +#undef virt_to_mfn +#define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) + /* Static start-of-day pagetables that we use before the allocators * are up. These are used by all CPUs during bringup before switching * to the CPUs own pagetables. @@ -479,7 +483,7 @@ unsigned long domain_page_map_to_mfn(const void *ptr) unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) - return virt_to_mfn(va); + return __virt_to_mfn(va); ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); ASSERT(map[slot].pt.avail != 0); @@ -764,7 +768,7 @@ int init_secondary_pagetables(int cpu) * domheap mapping pages. */ for ( i = 0; i < DOMHEAP_SECOND_PAGES; i++ ) { - pte = mfn_to_xen_entry(_mfn(virt_to_mfn(domheap+i*LPAE_ENTRIES)), + pte = mfn_to_xen_entry(virt_to_mfn(domheap+i*LPAE_ENTRIES), WRITEALLOC); pte.pt.table = 1; write_pte(&first[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)], pte); @@ -961,7 +965,7 @@ static int create_xen_table(lpae_t *entry) if ( p == NULL ) return -ENOMEM; clear_page(p); - pte = mfn_to_xen_entry(_mfn(virt_to_mfn(p)), WRITEALLOC); + pte = mfn_to_xen_entry(virt_to_mfn(p), WRITEALLOC); pte.pt.table = 1; write_pte(entry, pte); return 0; @@ -1215,7 +1219,7 @@ int xenmem_add_to_physmap_one( unsigned long idx, gfn_t gfn) { - unsigned long mfn = 0; + mfn_t mfn = INVALID_MFN; int rc; p2m_type_t t; struct page_info *page = NULL; @@ -1301,7 +1305,7 @@ int xenmem_add_to_physmap_one( return -EINVAL; } - mfn = page_to_mfn(page); + mfn = _mfn(page_to_mfn(page)); t = p2m_map_foreign; rcu_unlock_domain(od); @@ -1320,7 +1324,7 @@ int xenmem_add_to_physmap_one( } /* Map at new location. */ - rc = guest_physmap_add_entry(d, gfn, _mfn(mfn), 0, t); + rc = guest_physmap_add_entry(d, gfn, mfn, 0, t); /* If we fail to add the mapping, we need to drop the reference we * took earlier on foreign pages */ diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 7a35063546..ef84b72474 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -256,7 +256,7 @@ static inline int gvirt_to_maddr(vaddr_t va, paddr_t *pa, unsigned int flags) #define __va(x) (maddr_to_virt(x)) /* Convert between Xen-heap virtual addresses and machine frame numbers. */ -#define virt_to_mfn(va) (virt_to_maddr(va) >> PAGE_SHIFT) +#define __virt_to_mfn(va) (virt_to_maddr(va) >> PAGE_SHIFT) #define mfn_to_virt(mfn) (maddr_to_virt((paddr_t)(mfn) << PAGE_SHIFT)) /* @@ -266,6 +266,7 @@ static inline int gvirt_to_maddr(vaddr_t va, paddr_t *pa, unsigned int flags) */ #define mfn_to_page(mfn) __mfn_to_page(mfn) #define page_to_mfn(pg) __page_to_mfn(pg) +#define virt_to_mfn(va) __virt_to_mfn(va) /* Convert between Xen-heap virtual addresses and page-info structures. */ static inline struct page_info *virt_to_page(const void *v)