From patchwork Sat Dec 16 03:26:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 13495379 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 ED2F5C4332F for ; Sat, 16 Dec 2023 03:27:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EAE116B04FB; Fri, 15 Dec 2023 22:27:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E5B9A6B04FD; Fri, 15 Dec 2023 22:27:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE0DB6B04FE; Fri, 15 Dec 2023 22:27:12 -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 ADDA56B04FB for ; Fri, 15 Dec 2023 22:27:12 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8FC001A04AA for ; Sat, 16 Dec 2023 03:27:12 +0000 (UTC) X-FDA: 81571245504.06.B851C50 Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) by imf29.hostedemail.com (Postfix) with ESMTP id DC930120004 for ; Sat, 16 Dec 2023 03:27:10 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=wEL1M8P7; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf29.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.171 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702697231; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lSEfcPVLSVdGjudbUJ8Sggq3p7WbAaRsO8gXu0Omim0=; b=XTjlzhiMLTc9uI4+6Q3M/77La+Xy0N7UM0UQJ3k3pA0fHjJwe6G45L7tQjA3orP/Tji4CF z+rKUvO4i79vkYkY0gJn0Amr0TRyCSof/DY0DSP2uOhk8Tcx8ARCfe51w6BylCmGJM0LyG uiD7quTDC0vXVeCs4qfDJqIpWKI0e2o= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=wEL1M8P7; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf29.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.171 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702697231; a=rsa-sha256; cv=none; b=XbU1BFucwblTvfqDhE+1yVHWC7q5ek9fWE8jEp7hH+CoPfW152Ej/15xogyF6ZU4COQA0k p5qIyGiROBYxZHAMvGyOlArayjQEtLlD0fH6qrX9v29zmyc2bX361wOmGIW+YKA6YjaTGc DYFk8BE+mKwH6eo0wr2MJkU5RUXqDuc= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1702697229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lSEfcPVLSVdGjudbUJ8Sggq3p7WbAaRsO8gXu0Omim0=; b=wEL1M8P7dGXDYkqa7TZ0623+1nRbflZcjURNMTTrfHumsxxvoj66ZAcvpFCSzlBCmznGOS ShvM+xfySrI3hUK03bi1hMOQo88TQq4lz2lpKcqo9kn0Iqn4roIrmWzq8nWh/E7pzm5vVj gHdLwG+8+qW+yBjQLDhmmlyg1zl3eKY= From: Kent Overstreet To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: Kent Overstreet , 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: [PATCH 15/50] kernel/numa.c: Move logging out of numa.h Date: Fri, 15 Dec 2023 22:26:14 -0500 Message-ID: <20231216032651.3553101-5-kent.overstreet@linux.dev> In-Reply-To: <20231216032651.3553101-1-kent.overstreet@linux.dev> References: <20231216024834.3510073-1-kent.overstreet@linux.dev> <20231216032651.3553101-1-kent.overstreet@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: DC930120004 X-Stat-Signature: er9uy6x6fgfcxwofkoerzr1ams5zh85r X-HE-Tag: 1702697230-620066 X-HE-Meta: U2FsdGVkX1+lusvpZoFB2qbtotwgUI6WXd0Os620OinCHHbRd2/tUejjfcMyZit/Pl2OR6MMTVnvYYtGQXDSmjKhnb5Vwg/V2VHHbVZsOQ4MlHaBc2nVwBLOjjHe1M3fCyVcNWpVh7aPofYIwsZbrCqjnpRl1z8KRaeu05yyo+hkMnsHk3MNtdU/i29lrxoMnlFZQbFWu/zcKSakEbGB91nBCDUmYqfXxksME/LNNkPZ3HcvCOUFITp9trdoWkt0pyht5GB8Hdi01/Wk5b74tCNVHk+tmHuWLJK5r4dDX90Mh2kCMGmyfU6fv0HHwXGVn68w5i4+b4FB2AWfRLsHHEUzQXDjyYQIlXp/hNoJULdV0EXTfpMgHn7Kz4woSeDGX2+NlrQSVCYGPA6aHnaVjp42NTp/rWLbwajdbmLMMMXSBeVviIxTZUvZe3wPLvwysZeko7aioEcXjZyDG2yOBjXefyPg1/HWzO6wJYS4fnQZeMj8y5zN/srslgWqiS4FMbiIigLq0d+wYjTdLgHvztkmYvlmUd4lOC+yyuFgLGiSJaXnEYat45Mbp1ITOa7/wJLA3LY9PGY6l70r3NsOEuFVTQ5zFYqmmnLOLbmQEDa3cvVmevuLJYl2KP4OIk5k3yFBxXuIqTGLwxjOVDFSma7/hujrcLMknJ2z6VEiK/5nv4MbficMh1AlkiY5QOhdZfvHfRoX23p/6mA5gdeW9DHopKU0A0P7FL1TY+ThbcilvgMEAWOKMqqUg6DRV0gNKMaFCh2oJObB/XsmwwX5od0T3VsCYewrpAjqE+bT0TOL65vTqJz8TbuEiCteeQ+SmMm6hkSziXcCqVFryHYiwy6vxHcg4G2PxVKPNC9Lo0Wy4kYH7gHu8GaPEa6n8lvGkylDiyRiawuohnFm273NNjhx7fQ0bl8kqgTfIhcYoPJxsdZS/DPlskhF2nbmiDQVBWyYFhvVbPsK6OdaiLX rcfpOMyo PGPlSjnuLgjUwulKnwtzyDqdoKM+HsWia9YNRRZciGenSqr87p2NvpVPxQmMtLBMzjkpegFRCpuIn+cTMy5nvSxttBBx43TDRdO1qwwF3ifMAqik3fINEQEJpK5xhRmErAPZtx/hbc8HhoWw= 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: 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