MIPS: VDSO: Prevent use of smp_processor_id()

[android-x86/kernel.git] / kernel / memremap.c

diff --git a/kernel/memremap.c b/kernel/memremap.c
index b501e39..9a8b594 100644 (file)
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -194,7 +194,7 @@ void put_zone_device_page(struct page *page)
 }
 EXPORT_SYMBOL(put_zone_device_page);
 
-static void pgmap_radix_release(struct resource *res)
+static void pgmap_radix_release(struct resource *res, resource_size_t end_key)
 {
        resource_size_t key, align_start, align_size, align_end;
 
@@ -203,8 +203,11 @@ static void pgmap_radix_release(struct resource *res)
        align_end = align_start + align_size - 1;
 
        mutex_lock(&pgmap_lock);
-       for (key = res->start; key <= res->end; key += SECTION_SIZE)
+       for (key = res->start; key <= res->end; key += SECTION_SIZE) {
+               if (key >= end_key)
+                       break;
                radix_tree_delete(&pgmap_radix, key >> PA_SECTION_SHIFT);
+       }
        mutex_unlock(&pgmap_lock);
 }
 
@@ -245,10 +248,17 @@ static void devm_memremap_pages_release(struct device *dev, void *data)
 
        /* pages are dead and unused, undo the arch mapping */
        align_start = res->start & ~(SECTION_SIZE - 1);
-       align_size = ALIGN(resource_size(res), SECTION_SIZE);
+       align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
+               - align_start;
+
+       lock_device_hotplug();
+       mem_hotplug_begin();
        arch_remove_memory(align_start, align_size);
+       mem_hotplug_done();
+       unlock_device_hotplug();
+
        untrack_pfn(NULL, PHYS_PFN(align_start), align_size);
-       pgmap_radix_release(res);
+       pgmap_radix_release(res, -1);
        dev_WARN_ONCE(dev, pgmap->altmap && pgmap->altmap->alloc,
                        "%s: failed to free all reserved pages\n", __func__);
 }
@@ -282,7 +292,7 @@ struct dev_pagemap *find_dev_pagemap(resource_size_t phys)
 void *devm_memremap_pages(struct device *dev, struct resource *res,
                struct percpu_ref *ref, struct vmem_altmap *altmap)
 {
-       resource_size_t key, align_start, align_size, align_end;
+       resource_size_t key = 0, align_start, align_size, align_end;
        pgprot_t pgprot = PAGE_KERNEL;
        struct dev_pagemap *pgmap;
        struct page_map *page_map;
@@ -295,15 +305,12 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
        is_ram = region_intersects(align_start, align_size,
                IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE);
 
-       if (is_ram == REGION_MIXED) {
-               WARN_ONCE(1, "%s attempted on mixed region %pr\n",
-                               __func__, res);
+       if (is_ram != REGION_DISJOINT) {
+               WARN_ONCE(1, "%s attempted on %s region %pr\n", __func__,
+                               is_ram == REGION_MIXED ? "mixed" : "ram", res);
                return ERR_PTR(-ENXIO);
        }
 
-       if (is_ram == REGION_INTERSECTS)
-               return __va(res->start);
-
        if (!ref)
                return ERR_PTR(-EINVAL);
 
@@ -358,7 +365,11 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
        if (error)
                goto err_pfn_remap;
 
+       lock_device_hotplug();
+       mem_hotplug_begin();
        error = arch_add_memory(nid, align_start, align_size, true);
+       mem_hotplug_done();
+       unlock_device_hotplug();
        if (error)
                goto err_add_memory;
 
@@ -381,11 +392,11 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
        untrack_pfn(NULL, PHYS_PFN(align_start), align_size);
  err_pfn_remap:
  err_radix:
-       pgmap_radix_release(res);
+       pgmap_radix_release(res, key);
        devres_free(page_map);
        return ERR_PTR(error);
 }
-EXPORT_SYMBOL(devm_memremap_pages);
+EXPORT_SYMBOL_GPL(devm_memremap_pages);
 
 unsigned long vmem_altmap_offset(struct vmem_altmap *altmap)
 {