From: Baoquan He <bhe@redhat.com>
To: Mike Rapoport <rppt@kernel.org>
Cc: Rich Felker <dalias@libc.org>,
linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Michal Hocko <mhocko@kernel.org>,
"James E.J. Bottomley" <James.Bottomley@hansenpartnership.com>,
Max Filippov <jcmvbkbc@gmail.com>, Guo Ren <guoren@kernel.org>,
linux-csky@vger.kernel.org, linux-parisc@vger.kernel.org,
sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org,
linux-riscv@lists.infradead.org,
Greg Ungerer <gerg@linux-m68k.org>,
linux-arch@vger.kernel.org, linux-s390@vger.kernel.org,
linux-snps-arc@lists.infradead.org, linux-c6x-dev@linux-c6x.org,
Brian Cain <bcain@codeaurora.org>,
Jonathan Corbet <corbet@lwn.net>,
linux-sh@vger.kernel.org, Michael Ellerman <mpe@ellerman.id.au>,
Helge Deller <deller@gmx.de>,
x86@kernel.org, Russell King <linux@armlinux.org.uk>,
Ley Foon Tan <ley.foon.>
Subject: Re: [PATCH 17/21] mm: free_area_init: allow defining max_zone_pfn in descending order
Date: Thu, 23 Apr 2020 10:57:20 +0800 [thread overview]
Message-ID: <20200423025720.GA4247@MiWiFi-R3L-srv> (raw)
In-Reply-To: <20200423025311.GZ4247@MiWiFi-R3L-srv>
On 04/23/20 at 10:53am, Baoquan He wrote:
> On 04/12/20 at 10:48pm, Mike Rapoport wrote:
> > From: Mike Rapoport <rppt@linux.ibm.com>
> >
> > Some architectures (e.g. ARC) have the ZONE_HIGHMEM zone below the
> > ZONE_NORMAL. Allowing free_area_init() parse max_zone_pfn array even it is
> > sorted in descending order allows using free_area_init() on such
> > architectures.
> >
> > Add top -> down traversal of max_zone_pfn array in free_area_init() and use
> > the latter in ARC node/zone initialization.
>
> Or maybe leave ARC as is. The change in this patchset doesn't impact
> ARC's handling about zone initialization, leaving it as is can reduce
> the complication in implementation of free_area_init(), which is a
> common function. So I personally don't see a strong motivation to have
> this patch.
OK, seems this patch is prepared to simplify free_area_init_node(), so
take back what I said at above.
Then this looks necessary, even though it introduces special case into
common function free_area_init().
Reviewed-by: Baoquan He <bhe@redhat.com>
>
> >
> > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> > ---
> > arch/arc/mm/init.c | 36 +++++++-----------------------------
> > mm/page_alloc.c | 24 +++++++++++++++++++-----
> > 2 files changed, 26 insertions(+), 34 deletions(-)
> >
> > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
> > index 0920c969c466..41eb9be1653c 100644
> > --- a/arch/arc/mm/init.c
> > +++ b/arch/arc/mm/init.c
> > @@ -63,11 +63,13 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
> >
> > low_mem_sz = size;
> > in_use = 1;
> > + memblock_add_node(base, size, 0);
> > } else {
> > #ifdef CONFIG_HIGHMEM
> > high_mem_start = base;
> > high_mem_sz = size;
> > in_use = 1;
> > + memblock_add_node(base, size, 1);
> > #endif
> > }
> >
> > @@ -83,8 +85,7 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
> > */
> > void __init setup_arch_memory(void)
> > {
> > - unsigned long zones_size[MAX_NR_ZONES];
> > - unsigned long zones_holes[MAX_NR_ZONES];
> > + unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
> >
> > init_mm.start_code = (unsigned long)_text;
> > init_mm.end_code = (unsigned long)_etext;
> > @@ -115,7 +116,6 @@ void __init setup_arch_memory(void)
> > * the crash
> > */
> >
> > - memblock_add_node(low_mem_start, low_mem_sz, 0);
> > memblock_reserve(CONFIG_LINUX_LINK_BASE,
> > __pa(_end) - CONFIG_LINUX_LINK_BASE);
> >
> > @@ -133,22 +133,7 @@ void __init setup_arch_memory(void)
> > memblock_dump_all();
> >
> > /*----------------- node/zones setup --------------------------*/
> > - memset(zones_size, 0, sizeof(zones_size));
> > - memset(zones_holes, 0, sizeof(zones_holes));
> > -
> > - zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
> > - zones_holes[ZONE_NORMAL] = 0;
> > -
> > - /*
> > - * We can't use the helper free_area_init(zones[]) because it uses
> > - * PAGE_OFFSET to compute the @min_low_pfn which would be wrong
> > - * when our kernel doesn't start at PAGE_OFFSET, i.e.
> > - * PAGE_OFFSET != CONFIG_LINUX_RAM_BASE
> > - */
> > - free_area_init_node(0, /* node-id */
> > - zones_size, /* num pages per zone */
> > - min_low_pfn, /* first pfn of node */
> > - zones_holes); /* holes */
> > + max_zone_pfn[ZONE_NORMAL] = max_low_pfn;
> >
> > #ifdef CONFIG_HIGHMEM
> > /*
> > @@ -168,20 +153,13 @@ void __init setup_arch_memory(void)
> > min_high_pfn = PFN_DOWN(high_mem_start);
> > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz);
> >
> > - zones_size[ZONE_NORMAL] = 0;
> > - zones_holes[ZONE_NORMAL] = 0;
> > -
> > - zones_size[ZONE_HIGHMEM] = max_high_pfn - min_high_pfn;
> > - zones_holes[ZONE_HIGHMEM] = 0;
> > -
> > - free_area_init_node(1, /* node-id */
> > - zones_size, /* num pages per zone */
> > - min_high_pfn, /* first pfn of node */
> > - zones_holes); /* holes */
> > + max_zone_pfn[ZONE_HIGHMEM] = max_high_pfn;
> >
> > high_memory = (void *)(min_high_pfn << PAGE_SHIFT);
> > kmap_init();
> > #endif
> > +
> > + free_area_init(max_zone_pfn);
> > }
> >
> > /*
> > diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> > index 343d87b8697d..376434c7a78b 100644
> > --- a/mm/page_alloc.c
> > +++ b/mm/page_alloc.c
> > @@ -7429,7 +7429,8 @@ static void check_for_memory(pg_data_t *pgdat, int nid)
> > void __init free_area_init(unsigned long *max_zone_pfn)
> > {
> > unsigned long start_pfn, end_pfn;
> > - int i, nid;
> > + int i, nid, zone;
> > + bool descending = false;
> >
> > /* Record where the zone boundaries are */
> > memset(arch_zone_lowest_possible_pfn, 0,
> > @@ -7439,13 +7440,26 @@ void __init free_area_init(unsigned long *max_zone_pfn)
> >
> > start_pfn = find_min_pfn_with_active_regions();
> >
> > + /*
> > + * Some architecturs, e.g. ARC may have ZONE_HIGHMEM below
> > + * ZONE_NORMAL. For such cases we allow max_zone_pfn sorted in the
> > + * descending order
> > + */
> > + if (MAX_NR_ZONES > 1 && max_zone_pfn[0] > max_zone_pfn[1])
> > + descending = true;
> > +
> > for (i = 0; i < MAX_NR_ZONES; i++) {
> > - if (i == ZONE_MOVABLE)
> > + if (descending)
> > + zone = MAX_NR_ZONES - i - 1;
> > + else
> > + zone = i;
> > +
> > + if (zone == ZONE_MOVABLE)
> > continue;
> >
> > - end_pfn = max(max_zone_pfn[i], start_pfn);
> > - arch_zone_lowest_possible_pfn[i] = start_pfn;
> > - arch_zone_highest_possible_pfn[i] = end_pfn;
> > + end_pfn = max(max_zone_pfn[zone], start_pfn);
> > + arch_zone_lowest_possible_pfn[zone] = start_pfn;
> > + arch_zone_highest_possible_pfn[zone] = end_pfn;
> >
> > start_pfn = end_pfn;
> > }
> > --
> > 2.25.1
> >
next prev parent reply other threads:[~2020-04-23 2:57 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-12 19:48 [PATCH 00/21] mm: rework free_area_init*() funcitons Mike Rapoport
2020-04-12 19:48 ` [PATCH 01/21] mm: memblock: replace dereferences of memblock_region.nid with API calls Mike Rapoport
2020-04-21 2:06 ` Baoquan He
2020-04-12 19:48 ` [PATCH 02/21] mm: make early_pfn_to_nid() and related defintions close to each other Mike Rapoport
2020-04-21 2:24 ` Baoquan He
2020-04-21 8:49 ` Mike Rapoport
2020-04-21 8:49 ` Mike Rapoport
2020-04-21 9:33 ` Baoquan He
2020-04-21 3:31 ` Baoquan He
2020-04-21 8:39 ` Mike Rapoport
2020-04-21 8:39 ` Mike Rapoport
2020-04-12 19:48 ` [PATCH 03/21] mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option Mike Rapoport
2020-04-21 4:23 ` Baoquan He
2020-04-21 9:09 ` Mike Rapoport
2020-04-21 9:09 ` Mike Rapoport
2020-04-21 9:45 ` Baoquan He
2020-04-12 19:48 ` [PATCH 04/21] mm: free_area_init: use maximal zone PFNs rather than zone sizes Mike Rapoport
2020-04-22 23:41 ` Baoquan He
2020-06-15 3:53 ` Greg Ungerer
2020-06-15 6:22 ` Mike Rapoport
2020-06-15 6:22 ` Mike Rapoport
2020-06-15 7:17 ` Greg Ungerer
2020-04-12 19:48 ` [PATCH 05/21] mm: use free_area_init() instead of free_area_init_nodes() Mike Rapoport
2020-04-23 0:02 ` Baoquan He
2020-04-12 19:48 ` [PATCH 06/21] alpha: simplify detection of memory zone boundaries Mike Rapoport
2020-04-12 19:48 ` [PATCH 07/21] arm: " Mike Rapoport
2020-04-12 19:48 ` [PATCH 08/21] arm64: simplify detection of memory zone boundaries for UMA configs Mike Rapoport
2020-04-12 19:48 ` [PATCH 09/21] csky: simplify detection of memory zone boundaries Mike Rapoport
2020-04-12 19:48 ` [PATCH 10/21] m68k: mm: " Mike Rapoport
2020-04-12 19:48 ` [PATCH 11/21] parisc: " Mike Rapoport
2020-04-12 19:48 ` [PATCH 12/21] sparc32: " Mike Rapoport
2020-04-12 19:48 ` [PATCH 13/21] unicore32: " Mike Rapoport
2020-04-12 19:48 ` [PATCH 14/21] xtensa: " Mike Rapoport
2020-04-12 19:48 ` [PATCH 15/21] mm: memmap_init: iterate over memblock regions rather that check each PFN Mike Rapoport
2020-04-20 14:26 ` Qian Cai
2020-04-24 7:22 ` David Hildenbrand
2020-04-25 16:49 ` Mike Rapoport
2020-04-25 16:49 ` Mike Rapoport
2020-04-12 19:48 ` [PATCH 16/21] mm: remove early_pfn_in_nid() and CONFIG_NODES_SPAN_OTHER_NODES Mike Rapoport
2020-04-23 1:13 ` Baoquan He
2020-04-23 5:50 ` Mike Rapoport
2020-04-23 5:50 ` Mike Rapoport
2020-05-18 21:38 ` Hoan Tran
2020-04-12 19:48 ` [PATCH 17/21] mm: free_area_init: allow defining max_zone_pfn in descending order Mike Rapoport
2020-04-23 2:53 ` Baoquan He
2020-04-23 2:57 ` Baoquan He [this message]
2020-04-23 5:55 ` Mike Rapoport
2020-04-23 5:55 ` Mike Rapoport
2020-04-24 0:33 ` Baoquan He
2020-04-12 19:48 ` [PATCH 18/21] mm: rename free_area_init_node() to free_area_init_memoryless_node() Mike Rapoport
2020-04-23 3:14 ` Baoquan He
2020-04-23 6:18 ` Mike Rapoport
2020-04-23 6:18 ` Mike Rapoport
2020-04-12 19:48 ` [PATCH 19/21] mm: clean up free_area_init_node() and its helpers Mike Rapoport
2020-04-12 19:48 ` [PATCH 20/21] mm: simplify find_min_pfn_with_active_regions() Mike Rapoport
2020-04-12 19:48 ` [PATCH 21/21] docs/vm: update memory-models documentation Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200423025720.GA4247@MiWiFi-R3L-srv \
--to=bhe@redhat.com \
--cc=James.Bottomley@hansenpartnership.com \
--cc=bcain@codeaurora.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=dalias@libc.org \
--cc=deller@gmx.de \
--cc=gerg@linux-m68k.org \
--cc=guoren@kernel.org \
--cc=heiko.carstens@de.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mhocko@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=rppt@kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).