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 7BEFDC41535 for ; Tue, 19 Dec 2023 16:36:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D1976B0075; Tue, 19 Dec 2023 11:36:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0812D6B0078; Tue, 19 Dec 2023 11:36:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB2566B007B; Tue, 19 Dec 2023 11:36:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DACEE6B0075 for ; Tue, 19 Dec 2023 11:36:55 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 694B9A0141 for ; Tue, 19 Dec 2023 16:36:55 +0000 (UTC) X-FDA: 81584121990.22.EFDCC2B Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf10.hostedemail.com (Postfix) with ESMTP id 2E146C0025 for ; Tue, 19 Dec 2023 16:36:52 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BJt4o73u; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf10.hostedemail.com: domain of nathan@kernel.org designates 145.40.73.55 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=1703003813; 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=yDd7/MTAYQaKXcbQ7jfrrUgf/DVp2hLNtu6Y33rEoI0=; b=1lanKdSN95mv+3ZknaYFKZrIeYi7lApO9mNZhfxXSw6MQLkt1z4Khhp3cgOLE8lRrBf0/f jpQ/V+/M+dwNlNUkf+VYxLGGs5BSqx3ICD+wFxHsguHbffMlPqEZ63or4gZ8FYr+wJWVIn ivDHXB7/E9KNRbgORf49DRdiPdVrLjk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BJt4o73u; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf10.hostedemail.com: domain of nathan@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=nathan@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703003813; a=rsa-sha256; cv=none; b=PwSSm0VKhT3yjTF9Kbx8WItGmXgkdEaDmj68FjmfF9wrSiOy2UgXYhebvkK6602O6n+rRR xkQWXnzRwRe+DoP1wr4PMuy7CaaTiKflOqby8fjcxAZPC3AUsZP9/ruMnaGQeLFMBMCQ2d iY2Vt2btzCA3qXdPGheCTj4jfsFNP9Q= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 8290FCE19F6; Tue, 19 Dec 2023 16:36:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1049C433C9; Tue, 19 Dec 2023 16:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703003806; bh=6ZE1ZWL+Q3XfV/BNZf6ItPtOJDRd9vjSskX9Wb4d1fA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BJt4o73uXCVxhYQStzPU9GZ1T2dfQ3ZN7KI957oAJIJPYoUaDpj3yIVuBPHCTXnIK /Xc0owDprCquptYak5XeHWW5j9cpk/0QRoflm4AZoma9e/TvdY4Mhawi32F2agDak1 SATdmuFIaoFQxTgdHuWoJn7bjvx5FQ9DkHQUu3a/1Ts2gipvDwU5/Hz0HItXRA6VSI X7hfa1jGH03H5jt7d9Vb/1i9+FWl1iiDZELXcWM5f8UsFwIP5M3EXc51MofTvlu8e1 Dkt8tYS5avfmmKFJ3H1BMDE90ip0gGZ7M+9Cs5U34IIsUcTrBEoDPylFilgDsADnW7 GT0VdOq+XCj/Q== Date: Tue, 19 Dec 2023 09:36:44 -0700 From: Nathan Chancellor To: Kent Overstreet Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, tglx@linutronix.de, x86@kernel.org, tj@kernel.org, peterz@infradead.org, mathieu.desnoyers@efficios.com, paulmck@kernel.org, keescook@chromium.org, dave.hansen@linux.intel.com, mingo@redhat.com, will@kernel.org, longman@redhat.com, boqun.feng@gmail.com, brauner@kernel.org Subject: Re: [PATCH 15/50] kernel/numa.c: Move logging out of numa.h Message-ID: <20231219163644.GA345795@dev-arch.thelio-3990X> References: <20231216024834.3510073-1-kent.overstreet@linux.dev> <20231216032651.3553101-1-kent.overstreet@linux.dev> <20231216032651.3553101-5-kent.overstreet@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231216032651.3553101-5-kent.overstreet@linux.dev> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2E146C0025 X-Stat-Signature: kssptz5ms18w61dzjhuiogmeogdbhmo5 X-Rspam-User: X-HE-Tag: 1703003812-658353 X-HE-Meta: U2FsdGVkX1+MOJNqGH2zpHiyMtLY11mWiaFEx2kZD5BbJ/EUYjATG6k+5LWv+rFlrrE9gOMNg2DSS+5lF0udvS8ndHUsOGBDcXheuoDyai6QFA3kf9vrdt/4vlv8YD0WROIbt5FJYvH67HWZ6Xe1ic0atbC/rcd4tYxLkDM9ahRWZCpCtMmAgTdYv8UbhJYVFvxzX09XiWjsc2QcB9W+9UXcJgmEz5zygNaZoBNDIDZPyVVSHOdURRWXGgILQCpblDvrAZHSN1k9ClDBkhaHen9CEB2r9Mn5Qah5N5tIgjl2xbZgPeFw45SvA85iDGFzn3vImbgeqhiL2TAfaL3aY3g7eK7SqIX/PLK7u1J3bWauIgyOiD6wkqGbCbVNCXEf9+aSNtg0H4L94Pf4SKTC3Ga+OeAzkxAk+KFWBp6CWGqyBAdUGLtgsj4YNMjHe3kqrVZdF3yNasMyCzAtrlbyT6wf6lD2T2PdbizkGyu9hSC4YqVQwLGWp9F3CACDXTw/DtdvqEJ/UMO/ATbJi9JBR5kp3mIxwKP668Og8CarINARpNYSQoHnqO3FJVm1ikgbRydXnkJve0Pjsq1ZETZ9aN2Pu8YndpCxR3ohpujveN4ngGVw513ZwgVFV9k4DJQk36zywHRqpYhu79/6CTA9Oubw4D3PDxpUJJwULqPZADs2Jl5JnWTb++GIMk6jFw/cB0ARWfrdT6cUXPQa+HoeiWGuWXCwNvCE1bNOQOIc2JriKgAzTKT9Bu5lSpw7UQktaknB/T8pDqZJvYo4igtyAD90sxvuOw2m6lgK7UlKLUJDlNr/kf+dRIvntQy261zZGnoqlu2craVyNMGkWG7o5BfTouLvbTutNnQjQVvXRCsPHnc2mABvCQT1wDWdZYnovxmIbSF/rUE5sams4wjuTbrbjS7Z01uCOVfIeWzffRSqdaCLsEdKY6UGeKBYfA4oBP91qxDLYmd8eux54Z1 4RZ8Mlel /WybYZp0YZ/A65j+R3Yn1eBK2i0I9Ww7G0L472nrllqJCMACH6FXSK/CxGymzHxs8OygHRb1nlq2c4MBNalGSlsrNsvh1Ajs+1isofanqUn9VeMl4F/VwQZgWBdiVEg5rn9+5yDlU14nKr6SRE5IxgezJ/AzL/OjQdLQAoCLSfD+JFcEFe9N9aGZX9KlycOw2XcZHBarAbY3xSl5RItDtktMcbPscVokslfyxmq5NIaEoyCUvvgwzvpFop686zH5LP/0FhHbyCUVupWY= 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: On Fri, Dec 15, 2023 at 10:26:14PM -0500, Kent Overstreet wrote: > Moving these stub functions to a .c file means we can kill a sched.h > dependency on printk.h. > > Signed-off-by: Kent Overstreet > --- > include/linux/numa.h | 18 +++++------------- > kernel/Makefile | 1 + > kernel/numa.c | 24 ++++++++++++++++++++++++ > 3 files changed, 30 insertions(+), 13 deletions(-) > create mode 100644 kernel/numa.c > > diff --git a/include/linux/numa.h b/include/linux/numa.h > index a904861de800..aeab3d9f57ae 100644 > --- a/include/linux/numa.h > +++ b/include/linux/numa.h > @@ -22,34 +22,26 @@ > #endif > > #ifdef CONFIG_NUMA > -#include > #include > > /* Generic implementation available */ > int numa_nearest_node(int node, unsigned int state); > > #ifndef memory_add_physaddr_to_nid > -static inline int memory_add_physaddr_to_nid(u64 start) > -{ > - pr_info_once("Unknown online node for memory at 0x%llx, assuming node 0\n", > - start); > - return 0; > -} > +int memory_add_physaddr_to_nid(u64 start); > #endif > + > #ifndef phys_to_target_node > -static inline int phys_to_target_node(u64 start) > -{ > - pr_info_once("Unknown target node for memory at 0x%llx, assuming node 0\n", > - start); > - return 0; > -} > +int phys_to_target_node(u64 start); > #endif > + > #ifndef numa_fill_memblks > static inline int __init numa_fill_memblks(u64 start, u64 end) > { > return NUMA_NO_MEMBLK; > } > #endif > + > #else /* !CONFIG_NUMA */ > static inline int numa_nearest_node(int node, unsigned int state) > { > diff --git a/kernel/Makefile b/kernel/Makefile > index 3947122d618b..ce105a5558fc 100644 > --- a/kernel/Makefile > +++ b/kernel/Makefile > @@ -114,6 +114,7 @@ obj-$(CONFIG_SHADOW_CALL_STACK) += scs.o > obj-$(CONFIG_HAVE_STATIC_CALL) += static_call.o > obj-$(CONFIG_HAVE_STATIC_CALL_INLINE) += static_call_inline.o > obj-$(CONFIG_CFI_CLANG) += cfi.o > +obj-$(CONFIG_NUMA) += numa.o > > obj-$(CONFIG_PERF_EVENTS) += events/ > > diff --git a/kernel/numa.c b/kernel/numa.c > new file mode 100644 > index 000000000000..c24c72f45989 > --- /dev/null > +++ b/kernel/numa.c > @@ -0,0 +1,24 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > + > +#include > +#include > + > +/* Stub functions: */ > + > +#ifndef memory_add_physaddr_to_nid > +int memory_add_physaddr_to_nid(u64 start) > +{ > + pr_info_once("Unknown online node for memory at 0x%llx, assuming node 0\n", > + start); > + return 0; > +} > +#endif > + > +#ifndef phys_to_target_node > +int phys_to_target_node(u64 start) > +{ > + pr_info_once("Unknown target node for memory at 0x%llx, assuming node 0\n", > + start); > + return 0; > +} > +#endif > -- > 2.43.0 > These need EXPORT_SYMBOL_GPL() now like the architecture specific implementations because they are no longer inlined. My arm64 builds fail with: ERROR: modpost: "memory_add_physaddr_to_nid" [drivers/acpi/nfit/nfit.ko] undefined! ERROR: modpost: "phys_to_target_node" [drivers/acpi/nfit/nfit.ko] undefined! ERROR: modpost: "memory_add_physaddr_to_nid" [drivers/virtio/virtio_mem.ko] undefined! ERROR: modpost: "phys_to_target_node" [drivers/dax/dax_cxl.ko] undefined! ERROR: modpost: "memory_add_physaddr_to_nid" [drivers/dax/dax_cxl.ko] undefined! ERROR: modpost: "phys_to_target_node" [drivers/cxl/cxl_acpi.ko] undefined! ERROR: modpost: "memory_add_physaddr_to_nid" [drivers/cxl/cxl_pmem.ko] undefined! ERROR: modpost: "phys_to_target_node" [drivers/cxl/cxl_pmem.ko] undefined! ERROR: modpost: "memory_add_physaddr_to_nid" [drivers/hv/hv_balloon.ko] undefined! Cheers, Nathan