From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mike Rapoport <rppt@linux.ibm.com>
Cc: Qian Cai <quic_qiancai@quicinc.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mark Rutland <mark.rutland@arm.com>,
Naresh Kamboju <naresh.kamboju@linaro.org>,
Miles Chen <miles.chen@mediatek.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
linux-mm <linux-mm@kvack.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
open list <linux-kernel@vger.kernel.org>,
Will Deacon <will@kernel.org>,
lkft-triage@lists.linaro.org, regressions@lists.linux.dev,
Arnd Bergmann <arnd@arndb.de>, Ard Biesheuvel <ardb@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Alistair Popple <apopple@nvidia.com>
Subject: Re: [next] [arm64] kernel BUG at arch/arm64/mm/physaddr.c
Date: Wed, 16 Jun 2021 09:34:22 +1000 [thread overview]
Message-ID: <20210616093422.31270f1e@canb.auug.org.au> (raw)
In-Reply-To: <YMj9vHhHOiCVN4BF@linux.ibm.com>
[-- Attachment #1.1: Type: text/plain, Size: 1322 bytes --]
Hi all,
On Tue, 15 Jun 2021 22:21:32 +0300 Mike Rapoport <rppt@linux.ibm.com> wrote:
>
> On Tue, Jun 15, 2021 at 10:50:31AM -0400, Qian Cai wrote:
> >
> > On 6/15/2021 9:19 AM, Mark Rutland wrote:
> > > Looking some more, it looks like that's correct in isolation, but it
> > > clashes with commit:
> > >
> > > 5831eedad2ac6f38 ("mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA")
> >
> > Just a data point. Reverting the commit alone fixed the same crash for me.
>
> Yeah, that commit didn't take into the account the change in
> pgdat_to_phys().
>
> The patch below should fix it. In the long run I think we should get rid of
> contig_page_data and allocate NODE_DATA(0) for !NUMA case as well.
>
> Andrew, can you please add this as a fixup to "mm: replace
> CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA"?
>
>
> diff --git a/mm/sparse.c b/mm/sparse.c
> index a0e9cdb5bc38..6326cdf36c4f 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -347,7 +347,7 @@ size_t mem_section_usage_size(void)
>
> static inline phys_addr_t pgdat_to_phys(struct pglist_data *pgdat)
> {
> -#ifndef CONFIG_NEED_MULTIPLE_NODES
> +#ifndef CONFIG_NUMA
> return __pa_symbol(pgdat);
> #else
> return __pa(pgdat);
Added to linux-next today.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-15 23:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 11:11 [next] [arm64] kernel BUG at arch/arm64/mm/physaddr.c Naresh Kamboju
2021-06-15 11:50 ` Will Deacon
2021-06-17 12:15 ` Naresh Kamboju
2021-06-15 12:47 ` Mark Rutland
2021-06-15 13:19 ` Mark Rutland
2021-06-15 14:50 ` Qian Cai
2021-06-15 19:21 ` Mike Rapoport
2021-06-15 23:34 ` Stephen Rothwell [this message]
2021-06-15 23:40 ` Miles Chen
2021-06-16 0:29 ` Miles Chen
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=20210616093422.31270f1e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=lkft-triage@lists.linaro.org \
--cc=mark.rutland@arm.com \
--cc=miles.chen@mediatek.com \
--cc=naresh.kamboju@linaro.org \
--cc=quic_qiancai@quicinc.com \
--cc=regressions@lists.linux.dev \
--cc=rppt@linux.ibm.com \
--cc=will@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).