mm/ksm.c: don't WARN if page is still mapped in remove_stable_node()

[mirror_ubuntu-bionic-kernel.git] / mm / cma.c

diff --git a/mm/cma.c b/mm/cma.c
index 0607729abf3b5f937fbc76b8148c0acd61ed9e56..f26f7f76041497e7b9fccffa3627f6fdee6a9415 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -105,8 +105,10 @@ static int __init cma_activate_area(struct cma *cma)
 
        cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
 
-       if (!cma->bitmap)
+       if (!cma->bitmap) {
+               cma->count = 0;
                return -ENOMEM;
+       }
 
        WARN_ON_ONCE(!pfn_valid(pfn));
        zone = page_zone(pfn_to_page(pfn));
@@ -275,6 +277,12 @@ int __init cma_declare_contiguous(phys_addr_t base,
         */
        alignment = max(alignment,  (phys_addr_t)PAGE_SIZE <<
                          max_t(unsigned long, MAX_ORDER - 1, pageblock_order));
+       if (fixed && base & (alignment - 1)) {
+               ret = -EINVAL;
+               pr_err("Region at %pa must be aligned to %pa bytes\n",
+                       &base, &alignment);
+               goto err;
+       }
        base = ALIGN(base, alignment);
        size = ALIGN(size, alignment);
        limit &= ~(alignment - 1);
@@ -305,6 +313,13 @@ int __init cma_declare_contiguous(phys_addr_t base,
        if (limit == 0 || limit > memblock_end)
                limit = memblock_end;
 
+       if (base + size > limit) {
+               ret = -EINVAL;
+               pr_err("Size (%pa) of region at %pa exceeds limit (%pa)\n",
+                       &size, &base, &limit);
+               goto err;
+       }
+
        /* Reserve memory */
        if (fixed) {
                if (memblock_is_region_reserved(base, size) ||
@@ -348,12 +363,14 @@ int __init cma_declare_contiguous(phys_addr_t base,
 
        ret = cma_init_reserved_mem(base, size, order_per_bit, name, res_cma);
        if (ret)
-               goto err;
+               goto free_mem;
 
        pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
                &base);
        return 0;
 
+free_mem:
+       memblock_free(base, size);
 err:
        pr_err("Failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
        return ret;
@@ -362,23 +379,26 @@ err:
 #ifdef CONFIG_CMA_DEBUG
 static void cma_debug_show_areas(struct cma *cma)
 {
-       unsigned long next_zero_bit, next_set_bit;
+       unsigned long next_zero_bit, next_set_bit, nr_zero;
        unsigned long start = 0;
-       unsigned int nr_zero, nr_total = 0;
+       unsigned long nr_part, nr_total = 0;
+       unsigned long nbits = cma_bitmap_maxno(cma);
 
        mutex_lock(&cma->lock);
        pr_info("number of available pages: ");
        for (;;) {
-               next_zero_bit = find_next_zero_bit(cma->bitmap, cma->count, start);
-               if (next_zero_bit >= cma->count)
+               next_zero_bit = find_next_zero_bit(cma->bitmap, nbits, start);
+               if (next_zero_bit >= nbits)
                        break;
-               next_set_bit = find_next_bit(cma->bitmap, cma->count, next_zero_bit);
+               next_set_bit = find_next_bit(cma->bitmap, nbits, next_zero_bit);
                nr_zero = next_set_bit - next_zero_bit;
-               pr_cont("%s%u@%lu", nr_total ? "+" : "", nr_zero, next_zero_bit);
-               nr_total += nr_zero;
+               nr_part = nr_zero << cma->order_per_bit;
+               pr_cont("%s%lu@%lu", nr_total ? "+" : "", nr_part,
+                       next_zero_bit);
+               nr_total += nr_part;
                start = next_zero_bit + nr_zero;
        }
-       pr_cont("=> %u free of %lu total pages\n", nr_total, cma->count);
+       pr_cont("=> %lu free of %lu total pages\n", nr_total, cma->count);
        mutex_unlock(&cma->lock);
 }
 #else