Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65E24C433EF for ; Fri, 25 Mar 2022 01:33:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355558AbiCYBfK (ORCPT ); Thu, 24 Mar 2022 21:35:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356287AbiCYBeA (ORCPT ); Thu, 24 Mar 2022 21:34:00 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CA40BF512 for ; Thu, 24 Mar 2022 18:32:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 7E324CE272B for ; Fri, 25 Mar 2022 01:32:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1E5DC340EC; Fri, 25 Mar 2022 01:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1648171940; bh=nPkFCjZuTgSTKVbji2yqwPj8rker0lom2AoO/CEek60=; h=Date:To:From:Subject:From; b=UUKmPsvlVfjmpyE2HewbVObYyE7M398JUN1eB+qCfUOma4cULjLA62yy54bKxAL2x LMLtnIthErvtoK1Y47jWPlNXosoRSOLIbsxSna1+JUBzUkZVzwYpxwzhzPwlmtTduz itt2UUDDDPRpqT9ZRXFd9fK7yn7fTWguzk8Cf5e4= Date: Thu, 24 Mar 2022 18:32:20 -0700 To: mm-commits@vger.kernel.org, sourabhjain@linux.ibm.com, osalvador@suse.de, mpe@ellerman.id.au, mike.kravetz@oracle.com, mahesh@linux.ibm.com, david@redhat.com, hbathini@linux.ibm.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged] mm-cma-provide-option-to-opt-out-from-exposing-pages-on-activation-failure.patch removed from -mm tree Message-Id: <20220325013220.D1E5DC340EC@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/cma: provide option to opt out from exposing pages on activation failure has been removed from the -mm tree. Its filename was mm-cma-provide-option-to-opt-out-from-exposing-pages-on-activation-failure.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Hari Bathini Subject: mm/cma: provide option to opt out from exposing pages on activation failure Patch series "powerpc/fadump: handle CMA activation failure appropriately", v3. Commit 072355c1cf2d ("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 Reviewed-by: David Hildenbrand Cc: Oscar Salvador Cc: Mike Kravetz Cc: Mahesh Salgaonkar Cc: Sourabh Jain Cc: Michael Ellerman Signed-off-by: Andrew Morton --- include/linux/cma.h | 2 ++ mm/cma.c | 11 +++++++++-- mm/cma.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) --- a/include/linux/cma.h~mm-cma-provide-option-to-opt-out-from-exposing-pages-on-activation-failure +++ a/include/linux/cma.h @@ -58,4 +58,6 @@ extern bool cma_pages_valid(struct cma * 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 --- a/mm/cma.c~mm-cma-provide-option-to-opt-out-from-exposing-pages-on-activation-failure +++ a/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_area } 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 --- a/mm/cma.h~mm-cma-provide-option-to-opt-out-from-exposing-pages-on-activation-failure +++ a/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]; _ Patches currently in -mm which might be from hbathini@linux.ibm.com are