From nobody Thu Apr 9 07:18:19 2026 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D94563DA7EC for ; Tue, 10 Mar 2026 08:26:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773131181; cv=none; b=h1Ni4DqnUXiJ7awJNUmlgcHsM4rGKlld4IHm6ze1ZZnTut7C6jZROT4sgRAs14GGGn4jckga3Z55u4B7mzLaqXavkjk7WfQ0Af4wEifw9mx9lIWLcW/C8DKQ0skACwyxE0l/0orEgdka7dfBLB+lYbeA2te5Ynj+6aQBLvYqB+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773131181; c=relaxed/simple; bh=L2aFGl45Sm1EXSev0PqbaMnwINEit3+uIFuQey6/Lvc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=E1wYjWAUa0r9Q/N+7DlNcWkONZ6VtyhjbBNuAErkfBgbqaJMmx0Yec+xJjgnCZiEFRE38R5IxvHXoezSRbkKUNyUx4ZHdq4sCA1nEh8SK63AO6wUh9r0Qn1MzYT794lCiYy3CX5kITMAazhhWlPN7pi2Cb4ThIl1IgnXZGDPl9M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from [127.0.0.2] (unknown [210.73.43.101]) by APP-03 (Coremail) with SMTP id rQCowABXO+KF1a9pJYQ7Cg--.20420S2; Tue, 10 Mar 2026 16:25:41 +0800 (CST) From: Vivian Wang Date: Tue, 10 Mar 2026 16:25:33 +0800 Subject: [PATCH] riscv: patch: Avoid early page_to_phys() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260310-riscv-sparsemem-alternatives-fix-v1-1-659d5dd257e2@iscas.ac.cn> X-B4-Tracking: v=1; b=H4sIAH3Vr2kC/yWNQQ6CMBAAv0L27JoWFANfMZiUuugmFnC3NiYNf 7eR48xhJoOSMCn0VQahxMrLXMAeKvBPNz8I+V4YalO3prEGhdUn1NWJUqCA7hVJZhc5keLEX5w 6cuZsR9t2JyiZVajo/+I67Cz0/pRT3CWMTgn9EgLHvkqXY5n45pY3GLbtB5ExDfmhAAAA X-Change-ID: 20260310-riscv-sparsemem-alternatives-fix-f9ea051b1694 To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Andrew Morton , "Mike Rapoport (Microsoft)" Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , Vivian Wang X-Mailer: b4 0.14.3 X-CM-TRANSID: rQCowABXO+KF1a9pJYQ7Cg--.20420S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww4rWr13tw13uFWxZFW7twb_yoW5Jry7pF 4Iyw1rJFW5JF4rJ3y7Jw1kZF15AwnagrWrWF9Fg3WFyw4qvrWrGwnYg347ZF9Iqr109w42 yr4YyF1Y93WUX37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9K14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUAVWUtwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v n2kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCY02Avz4vE14v_GFyl42xK82IYc2Ij64vIr4 1l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK 67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI 8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAv wI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14 v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfU0rWFUUUUU X-CM-SenderInfo: pzdqw2pxlnt03j6l2u1dvotugofq/ Similarly to commit 8d09e2d569f6 ("arm64: patching: avoid early page_to_phys()"), avoid using phys_to_page() for the kernel address case in patch_map(). Since this is called from apply_boot_alternatives() in setup_arch(), and commit 4267739cabb8 ("arch, mm: consolidate initialization of SPARSE memory model") has moved sparse_init() to after setup_arch(), phys_to_page() is not available there yet, and it panics on boot with SPARSEMEM on RV32, which does not use SPARSEMEM_VMEMMAP. Reported-by: Thomas Wei=C3=9Fschuh Closes: https://lore.kernel.org/r/20260223144108-dcace0b9-02e8-4b67-a7ce-f2= 63bed36f26@linutronix.de/ Fixes: 4267739cabb8 ("arch, mm: consolidate initialization of SPARSE memory= model") Suggested-by: Mike Rapoport Signed-off-by: Vivian Wang Acked-by: Mike Rapoport (Microsoft) Tested-by: Thomas Wei=C3=9Fschuh --- checkpatch.pl complains about the BUG_ON which was already there --- arch/riscv/kernel/patch.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/riscv/kernel/patch.c b/arch/riscv/kernel/patch.c index db13c9ddf9e3..16b243376f36 100644 --- a/arch/riscv/kernel/patch.c +++ b/arch/riscv/kernel/patch.c @@ -42,19 +42,20 @@ static inline bool is_kernel_exittext(uintptr_t addr) static __always_inline void *patch_map(void *addr, const unsigned int fixm= ap) { uintptr_t uintaddr =3D (uintptr_t) addr; - struct page *page; + phys_addr_t phys; =20 - if (core_kernel_text(uintaddr) || is_kernel_exittext(uintaddr)) - page =3D phys_to_page(__pa_symbol(addr)); - else if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX)) - page =3D vmalloc_to_page(addr); - else + if (core_kernel_text(uintaddr) || is_kernel_exittext(uintaddr)) { + phys =3D __pa_symbol(addr); + } else if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX)) { + struct page *page =3D vmalloc_to_page(addr); + + BUG_ON(!page); + phys =3D page_to_phys(page) + offset_in_page(addr); + } else { return addr; + } =20 - BUG_ON(!page); - - return (void *)set_fixmap_offset(fixmap, page_to_phys(page) + - offset_in_page(addr)); + return (void *)set_fixmap_offset(fixmap, phys); } =20 static void patch_unmap(int fixmap) --- base-commit: 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681 change-id: 20260310-riscv-sparsemem-alternatives-fix-f9ea051b1694 Best regards, --=20 Vivian "dramforever" Wang