From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D449EC0032E for ; Wed, 25 Oct 2023 16:37:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 460CE6B0348; Wed, 25 Oct 2023 12:37:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 411156B0349; Wed, 25 Oct 2023 12:37:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D9616B034A; Wed, 25 Oct 2023 12:37:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 217246B0348 for ; Wed, 25 Oct 2023 12:37:09 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EF9A580420 for ; Wed, 25 Oct 2023 16:37:08 +0000 (UTC) X-FDA: 81384538536.08.BDF73C9 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 3F77AA0020 for ; Wed, 25 Oct 2023 16:37:07 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QhcXYLyJ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of nathan@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=nathan@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698251827; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=q5ezZdR8fMreanAQtKU+XlxcCRDaf5XS7vK5/yiWUNk=; b=Schw+N3GlIHItdxIFpBqtIx3Yrxu+dNpA+DJzH3kY9xI+BcMWBp1qVi0FKd7HXjEngTXW+ SWcO5Pix0EAqZjvwtv5XHdx2FqKI2GE7pDV0J1i1A3UPMovGHOuHjFqNCdhfbjoLN6j7uf A/LB+xy+98+7v0fMcLGmSIgkBXDDWpw= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QhcXYLyJ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of nathan@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=nathan@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698251827; a=rsa-sha256; cv=none; b=3z4v3LthQowsMfD2TlXSEph3wBwQ0a7h2OCrpyxOTHNobI5TR8Mf4QT8VbPQwppkieSZhI 8iFz6S18yv+ulHhfSfzQbtj2iQH7LZMAishbPydPj/zv8lVqcq9C61o2jS8FaneOWfD17u BYoqkX7Onmj+7o3JlW4Vd5UCxAb9Geg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 312DE61DFA; Wed, 25 Oct 2023 16:37:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 348AEC433C8; Wed, 25 Oct 2023 16:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698251825; bh=VdyLXFY2COwTup0JeI2oLNyMXxJRLaNxrKR5990fVf4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QhcXYLyJu+qAgCZft4rhdjp6kWRAogyk6L1gQArj5SlwRLnY/3dF3Fs74RC2/21MO FFcvCBgVDvZN+hPw7u+QX8Dq3+ffR8Qu18+YkC8a1N0ryDnnYQEXaK/z+IU5aP/CTT 5uswnuseVTehS6Sl3Z8n4JTAYynBvj+jZ8rBDJHMq/ze9uxNrYNF3iKWQTpp0wII+/ WAZxTB6dlWC7Is/7v7V3VRLKH9tOQrc/qDY8isY2PkIrge4cP0sshQ5PGciEP4sEXy H9fJSuT8Tqakysg3S5O/ZGTMBpu7udKH+kIsQO2lYnDpqWZEP6ZfGYkvBB+6qBR6RT D2xEkgLJf/KuA== Date: Wed, 25 Oct 2023 09:37:03 -0700 From: Nathan Chancellor To: Kefeng Wang Cc: Andrew Morton , linux-mm@kvack.org, Christoph Hellwig , linux-riscv@lists.infradead.org Subject: Re: [PATCH] mm: cma: report correct node id Message-ID: <20231025163703.GA2440148@dev-arch.thelio-3990X> References: <20231019013253.2792048-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231019013253.2792048-1-wangkefeng.wang@huawei.com> X-Rspamd-Queue-Id: 3F77AA0020 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: asktd6p8f5b85zr1qngwc1cxwr37hfji X-HE-Tag: 1698251827-238954 X-HE-Meta: U2FsdGVkX1++DiktOa0n9XUPwOzohAPm+BAwb2bg5NWogm+Y0zSHk0V91f5bGkvw/GkO/CxLOGLpSTaXg9J5RYPvJNHMrY/h+Cotm/X6Gglgv/2enTJO0MIdO5O43NQs2DetWkf451jt8snZkuTeb+xQhN921EYgQ+AByXMuIH2kvz7BT6hdmU7W2m32nrNJhp7WYD9VJ6SaL6HJJr/TLp5EhuPXPY/WPIaqzEnrwM/hwsgpGxAURN7r07s8pGQVE06jXcyXFMMNVyxAKG/TZJ8ykgCSDIMECF+HqmTvWRstsx3dGlUayaLWY5orcQVinmHS8bx2E8csStwAFdAmJ6tpt2vd1sAsSnT0JUYzSAB7AEjpWCDYOytNeBdQuONIBnsYyJXLU+F5JjZbkNka0a7nzoICDFT3NuBczYj/RrlPJy+VucRPlTinrviOEtnMNzxo/4Oalpcu/veSVC5gQaoiOnFtQE+hwR4h0TBYsEZ0aaddaQtO91juZ0EcAdqzZcZpAvTDviSsY8OJKHiZbqmFfjer5Jfd47M/gyV98VazUjIIkDqDHtA1clwvKdslA7MCpekAmM3LkVvlks+YbgJOtXZ6+Z66akq1BQI9MnkjanNiJNOcBwEp0hukD34msfRPmu0u7Y5p23L8hSq6xfr5FyqZO+r2BPaVObzCV9OwgpNEi7WiMaSsv4cQ0uoK07wd2rHEVkOPub8FhR36ZH3FRn11oZ/GZDV4HREbLRG4ModlGQW+GR/984A3PzyKz3E5trYjPsKm8TsTfkIhE0AkmTVat/Mj/5Nrq4yIvnnm0y8vNLWWme3U5nvSupdDTWusd/lYmLZINPsm8nHrMefGnTL5WGnqX3nD+Y+y594I7KVQ3lxtk6cc7VSWDRL8QQQpFUIE3rU4hZ0CMahj2AmRLWxl4KuNGMb3iWxv0fA/L6I2cqgLpGGeS4N39S5MgV1jDCB7VPWiEqiNR1I PpHb0kQ+ z74TRGu1abHdk1y6jmYkrY0LAiO94lfmza0GbNV37cFyzxluh0Rb4IpFSQ2a/ceGFRZCHzmnrb1zcsDe6fK0nopgyQySf/vha7ltOXEHSyOV03rA/tTR56qw2IHdkdiKRMdW7VYeonX4CEsFXM+Tj6BkVD6x9HhPuertwbM3lJZcr617XRv849ZCYttt2Tv2SlGvD/0g0eXSyAv2bfK827axTu6Ek6O8h2LCke4kQGmKC1jo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Hi Kefeng, On Thu, Oct 19, 2023 at 09:32:53AM +0800, Kefeng Wang wrote: > Use early_pfn_to_nid() to get correct node id from base instead of > the default NUMA_NO_NODE in cma_declare_contiguous_nid(). > > Signed-off-by: Kefeng Wang > --- > mm/cma.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/mm/cma.c b/mm/cma.c > index 2b2494fd6b59..97c27e5fe1a2 100644 > --- a/mm/cma.c > +++ b/mm/cma.c > @@ -375,6 +375,9 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, > if (ret) > goto free_mem; > > + if (nid == NUMA_NO_NODE) > + nid = early_pfn_to_nid(PHYS_PFN(base)); > + > pr_info("Reserved %ld MiB at %pa on node %d\n", (unsigned long)size / SZ_1M, > &base, nid); > return 0; > -- > 2.27.0 > I bisected a RISC-V boot failure in QEMU to this change in -next. It happens with OpenSUSE's RISC-V configuration [1], which I was able to narrow down to the follow configurations on top of defconfig: CONFIG_ACPI_SPCR_TABLE=y CONFIG_CMA=y CONFIG_DEFERRED_STRUCT_PAGE_INIT=y CONFIG_DMA_CMA=y CONFIG_NUMA=y To easily reproduce: $ echo 'CONFIG_ACPI_SPCR_TABLE=y CONFIG_CMA=y CONFIG_DEFERRED_STRUCT_PAGE_INIT=y CONFIG_DMA_CMA=y CONFIG_NUMA=y' >kernel/configs/repro.config $ make -skj"$(nproc)" ARCH=riscv CROSS_COMPILE=riscv64-linux- defconfig repro.config Image $ qemu-system-riscv64 \ -display none \ -nodefaults \ -bios default \ -M virt \ -append earlycon \ -kernel arch/riscv/boot/Image \ -initrd riscv-rootfs.cpio \ -m 512m \ -serial mon:stdio OpenSBI v1.3.1 ... Without CONFIG_ACPI_SPCR_TABLE=y, there is a visible crash. [ 0.000000] Linux version 6.6.0-rc7-next-20231025 (nathan@dev-fedora.c3-large-arm64) (riscv64-linux-gcc (GCC) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP Wed Oct 25 16:14:59 UTC 2023 ... [ 0.000000] mem auto-init: stack:all(zero), heap alloc:off, heap free:off [ 0.000000] page:ff1c000002200000 is uninitialized and poisoned [ 0.000000] page dumped because: VM_BUG_ON_PAGE(1 && PageCompound(page)) [ 0.000000] ------------[ cut here ]------------ [ 0.000000] kernel BUG at include/linux/page-flags.h:493! [ 0.000000] Kernel BUG [#1] [ 0.000000] Modules linked in: [ 0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 6.6.0-rc7-next-20231025 #1 [ 0.000000] Hardware name: riscv-virtio,qemu (DT) [ 0.000000] epc : __free_pages_core+0x78/0x126 [ 0.000000] ra : __free_pages_core+0x78/0x126 [ 0.000000] epc : ffffffff8018dd8e ra : ffffffff8018dd8e sp : ffffffff81403d40 [ 0.000000] gp : ffffffff815013a0 tp : ffffffff8140db00 t0 : 6d75642065676170 [ 0.000000] t1 : 0000000000000070 t2 : 706d756420656761 s0 : ffffffff81403d50 [ 0.000000] s1 : 0000000000000004 a0 : 000000000000003c a1 : ffffffff814866a8 [ 0.000000] a2 : 0000000000000000 a3 : 0000000000000001 a4 : 0000000000000000 [ 0.000000] a5 : 0000000000000000 a6 : 0000000000000008 a7 : 0000000000000038 [ 0.000000] s2 : 0000000000088000 s3 : ff1c000002200000 s4 : 0000000000000009 [ 0.000000] s5 : 00000000ffffffff s6 : 0000000000081800 s7 : 0000000000088200 [ 0.000000] s8 : 00000000000001c0 s9 : 0040000000000000 s10: ffffffff81500bdd [ 0.000000] s11: ffffffff81500bdc t3 : ffffffff81515aa7 t4 : ffffffff81515aa7 [ 0.000000] t5 : ffffffff81515aa8 t6 : ffffffff81403b58 [ 0.000000] status: 0000000200000100 badaddr: 0000000000000000 cause: 0000000000000003 [ 0.000000] [] __free_pages_core+0x78/0x126 [ 0.000000] [] memblock_free_pages+0x52/0x62 [ 0.000000] [] memblock_free_all+0x1fc/0x27e [ 0.000000] [] mem_init+0x34/0x22c [ 0.000000] [] mm_core_init+0x116/0x2d0 [ 0.000000] [] start_kernel+0x3c6/0x742 [ 0.000000] Code: 0405 8399 8b85 d7f1 9597 00e2 8593 2ae5 90ef e5dd (9002) 6597 [ 0.000000] ---[ end trace 0000000000000000 ]--- [ 0.000000] Kernel panic - not syncing: Fatal exception in interrupt The rootfs is available at [2] if necessary. If there is any more information I can provide or patches I can test, I am more than happy to do so. [1]: https://github.com/openSUSE/kernel-source/raw/master/config/riscv64/default [2]: https://github.com/ClangBuiltLinux/boot-utils/releases Cheers, Nathan