[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20181203161052.GA4244@ravnborg.org>
Date: Mon, 3 Dec 2018 17:10:52 +0100
From: Sam Ravnborg <sam@...nborg.org>
To: Mike Rapoport <rppt@...ux.ibm.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Arnd Bergmann <arnd@...db.de>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
"David S. Miller" <davem@...emloft.net>,
Guan Xuetao <gxt@....edu.cn>,
Greentime Hu <green.hu@...il.com>,
Jonas Bonn <jonas@...thpole.se>,
Michael Ellerman <mpe@...erman.id.au>,
Michal Hocko <mhocko@...e.com>,
Michal Simek <monstr@...str.eu>,
Mark Salter <msalter@...hat.com>,
Paul Mackerras <paulus@...ba.org>,
Rich Felker <dalias@...c.org>,
Russell King <linux@...linux.org.uk>,
Stefan Kristiansson <stefan.kristiansson@...nalahti.fi>,
Stafford Horne <shorne@...il.com>,
Vincent Chen <deanbo422@...il.com>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
linux-arm-kernel@...ts.infradead.org, linux-c6x-dev@...ux-c6x.org,
linux-kernel@...r.kernel.org, linux-mm@...ck.org,
linux-sh@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
openrisc@...ts.librecores.org, sparclinux@...r.kernel.org
Subject: Re: [PATCH v2 3/6] sh: prefer memblock APIs returning virtual address
Hi Mike.
On Mon, Dec 03, 2018 at 05:47:12PM +0200, Mike Rapoport wrote:
> Rather than use the memblock_alloc_base that returns a physical address and
> then convert this address to the virtual one, use appropriate memblock
> function that returns a virtual address.
>
> There is a small functional change in the allocation of then NODE_DATA().
> Instead of panicing if the local allocation failed, the non-local
> allocation attempt will be made.
>
> Signed-off-by: Mike Rapoport <rppt@...ux.ibm.com>
> ---
> arch/sh/mm/init.c | 18 +++++-------------
> arch/sh/mm/numa.c | 5 ++---
> 2 files changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
> index c8c13c77..3576b5f 100644
> --- a/arch/sh/mm/init.c
> +++ b/arch/sh/mm/init.c
> @@ -192,24 +192,16 @@ void __init page_table_range_init(unsigned long start, unsigned long end,
> void __init allocate_pgdat(unsigned int nid)
> {
> unsigned long start_pfn, end_pfn;
> -#ifdef CONFIG_NEED_MULTIPLE_NODES
> - unsigned long phys;
> -#endif
>
> get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
>
> #ifdef CONFIG_NEED_MULTIPLE_NODES
> - phys = __memblock_alloc_base(sizeof(struct pglist_data),
> - SMP_CACHE_BYTES, end_pfn << PAGE_SHIFT);
> - /* Retry with all of system memory */
> - if (!phys)
> - phys = __memblock_alloc_base(sizeof(struct pglist_data),
> - SMP_CACHE_BYTES, memblock_end_of_DRAM());
> - if (!phys)
> + NODE_DATA(nid) = memblock_alloc_try_nid_nopanic(
> + sizeof(struct pglist_data),
> + SMP_CACHE_BYTES, MEMBLOCK_LOW_LIMIT,
> + MEMBLOCK_ALLOC_ACCESSIBLE, nid);
> + if (!NODE_DATA(nid))
> panic("Can't allocate pgdat for node %d\n", nid);
> -
> - NODE_DATA(nid) = __va(phys);
> - memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
The new code will always assign NODE_DATA(nid), where the old
code only assigned NODE_DATA(nid) in the good case.
I dunno if this is an issue, just noticed the difference and
wanted to point it out.
Sam
Powered by blists - more mailing lists