From patchwork Sat Apr 15 08:18:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13212334 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 1EE21C7619A for ; Sat, 15 Apr 2023 08:19:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A4B46B0072; Sat, 15 Apr 2023 04:19:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 754E26B0075; Sat, 15 Apr 2023 04:19:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 642A46B0078; Sat, 15 Apr 2023 04:19:21 -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 550D36B0072 for ; Sat, 15 Apr 2023 04:19:21 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 061B21A01A5 for ; Sat, 15 Apr 2023 08:19:21 +0000 (UTC) X-FDA: 80682925722.27.C682102 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id 67101C0006 for ; Sat, 15 Apr 2023 08:19:19 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Wl3gzEyp; spf=pass (imf22.hostedemail.com: domain of arnd@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681546759; 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:references:dkim-signature; bh=gAEm4JBQvUtYoi7XVUurDXdgopHiIxraeLyVgIrmR7A=; b=6cne5IJGl32jDnXPDinHgFTp5lr/RXRzyt9oYHCKhSJ9H4F5OHKcE2vh6AK09Z6JQh/XwB Gt6JKAJ70QeRuXlgxSesGMEnhtksINX/SEdy4B3xIwLD1jFApZGFOsX0IDs3I0F0rn9Q7f tqCF/w/5JJm77FuK5H3g2eBJUIaNS10= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Wl3gzEyp; spf=pass (imf22.hostedemail.com: domain of arnd@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681546759; a=rsa-sha256; cv=none; b=cFZ4L6ys96Sxpzf6dvBFYuCcpVbQwHpi6IJQ+tq7mDR6KRKt2rjO6rLihAdoPXM5dQxgSM zxzax1nWAETnoJYoBkIU3ekBloHhehJYnoKjSwsixT9+2kZH2T6IJUyC0THN5U/xH+b1D+ WkptiCSXvHlr1YBLaUE2SpEOSfwy/QQ= 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 64ABD60E92; Sat, 15 Apr 2023 08:19:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68DCEC433D2; Sat, 15 Apr 2023 08:19:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681546757; bh=ljAiPSwIhWGmapP/c1uNdTrp/qDU7fl0aVv/azO7YYc=; h=From:To:Cc:Subject:Date:From; b=Wl3gzEypngqcW08OZvjH6HF9OZf/zXny3K7LUCUsq++UnsVLaDKvBzCnhntZEYtQK AdB9V6nMsz4R1ufYFZULYMFVAZSDK8ynDrMXz1jq1KTK4udt9Q5xLqSIN9p4eTcs87 b50ZibD2Eh59IxclwgnAp1/U+qO7oK4EjJ0rv/gbAKKYQ+uqaqERJSJn1kGtIIFnr5 AHjH5ltIKRs+cDY9eMjqab2PHhVcroegZgBk10mO6WzgSLNbOP6m9LsjdE2kwul5XY kmklVMWmjC1IK0WvXsS3piYyalfFDaaEw79LF5x/x+nWKSBDnFHZuVKa4vLKWoXDlO a3MDw3OJUipSg== From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , llvm@lists.linux.dev, Vineet Gupta , Mike Rapoport , Nathan Chancellor , Nick Desaulniers , Tom Rix , David Hildenbrand , "Liam R. Howlett" , "Matthew Wilcox (Oracle)" , Suren Baghdasaryan , Naoya Horiguchi , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] [v2] mm: make arch_has_descending_max_zone_pfns() static Date: Sat, 15 Apr 2023 10:18:20 +0200 Message-Id: <20230415081904.969049-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 67101C0006 X-Rspam-User: X-Stat-Signature: k9oqx7typmknbbxzf6p5esttu1sx8x6q X-HE-Tag: 1681546759-939699 X-HE-Meta: U2FsdGVkX189KOKm+SsgoEZXjwwv6QhYJdxwZCeX9kbICW3rQ9XzI8lR5ZbYCNO3vkuqiArM3pRMLBnrftbi0rq/naMVKKnKsa8MkAt5kcl1+Onf4ulAIcV9yAUKdNfnJa5BLXTOsJPWwYRrzGqCOacqpNAaYbKGL3uWO4Om2G9t3oZgolK7oflmri9fdpU8Cc0Eo0g7Kf7ck0JP61tNtc3LMqX690vNZ0NN4vyuZHZFwZDRXlL7Q2ZxdOd+FJED+3txel3nRjziBHliAK0O3X+h4By1q05F0ftXkUQNK6WReoeeLfnDereZI1jJBwvb9EuHLXwu26LF7wzpyyU3I14VX/a2Fsejs6ufGG5SyESQTkTbbE3ZrLSoCWZ12nPK6gA4pNr9rEuy1PcNXNsKh/augiWS/79tAObnjdL82Y8USFVgIYFxiXl4BYyU173f3SeQgMZJG1yznKvaa/I6ZQxWfFM/DsC5AlhlZvD1hWSKDSpVaBLAEsjnIeGz+y/FPbA4mWBIh32PaysyYRlhyCaknJMUsaXg+FEaKtXrO7pbbyQKjfVk6BM5NlS52xRx8B8i0FUdB9qfPzZTwr2SRLfxvCuHTA6GMcvCif3P/2TELXfLk/QEvHKNmMqD9oCQVD0WLh07w67KctMGLVVpL36xSDcluDjg8ZQ+H0e/uRMR16ERX1Tx5iugLBeFozezflkOAbSftjhxHW0NJM9+BG/hR+Rdem+lAgSW21uocYa82GMGKM82UtgCxa0TrJfoLqJn8wAq40XTiu2Qxwn3+pVZ0/1SmIbMjYypUjl6hoB4v1OXkOyuAqc+ffZI15SBILAeW/WTIT8qt4EsblHqFYNx19DZrqFZ6RAzHAdqBehB1FpsNY42/GPG2fAeVYjXBZeij08lRfQxm5fe1iXzpZqgMUTbrx84uEABpDZrLF918+EZfHYsQLn2g/KO401qJ1WL5ALyUW8fyyuNMqT 4ZBsMsAN SrrwJ4aJw0sR5lHDi7rYxTUqebU+VUvU4QYw/QbNDT74txT0ZKlyM+cNWFYMzG/qQF6mkQxDV2otiTkgtO23hnesFlJRKON/PAJV4y9G0sAATZ7lfU8zStmgl75uuiw/joAjA5vLyGzzD7SsELnHYC3WOOcB1g3c/CyLfPTtU5X+LFJaKDjo6RSPbf3Jtoc80ZA7cFweyoL9zB92sH+vUxglbC/E1Dn7lehVRVOQLoFdPA8jYzit2E1mjtwiXnCk+RYKJJw+NFPl1NGibPMP+f1XUx+dhoiYDSDJ0klS3Yu8PtuTY3clSYokwpaZoWjhclV605+b/4pk3wrLLAwM+KR4aUipQWvHjpVoBZ07KbKKiVrXRM1QPixCbT6wAklO3A7Tnepq1YmJcNa13NmCy21Xv3RbLOZhiBSr5/Rm0DIVGBmE= 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: From: Arnd Bergmann clang produces a build failure on x86 for some randconfig builds after a change that moves around code to mm/mm_init.c: Cannot find symbol for section 2: .text. mm/mm_init.o: failed I have not been able to figure out why this happens, but the __weak annotation on arch_has_descending_max_zone_pfns() is the trigger here. Removing the weak function in favor of an open-coded Kconfig option check avoids the problem and becomes clearer as well as better to optimize by the compiler. Fixes: 9420f89db2dd ("mm: move most of core MM initialization to mm/mm_init.c") Cc: llvm@lists.linux.dev Signed-off-by: Arnd Bergmann Acked-by: Vlastimil Babka Tested-by: SeongJae Park Tested-by: Geert Uytterhoeven Acked-by: Mike Rapoport (IBM) --- v2: fix logic bug reported-by: kernel test robot , see https://lore.kernel.org/oe-lkp/202304151422.5e4d380b-oliver.sang@intel.com --- arch/arc/mm/init.c | 5 ----- include/linux/mm.h | 1 - mm/mm_init.c | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index ce4e939a7f07..2b89b6c53801 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -74,11 +74,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) base, TO_MB(size), !in_use ? "Not used":""); } -bool arch_has_descending_max_zone_pfns(void) -{ - return !IS_ENABLED(CONFIG_ARC_HAS_PAE40); -} - /* * First memory setup routine called from setup_arch() * 1. setup swapper's mm @init_mm diff --git a/include/linux/mm.h b/include/linux/mm.h index 63acf4a598fe..75d8adce0aee 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3061,7 +3061,6 @@ extern void setup_per_cpu_pageset(void); extern int min_free_kbytes; extern int watermark_boost_factor; extern int watermark_scale_factor; -extern bool arch_has_descending_max_zone_pfns(void); /* nommu.c */ extern atomic_long_t mmap_pages_allocated; diff --git a/mm/mm_init.c b/mm/mm_init.c index 35302b7bca83..7f7f9c677854 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1754,9 +1754,9 @@ static void __init free_area_init_memoryless_node(int nid) * Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For * such cases we allow max_zone_pfn sorted in the descending order */ -bool __weak arch_has_descending_max_zone_pfns(void) +static bool arch_has_descending_max_zone_pfns(void) { - return false; + return IS_ENABLED(CONFIG_ARC) && !IS_ENABLED(CONFIG_ARC_HAS_PAE40); } /**