mm/cma: provide option to opt out from exposing pages on activation failure

Patch series "powerpc/fadump: handle CMA activation failure appropriately", v3.

Commit 023addc76f0a ("mm/cma: expose all pages to the buddy if
activation of an area fails") started exposing all pages to buddy
allocator on CMA activation failure.  But there can be CMA users that
want to handle the reserved memory differently on CMA allocation
failure.

Provide an option to opt out from exposing pages to buddy for such
cases.

Link: https://lkml.kernel.org/r/20220117075246.36072-1-hbathini@linux.ibm.com
Link: https://lkml.kernel.org/r/20220117075246.36072-2-hbathini@linux.ibm.com
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Mahesh Salgaonkar <mahesh@linux.ibm.com>
Cc: Sourabh Jain <sourabhjain@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/cma.h b/include/linux/cma.h
index b1ba94f1cc9c5065e423ccc566fc408d3d35eb33..90fd742fd1ef5436f100bea5d3bcbdafafcacf33 100644 (file)
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -58,4 +58,6 @@ extern bool cma_pages_valid(struct cma *cma, const struct page *pages, unsigned
 extern bool cma_release(struct cma *cma, const struct page *pages, unsigned long count);
 
 extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data);
+
+extern void cma_reserve_pages_on_error(struct cma *cma);
 #endif

diff --git a/mm/cma.c b/mm/cma.c
index 5a2cd58516589132ae79c5b650823f429bcaf7ae..eaa4b5c920a20b53cf819a541ebdd652e0a14987 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -131,8 +131,10 @@ not_in_zone:
        bitmap_free(cma->bitmap);
 out_error:
        /* Expose all pages to the buddy, they are useless for CMA. */
-       for (pfn = base_pfn; pfn < base_pfn + cma->count; pfn++)
-               free_reserved_page(pfn_to_page(pfn));
+       if (!cma->reserve_pages_on_error) {
+               for (pfn = base_pfn; pfn < base_pfn + cma->count; pfn++)
+                       free_reserved_page(pfn_to_page(pfn));
+       }
        totalcma_pages -= cma->count;
        cma->count = 0;
        pr_err("CMA area %s could not be activated\n", cma->name);
@@ -150,6 +152,11 @@ static int __init cma_init_reserved_areas(void)
 }
 core_initcall(cma_init_reserved_areas);
 
+void __init cma_reserve_pages_on_error(struct cma *cma)
+{
+       cma->reserve_pages_on_error = true;
+}
+
 /**
  * cma_init_reserved_mem() - create custom contiguous area from reserved memory
  * @base: Base address of the reserved area

diff --git a/mm/cma.h b/mm/cma.h
index 2c775877eae240279d08adc18591a058e34e755e..88a0595670b766cd9780476f7dacb71fd9979e34 100644 (file)
--- a/mm/cma.h
+++ b/mm/cma.h
@@ -30,6 +30,7 @@ struct cma {
        /* kobject requires dynamic object */
        struct cma_kobject *cma_kobj;
 #endif
+       bool reserve_pages_on_error;
 };
 
 extern struct cma cma_areas[MAX_CMA_AREAS];