From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60F03C48BCF for ; Wed, 9 Jun 2021 10:58:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DEE96136D for ; Wed, 9 Jun 2021 10:58:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238648AbhFILAN (ORCPT ); Wed, 9 Jun 2021 07:00:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49092 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238588AbhFILAJ (ORCPT ); Wed, 9 Jun 2021 07:00:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623236295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2Gdg9+tpOx626Ezvggt1xE7D6QrGInTamndBpZke/4o=; b=X/JH4frm23e51OvL+AzU/aGWN4rwxW2nutCDtOm9LyTOJ/rzwK4RgqtIqNDskkViAY0b6j QsdxlegHTDekdhcER9oIYr8BV3Fi9hIVng/rQ/W7RX39u3ZqNYbFp3mtJVvbGCdRe5Vq6D 0dJzVXNeFzQMfVoJmLP17f8BVs/C8FM= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-537-WHaR0ceeMrWGMquZ3_zgxA-1; Wed, 09 Jun 2021 06:58:14 -0400 X-MC-Unique: WHaR0ceeMrWGMquZ3_zgxA-1 Received: by mail-wr1-f70.google.com with SMTP id v15-20020a5d4a4f0000b0290118dc518878so10650675wrs.6 for ; Wed, 09 Jun 2021 03:58:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=2Gdg9+tpOx626Ezvggt1xE7D6QrGInTamndBpZke/4o=; b=PRRAhJV7b6G8QTgNywyEk6OuNPSozCQpnO+WtYCGjnnajpCFjSxZj+nJxllrILHTT3 mZYLCt/UBVKs+arJJmT9KdRMa6Z0xAKYFPLy7veY4ads5Gfzh8M9jGVFsA0R999qEvo1 khgN5dH9czVPMP2PlQiz5QhdhItwPXtBUsFxMRBh0wSr3qF1Yad9gjO0Gx4L5PYUjSyR LH13soxdl96ICCqKsa8Kfw4xOsiVPkxaQDIAYTC37yDSQgeLDYZgdeDFu3b6y2ZNC/hv Yq6CYYKr+Qjhja4O7MzOFhD5kuLks2MGktZhqUb9Dby8IPPTwDhwZDwZVqF+NPo9IDFy 2qfA== X-Gm-Message-State: AOAM531OskZTKpkrVdkbkFk2czJ3IMVLUHYK4tnliFy/uGv84WtsSr0q qgmON8fQuNzjoicLswJRZH6tUcBdoY1f9W7xnqa+kK93rXArre54rrmqIrTQnleG2DKSaDcXeOw teLxygJWu0JdgeQEZUDCYUbMg X-Received: by 2002:a5d:6b81:: with SMTP id n1mr27256955wrx.144.1623236292819; Wed, 09 Jun 2021 03:58:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxANfssiXPPwd5jXqSLFwZZmn/VQ6v6aq6x8NxYxZ6oulxycL5+UbfQGME/wwP7BrwnDfbhqg== X-Received: by 2002:a5d:6b81:: with SMTP id n1mr27256934wrx.144.1623236292583; Wed, 09 Jun 2021 03:58:12 -0700 (PDT) Received: from [192.168.3.132] (p5b0c611d.dip0.t-ipconnect.de. [91.12.97.29]) by smtp.gmail.com with ESMTPSA id o3sm24218939wrm.78.2021.06.09.03.58.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Jun 2021 03:58:12 -0700 (PDT) Subject: Re: [PATCH 9/9] mm: replace CONFIG_FLAT_NODE_MEM_MAP with CONFIG_FLATMEM To: Mike Rapoport , Andrew Morton Cc: Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , Vineet Gupta , kexec@lists.infradead.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org References: <20210602105348.13387-1-rppt@kernel.org> <20210602105348.13387-10-rppt@kernel.org> From: David Hildenbrand Organization: Red Hat Message-ID: <5dc2c695-06c9-671f-a77d-24db56485041@redhat.com> Date: Wed, 9 Jun 2021 12:58:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210602105348.13387-10-rppt@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02.06.21 12:53, Mike Rapoport wrote: > From: Mike Rapoport > > After removal of the DISCONTIGMEM memory model the FLAT_NODE_MEM_MAP > configuration option is equivalent to FLATMEM. > > Drop CONFIG_FLAT_NODE_MEM_MAP and use CONFIG_FLATMEM instead. > > Signed-off-by: Mike Rapoport > --- > include/linux/mmzone.h | 4 ++-- > kernel/crash_core.c | 2 +- > mm/Kconfig | 4 ---- > mm/page_alloc.c | 6 +++--- > mm/page_ext.c | 2 +- > 5 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index ad42f440c704..2698cdbfbf75 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -775,7 +775,7 @@ typedef struct pglist_data { > struct zonelist node_zonelists[MAX_ZONELISTS]; > > int nr_zones; /* number of populated zones in this node */ > -#ifdef CONFIG_FLAT_NODE_MEM_MAP /* means !SPARSEMEM */ > +#ifdef CONFIG_FLATMEM /* means !SPARSEMEM */ > struct page *node_mem_map; > #ifdef CONFIG_PAGE_EXTENSION > struct page_ext *node_page_ext; > @@ -865,7 +865,7 @@ typedef struct pglist_data { > > #define node_present_pages(nid) (NODE_DATA(nid)->node_present_pages) > #define node_spanned_pages(nid) (NODE_DATA(nid)->node_spanned_pages) > -#ifdef CONFIG_FLAT_NODE_MEM_MAP > +#ifdef CONFIG_FLATMEM > #define pgdat_page_nr(pgdat, pagenr) ((pgdat)->node_mem_map + (pagenr)) > #else > #define pgdat_page_nr(pgdat, pagenr) pfn_to_page((pgdat)->node_start_pfn + (pagenr)) > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > index 53eb8bc6026d..2b8446ea7105 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -483,7 +483,7 @@ static int __init crash_save_vmcoreinfo_init(void) > VMCOREINFO_OFFSET(page, compound_head); > VMCOREINFO_OFFSET(pglist_data, node_zones); > VMCOREINFO_OFFSET(pglist_data, nr_zones); > -#ifdef CONFIG_FLAT_NODE_MEM_MAP > +#ifdef CONFIG_FLATMEM > VMCOREINFO_OFFSET(pglist_data, node_mem_map); > #endif > VMCOREINFO_OFFSET(pglist_data, node_start_pfn); > diff --git a/mm/Kconfig b/mm/Kconfig > index bffe4bd859f3..ded98fb859ab 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -55,10 +55,6 @@ config FLATMEM > def_bool y > depends on !SPARSEMEM || FLATMEM_MANUAL > > -config FLAT_NODE_MEM_MAP > - def_bool y > - depends on !SPARSEMEM > - > # > # SPARSEMEM_EXTREME (which is the default) does some bootmem > # allocations when sparse_init() is called. If this cannot > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 8f08135d3eb4..f039736541eb 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -6444,7 +6444,7 @@ static void __meminit zone_init_free_lists(struct zone *zone) > } > } > > -#if !defined(CONFIG_FLAT_NODE_MEM_MAP) > +#if !defined(CONFIG_FLATMEM) > /* > * Only struct pages that correspond to ranges defined by memblock.memory > * are zeroed and initialized by going through __init_single_page() during > @@ -7241,7 +7241,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat) > } > } > > -#ifdef CONFIG_FLAT_NODE_MEM_MAP > +#ifdef CONFIG_FLATMEM > static void __ref alloc_node_mem_map(struct pglist_data *pgdat) > { > unsigned long __maybe_unused start = 0; > @@ -7289,7 +7289,7 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat) > } > #else > static void __ref alloc_node_mem_map(struct pglist_data *pgdat) { } > -#endif /* CONFIG_FLAT_NODE_MEM_MAP */ > +#endif /* CONFIG_FLATMEM */ > > #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT > static inline void pgdat_set_deferred_range(pg_data_t *pgdat) > diff --git a/mm/page_ext.c b/mm/page_ext.c > index df6f74aac8e1..293b2685fc48 100644 > --- a/mm/page_ext.c > +++ b/mm/page_ext.c > @@ -191,7 +191,7 @@ void __init page_ext_init_flatmem(void) > panic("Out of memory"); > } > > -#else /* CONFIG_FLAT_NODE_MEM_MAP */ > +#else /* CONFIG_FLATMEM */ > > struct page_ext *lookup_page_ext(const struct page *page) > { > Acked-by: David Hildenbrand -- Thanks, David / dhildenb