From patchwork Tue Sep 12 10:03:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9948909 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9CB6B603F4 for ; Tue, 12 Sep 2017 10:07:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C43D28DCF for ; Tue, 12 Sep 2017 10:07:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8132D28DD3; Tue, 12 Sep 2017 10:07:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1608228EC7 for ; Tue, 12 Sep 2017 10:07:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dri2i-0002oQ-Uh; Tue, 12 Sep 2017 10:03:44 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dri2h-0002nm-SW for xen-devel@lists.xen.org; Tue, 12 Sep 2017 10:03:43 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 17/68-03422-FF0B7B95; Tue, 12 Sep 2017 10:03:43 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRWlGSWpSXmKPExsVysyfVTfffhu2 RBjsPyFks+biYxYHR4+ju30wBjFGsmXlJ+RUJrBnfvy1kKZjqVnHufBdzA+Naiy5GLg4hgc2M Eqf+HGKEcE4zStxdd4Cpi5GTg01AU+LO509gtoiAtMS1z5fBipgFXjNJfN66jRkkISzgJzFh9 28WEJtFQFXi5cFpYDavgIXEtmcvwWwJAXmJXW0XWUFsTgFLiRUff7GB2EJANd9f/mCcwMi9gJ FhFaN6cWpRWWqRrqVeUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7uJkaghxmAYAfj3U0 BhxglOZiURHmPrN8eKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCdxpITrAoNT21Ii0zBxhqMGkJ Dh4lEd7ZIGne4oLE3OLMdIjUKUZjjmObLv9h4ui4efcPkxBLXn5eqpQ47xuQUgGQ0ozSPLhBs Bi4xCgrJczLCHSaEE9BalFuZgmq/CtGcQ5GJWHe+SBTeDLzSuD2vQI6hQnoFJ5LW0BOKUlESE k1MIpvLfhge1ZtkfM9OdXnmbM6jNg+/rx94Mza06LRL2yMjooezOuVyPTuOtp0yqRHxsyFbf0 mqTm1rqKW6Yz83D8Wnp4x2cq4OXf73HYFA9WUYKcFla+c+A6d7lv3tHNbcMSTK6y6bm4eyuKz +bVyGVRTD4sKnllc8ZjXUJv78oem0G3H/7+bo8RSnJFoqMVcVJwIAKy0SB98AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1505210621!93115805!1 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.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20827 invoked from network); 12 Sep 2017 10:03:42 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-10.tower-27.messagelabs.com with SMTP; 12 Sep 2017 10:03:42 -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 89CDF1529; Tue, 12 Sep 2017 03:03:41 -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 699093F578; Tue, 12 Sep 2017 03:03:39 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Sep 2017 11:03:08 +0100 Message-Id: <20170912100330.2168-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912100330.2168-1-julien.grall@arm.com> References: <20170912100330.2168-1-julien.grall@arm.com> Cc: sstabellini@kernel.org, Wei Liu , George Dunlap , andre.przywara@arm.com, Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v2 02/24] xen/mm: Use typesafe MFN for alloc_boot_pages return 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" X-Virus-Scanned: ClamAV using ClamSMTP At the moment, most of the callers will have to use mfn_x. However follow-up patches will remove some of them by propagating the typesafe a bit further. Signed-off-by: Julien Grall Acked-by: Jan Beulich Reviewed-by: Wei Liu Acked-by: George Dunlap Reviewed-by: Stefano Stabellini --- Changes in v2: - Push down a bit some mfn_t to convert some unsigned long local variables to mfn_t. Cc: Stefano Stabellini Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Tim Deegan Cc: Wei Liu --- xen/arch/arm/mm.c | 26 ++++++++++++++------------ xen/arch/arm/setup.c | 4 ++-- xen/arch/x86/mm.c | 7 ++++--- xen/arch/x86/numa.c | 2 +- xen/arch/x86/srat.c | 5 +++-- xen/common/page_alloc.c | 7 +++---- xen/drivers/acpi/osl.c | 2 +- xen/include/xen/mm.h | 3 +-- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b39677eac9..965d0573a4 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -864,13 +864,13 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, } else { - unsigned long first_mfn = alloc_boot_pages(1, 1); + mfn_t first_mfn = alloc_boot_pages(1, 1); - clear_page(mfn_to_virt(first_mfn)); - pte = mfn_to_xen_entry(_mfn(first_mfn), WRITEALLOC); + clear_page(mfn_to_virt(mfn_x(first_mfn))); + pte = mfn_to_xen_entry(first_mfn, WRITEALLOC); pte.pt.table = 1; write_pte(p, pte); - first = mfn_to_virt(first_mfn); + first = mfn_to_virt(mfn_x(first_mfn)); } pte = mfn_to_xen_entry(_mfn(mfn), WRITEALLOC); @@ -891,11 +891,12 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) unsigned long nr_pages = (pe - ps) >> PAGE_SHIFT; unsigned long nr_pdxs = pfn_to_pdx(nr_pages); unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); - unsigned long base_mfn; + mfn_t base_mfn; const unsigned long mapping_size = frametable_size < MB(32) ? MB(2) : MB(32); #ifdef CONFIG_ARM_64 lpae_t *second, pte; - unsigned long nr_second, second_base; + unsigned long nr_second; + mfn_t second_base; int i; #endif @@ -908,18 +909,19 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) /* Compute the number of second level pages. */ nr_second = ROUNDUP(frametable_size, FIRST_SIZE) >> FIRST_SHIFT; second_base = alloc_boot_pages(nr_second, 1); - second = mfn_to_virt(second_base); + second = mfn_to_virt(mfn_x(second_base)); for ( i = 0; i < nr_second; i++ ) { - clear_page(mfn_to_virt(second_base + i)); - pte = mfn_to_xen_entry(_mfn(second_base + i), WRITEALLOC); + clear_page(mfn_to_virt(mfn_x(mfn_add(second_base, i)))); + pte = mfn_to_xen_entry(mfn_add(second_base, i), WRITEALLOC); pte.pt.table = 1; write_pte(&xen_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); } - create_mappings(second, 0, base_mfn, frametable_size >> PAGE_SHIFT, mapping_size); + create_mappings(second, 0, mfn_x(base_mfn), frametable_size >> PAGE_SHIFT, + mapping_size); #else - create_mappings(xen_second, FRAMETABLE_VIRT_START, - base_mfn, frametable_size >> PAGE_SHIFT, mapping_size); + create_mappings(xen_second, FRAMETABLE_VIRT_START, mfn_x(base_mfn), + frametable_size >> PAGE_SHIFT, mapping_size); #endif memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_info)); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 92f173be0c..b00eebd96e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -561,7 +561,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) init_boot_pages(pfn_to_paddr(boot_mfn_start), pfn_to_paddr(boot_mfn_end)); /* Copy the DTB. */ - fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); + fdt = mfn_to_virt(mfn_x(alloc_boot_pages(dtb_pages, 1))); copy_from_paddr(fdt, dtb_paddr, dtb_size); device_tree_flattened = fdt; @@ -671,7 +671,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) dtb_pages = (dtb_size + PAGE_SIZE-1) >> PAGE_SHIFT; /* Copy the DTB. */ - fdt = mfn_to_virt(alloc_boot_pages(dtb_pages, 1)); + fdt = mfn_to_virt(mfn_x(alloc_boot_pages(dtb_pages, 1))); copy_from_paddr(fdt, dtb_paddr, dtb_size); device_tree_flattened = fdt; diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e5a029c9be..850e4721cd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -200,7 +200,8 @@ static void __init init_frametable_chunk(void *start, void *end) { unsigned long s = (unsigned long)start; unsigned long e = (unsigned long)end; - unsigned long step, mfn; + unsigned long step; + mfn_t mfn; ASSERT(!(s & ((1 << L2_PAGETABLE_SHIFT) - 1))); for ( ; s < e; s += step << PAGE_SHIFT ) @@ -216,7 +217,7 @@ static void __init init_frametable_chunk(void *start, void *end) while ( step && s + (step << PAGE_SHIFT) > e + (4 << PAGE_SHIFT) ) step >>= PAGETABLE_ORDER; mfn = alloc_boot_pages(step, step); - map_pages_to_xen(s, mfn, step, PAGE_HYPERVISOR); + map_pages_to_xen(s, mfn_x(mfn), step, PAGE_HYPERVISOR); } memset(start, 0, end - start); @@ -5328,7 +5329,7 @@ void *alloc_xen_pagetable(void) return ptr; } - return mfn_to_virt(alloc_boot_pages(1, 1)); + return mfn_to_virt(mfn_x(alloc_boot_pages(1, 1))); } void free_xen_pagetable(void *v) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 32914bce27..4fc967f893 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -99,7 +99,7 @@ static int __init populate_memnodemap(const struct node *nodes, static int __init allocate_cachealigned_memnodemap(void) { unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap)); - unsigned long mfn = alloc_boot_pages(size, 1); + unsigned long mfn = mfn_x(alloc_boot_pages(size, 1)); memnodemap = mfn_to_virt(mfn); mfn <<= PAGE_SHIFT; diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 95660a9bbc..528ec7181a 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -187,14 +187,15 @@ static __init int slit_valid(struct acpi_table_slit *slit) /* Callback for SLIT parsing */ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) { - unsigned long mfn; + mfn_t mfn; + if (!slit_valid(slit)) { printk(KERN_INFO "ACPI: SLIT table looks invalid. " "Not used.\n"); return; } mfn = alloc_boot_pages(PFN_UP(slit->header.length), 1); - acpi_slit = mfn_to_virt(mfn); + acpi_slit = mfn_to_virt(mfn_x(mfn)); memcpy(acpi_slit, slit, slit->header.length); } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b5243fca3c..86bd298b44 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -325,8 +325,7 @@ void __init init_boot_pages(paddr_t ps, paddr_t pe) } } -unsigned long __init alloc_boot_pages( - unsigned long nr_pfns, unsigned long pfn_align) +mfn_t __init alloc_boot_pages(unsigned long nr_pfns, unsigned long pfn_align) { unsigned long pg, _e; unsigned int i = nr_bootmem_regions; @@ -355,14 +354,14 @@ unsigned long __init alloc_boot_pages( if ( pg + nr_pfns > PFN_DOWN(highmem_start) ) continue; r->s = pg + nr_pfns; - return pg; + return _mfn(pg); } #endif _e = r->e; r->e = pg; bootmem_region_add(pg + nr_pfns, _e); - return pg; + return _mfn(pg); } BUG(); diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index 9881db19da..52c9b4ba9a 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -214,7 +214,7 @@ void *__init acpi_os_alloc_memory(size_t sz) void *ptr; if (system_state == SYS_STATE_early_boot) - return mfn_to_virt(alloc_boot_pages(PFN_UP(sz), 1)); + return mfn_to_virt(mfn_x(alloc_boot_pages(PFN_UP(sz), 1))); ptr = xmalloc_bytes(sz); ASSERT(!ptr || is_xmalloc_memory(ptr)); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index c2f5a089ec..f8b6177c32 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -151,8 +151,7 @@ struct domain *__must_check page_get_owner_and_reference(struct page_info *); /* Boot-time allocator. Turns into generic allocator after bootstrap. */ void init_boot_pages(paddr_t ps, paddr_t pe); -unsigned long alloc_boot_pages( - unsigned long nr_pfns, unsigned long pfn_align); +mfn_t alloc_boot_pages(unsigned long nr_pfns, unsigned long pfn_align); void end_boot_allocator(void); /* Xen suballocator. These functions are interrupt-safe. */