Message ID | 20230429-trilogy-jolly-12bf5c53d62d@spud |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1488468vqo; Sat, 29 Apr 2023 02:41:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6G3v4pvMceYyaHvp51eGUCK84LmcN1gp9lM3LBb2c7dzNpkQkmAqxnV13BmKWTZTxAzNqx X-Received: by 2002:a05:6a20:9144:b0:f0:3e57:f42a with SMTP id x4-20020a056a20914400b000f03e57f42amr10392238pzc.44.1682761310528; Sat, 29 Apr 2023 02:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682761310; cv=none; d=google.com; s=arc-20160816; b=UP7GwD+9vuIAJedWjBHnIXyivCcBVskjoCczM6KGj/F/KRGbj8Ts6a47AwiQXp0mHS nNS0ks3LGVhuEpzUBZGAYUg9OelNWs2U4v4GVMgN686joKrKBunXuKefMaMNqxQ/7Bca gDK3a3Vtuye2ui/5pCzEURDqcNagyEsrXAtl87GetpDTH9y0F4KH7mQqQGbNkg0UG9W3 4cNgnL7iySEdokZtdAff3yC9DLoSpe50+NHWpAg9cy3UZUJUPAeamjdrA8MLAldNXOAV h9BkNDSSFLfvOIfQhKeiMPKrG6lveuw165g8xrF/AVIy+uL4aXHvbMdY0pcfXNHhijJ2 0Vzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5/C3U49h2pMlxtpS7xxhbMnR/p7P1CiiJgxO1nP9t0E=; b=I07oOQ4lS8LjyOHot/gbbeY5Wb0QD2o/Lc5FYUEr4imdqxvNJpFb2oiM2qugHO4O1d mtAQqo2QkkuLhNUjAU+bjQRVQz4BnJspcvnG9Hne5ohkWk0u02vok0gDt4L8feemqKhs lNuJ12cQx8NuRqjfxz9ES+Y0aEyYTUFYk5fnEXOcftv+iAaFAN0Tr9+PP5sd0I8ZXoub rzrsWCF4d9Q5X4joUBHdt8dtvxQXIxROjoyjC7NaSZXDLHOIDwgNqjeLe99pG1UOkSb4 Vu8V4BSneF8JJsDeZLw7+WhXqZsmSUdhp/j8EWyQC5ZKfQSNt0ZgEF1W332VB+aLsjn6 zSaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rIuKB6f9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c5-20020a6566c5000000b0051b4140f6cbsi23286340pgw.149.2023.04.29.02.41.34; Sat, 29 Apr 2023 02:41:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rIuKB6f9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230392AbjD2J2W (ORCPT <rfc822;chrisjones.unixmen@gmail.com> + 99 others); Sat, 29 Apr 2023 05:28:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230351AbjD2J2S (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 29 Apr 2023 05:28:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F13F91FED for <linux-kernel@vger.kernel.org>; Sat, 29 Apr 2023 02:28:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 90B2F61028 for <linux-kernel@vger.kernel.org>; Sat, 29 Apr 2023 09:28:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21F0EC433EF; Sat, 29 Apr 2023 09:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682760496; bh=VWFkSOEdLdYHiOdgaiiVB7fGkgZE49crp4dpjlI65Pc=; h=From:To:Cc:Subject:Date:From; b=rIuKB6f9FU/nOuER/hZBfRxBtPrbmVPSaatDgZSQTuMxIruWz+zyg6uN+AVpLrbwg ebwOVS4j6jzTn7iSCRogr8mssHL6IQJpzrdZgXPtY0jzlXNPSADDb/gCkRELWtQbvg 198idl0zmdk2zXNL3MdgLVggZpwemYkSF/PkPZz3OtEDz+UFMvRaRIl5PYoFTu2PLL Aj3fWqQpWcbf+LTJsyXEjfaQ+sOWgU9/0xBSkdT7Xy97Glwr+Ngjuh7jK+RjyGJmpH jQLwddcGImZH/FuEXb1J3e7p+Zta8GKtbhIgEx2hEBcUzq7hmpKj+uIfHWa3OYc3vt 9KTHdmaIMpZEg== From: Conor Dooley <conor@kernel.org> To: palmer@dabbelt.com Cc: conor@kernel.org, Conor Dooley <conor.dooley@microchip.com>, Lukas Bulwhan <lukas.bulwhan@gmail.com>, Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>, "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename Date: Sat, 29 Apr 2023 10:27:33 +0100 Message-Id: <20230429-trilogy-jolly-12bf5c53d62d@spud> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1730; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=za3FgcteiUKmO+H+px6+yeLYMnrjzvzxzBnY3YJjDjs=; b=owGbwMvMwCFWscWwfUFT0iXG02pJDCk+j5nlwlhrWx1mp2WnevlaT5OJLjq8msNet8duVwHP4 d/aD106SlkYxDgYZMUUWRJv97VIrf/jssO55y3MHFYmkCEMXJwCMJGY7YwML+Kf1SiVv3kqbHJq 8n7pBtX7Lk56rHmXVeo5lwq/CugNZ2S45nD2olPVyTt908PnnVt7gaOb+f0WE58jIsedd77gXn6 FDwA= X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764503123796686174?= X-GMAIL-MSGID: =?utf-8?q?1764503123796686174?= |
Series |
RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename
|
|
Commit Message
Conor Dooley
April 29, 2023, 9:27 a.m. UTC
From: Conor Dooley <conor.dooley@microchip.com> 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@gmail.com> Link: https://lore.kernel.org/linux-riscv/CAKXUXMyVeg2kQK_edKHtMD3eADrDK_PKhCSVkMrLDdYgTQQ5rg@mail.gmail.com/ Signed-off-by: Conor Dooley <conor.dooley@microchip.com> --- I guess you picking this up for your second PR makes the most sense Palmer? CC: Palmer Dabbelt <palmer@dabbelt.com> CC: Linus Torvalds <torvalds@linux-foundation.org> CC: Andrew Morton <akpm@linux-foundation.org> CC: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> CC: Lukas Bulwhan <lukas.bulwhan@gmail.com> CC: linux-riscv@lists.infradead.org CC: linux-kernel@vger.kernel.org --- arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Sat, Apr 29, 2023 at 10:27:33AM +0100, Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > 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@gmail.com> That should have been Lukas Bulwahn <lukas.bulwahn@gmail.com>. 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@mail.gmail.com/ > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > I guess you picking this up for your second PR makes the most sense > Palmer? > > CC: Palmer Dabbelt <palmer@dabbelt.com> > CC: Linus Torvalds <torvalds@linux-foundation.org> > CC: Andrew Morton <akpm@linux-foundation.org> > CC: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> > CC: Lukas Bulwhan <lukas.bulwhan@gmail.com> > CC: linux-riscv@lists.infradead.org > CC: linux-kernel@vger.kernel.org > --- > 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 >
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@microchip.com> >> >> 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@gmail.com> > > That should have been Lukas Bulwahn <lukas.bulwahn@gmail.com>. > 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@mail.gmail.com/ >> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> >> --- >> 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@rivosinc.com> >> >> CC: Palmer Dabbelt <palmer@dabbelt.com> >> CC: Linus Torvalds <torvalds@linux-foundation.org> >> CC: Andrew Morton <akpm@linux-foundation.org> >> CC: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> >> CC: Lukas Bulwhan <lukas.bulwhan@gmail.com> >> CC: linux-riscv@lists.infradead.org >> CC: linux-kernel@vger.kernel.org >> --- >> 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 >>
April 29, 2023 4:17 PM, "Palmer Dabbelt" <palmer@dabbelt.com> wrote: >>> 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... Indeed, you have a newer version of b4 without also updating the patatt dependency. If you're using b4 from git, you need to "git submodule update". Regards, -K
On Sat, 29 Apr 2023 14:48:18 PDT (-0700), konstantin.ryabitsev@linux.dev wrote: >> April 29, 2023 4:17 PM, "Palmer Dabbelt" <palmer@dabbelt.com> wrote: >>>> 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... > > Indeed, you have a newer version of b4 without also updating the > patatt dependency. If you're using b4 from git, you need to "git > submodule update". Thanks, it's fixed. This one's in the queue for testing, but it looks generally fine. Might be a bit slower than usual, as I'm also running the glibc tests.
On Sat, 29 Apr 2023 10:27:33 +0100, Conor Dooley wrote: > 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. > > Applied, thanks! [1/1] RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename https://git.kernel.org/palmer/c/26b0812f4cf8 Best regards,
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@microchip.com> >> >> 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@gmail.com> > > That should have been Lukas Bulwahn <lukas.bulwahn@gmail.com>. I think I got that right, but the email bounced. I'm not sure if it's just the list issues, though. > 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@mail.gmail.com/ >> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> >> --- >> I guess you picking this up for your second PR makes the most sense >> Palmer? >> >> CC: Palmer Dabbelt <palmer@dabbelt.com> >> CC: Linus Torvalds <torvalds@linux-foundation.org> >> CC: Andrew Morton <akpm@linux-foundation.org> >> CC: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> >> CC: Lukas Bulwhan <lukas.bulwhan@gmail.com> >> CC: linux-riscv@lists.infradead.org >> CC: linux-kernel@vger.kernel.org >> --- >> 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 >>
On 1 May 2023 23:52:58 IST, Palmer Dabbelt <palmer@dabbelt.com> wrote: >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@microchip.com> >>> >>> 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@gmail.com> >> >> That should have been Lukas Bulwahn <lukas.bulwahn@gmail.com>. > >I think I got that right, but the email bounced. I'm not sure if it's just the list issues, though. B4 probably just replied to the address in my original email, rather than the corrected one? > >> 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@mail.gmail.com/ >>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> >>> --- >>> I guess you picking this up for your second PR makes the most sense >>> Palmer? >>> >>> CC: Palmer Dabbelt <palmer@dabbelt.com> >>> CC: Linus Torvalds <torvalds@linux-foundation.org> >>> CC: Andrew Morton <akpm@linux-foundation.org> >>> CC: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> >>> CC: Lukas Bulwhan <lukas.bulwhan@gmail.com> >>> CC: linux-riscv@lists.infradead.org >>> CC: linux-kernel@vger.kernel.org >>> --- >>> 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 >>>
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