Re: [PATCH] RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename

[Palmer Dabbelt]

On Sat, 29 Apr 2023 02:32:33 PDT (-0700), Conor Dooley wrote:
> On Sat, Apr 29, 2023 at 10:27:33AM +0100, Conor Dooley wrote:
> > From: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
> >
> > Lukas warned that ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP had been
> > renamed in the mm tree & that RISC-V would need a fixup as part of the
> > merge. The warning was missed however, and RISC-V is selecting the
> > orphaned Kconfig option.
> >
> > Fixes: 89d77f71f493 ("Merge tag 'riscv-for-linus-6.4-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux")
> > Reported-by: Lukas Bulwhan <lukas.bulwhan@xxxxxxxxx>
>
> That should have been Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>.
> This is what I get for hand-typing an email address that I could have
> copied from lore I suppose.
>
> > Link: https://lore.kernel.org/linux-riscv/CAKXUXMyVeg2kQK_edKHtMD3eADrDK_PKhCSVkMrLDdYgTQQ5rg@xxxxxxxxxxxxxx/
> > Signed-off-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
> > ---
> > I guess you picking this up for your second PR makes the most sense
> > Palmer?

Yep, except it crashes b4

$ b4 shazam -lts https://lore.kernel.org/all/20230429-trilogy-jolly-12bf5c53d62d@spud/
Grabbing thread from lore.kernel.org/all/20230429-trilogy-jolly-12bf5c53d62d%40spud/t.mbox.gz
Analyzing 2 messages in the thread
Checking attestation on all messages, may take a moment...
Traceback (most recent call last):
 File "/home/palmer/.local/src/b4/b4/command.py", line 383, in <module>
   cmd()
 File "/home/palmer/.local/src/b4/b4/command.py", line 366, in cmd
   cmdargs.func(cmdargs)
 File "/home/palmer/.local/src/b4/b4/command.py", line 100, in cmd_shazam
   b4.mbox.main(cmdargs)
 File "/home/palmer/.local/src/b4/b4/mbox.py", line 713, in main
   make_am(msgs, cmdargs, msgid)
 File "/home/palmer/.local/src/b4/b4/mbox.py", line 101, in make_am
   am_msgs = lser.get_am_ready(noaddtrailers=cmdargs.noaddtrailers,
 File "/home/palmer/.local/src/b4/b4/__init__.py", line 552, in get_am_ready
   checkmark, trailers, attcrit = lmsg.get_attestation_trailers(attpolicy, maxdays)
 File "/home/palmer/.local/src/b4/b4/__init__.py", line 1319, in get_attestation_trailers
   for attestor in self.attestors:
 File "/home/palmer/.local/src/b4/b4/__init__.py", line 1158, in attestors
   self._load_patatt_attestors()
 File "/home/palmer/.local/src/b4/b4/__init__.py", line 1261, in _load_patatt_attestors
   patatt_config = patatt.get_config_from_git(r'patatt\..*', multivals=['keyringsrc'])
AttributeError: module 'patatt' has no attribute 'get_config_from_git'

So I probably need to just go update my setup, I've got a bunch of wacky stuff.
I'll try and remember to do so, but I'm going to scrub through other bits
first...

Reviewed-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>

> > CC: Palmer Dabbelt <palmer@xxxxxxxxxxx>
> > CC: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> > CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> > CC: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxx>
> > CC: Lukas Bulwhan <lukas.bulwhan@xxxxxxxxx>
> > CC: linux-riscv@xxxxxxxxxxxxxxxxxxx
> > CC: linux-kernel@xxxxxxxxxxxxxxx
> > ---
> >  arch/riscv/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> > index 5c88ac4b52be..e1bdb3fb16cc 100644
> > --- a/arch/riscv/Kconfig
> > +++ b/arch/riscv/Kconfig
> > @@ -46,9 +46,9 @@ config RISCV
> >  	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
> >  	select ARCH_WANT_FRAME_POINTERS
> >  	select ARCH_WANT_GENERAL_HUGETLB if !RISCV_ISA_SVNAPOT
> > -	select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP
> >  	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
> >  	select ARCH_WANT_LD_ORPHAN_WARN if !XIP_KERNEL
> > +	select ARCH_WANT_OPTIMIZE_VMEMMAP
> >  	select ARCH_WANTS_THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE
> >  	select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU
> >  	select BUILDTIME_TABLE_SORT if MMU
> > --
> > 2.39.2