linux-kernel - Re: [next] [arm64] kernel BUG at arch/arm64/mm/physaddr.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 15 Jun 2021 22:21:32 +0300
From:   Mike Rapoport <rppt@...ux.ibm.com>
To:     Qian Cai <quic_qiancai@...cinc.com>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Mark Rutland <mark.rutland@....com>,
        Naresh Kamboju <naresh.kamboju@...aro.org>,
        Miles Chen <miles.chen@...iatek.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        linux-mm <linux-mm@...ck.org>,
        Linux ARM <linux-arm-kernel@...ts.infradead.org>,
        open list <linux-kernel@...r.kernel.org>,
        Will Deacon <will@...nel.org>, lkft-triage@...ts.linaro.org,
        regressions@...ts.linux.dev,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Arnd Bergmann <arnd@...db.de>,
        Ard Biesheuvel <ardb@...nel.org>,
        Catalin Marinas <catalin.marinas@....com>,
        Christophe Leroy <christophe.leroy@...roup.eu>
Subject: Re: [next] [arm64] kernel BUG at arch/arm64/mm/physaddr.c

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);

-- 
Sincerely yours,
Mike.