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 9548CC5AE5B for ; Mon, 20 Nov 2023 14:54:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 216E76B0369; Mon, 20 Nov 2023 09:54:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C7BB6B03EC; Mon, 20 Nov 2023 09:54:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 019A46B03EF; Mon, 20 Nov 2023 09:54:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E858C6B0369 for ; Mon, 20 Nov 2023 09:54:14 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B8CBC1603A0 for ; Mon, 20 Nov 2023 14:54:14 +0000 (UTC) X-FDA: 81478628028.26.2F162D7 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf17.hostedemail.com (Postfix) with ESMTP id 58D184000B for ; Mon, 20 Nov 2023 14:54:12 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=MONRno6p; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf17.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700492052; 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=pHEHZ61IzDkvkO46Xyp/tMYTkEieSxEfukYbA/B4d2Q=; b=Cxde8stNg2zihllSdNwvniTnGGuVMh3X2DxSn6R5BVsK28arwGneG9XQQkKGWmbgkR5X8v 6TV9rcijMMoCqnXdpihokY5UJrOl7KOlQiihTRxF+MwquCmwe9fVV0ZmCicbhskg+oUiTh SQgSB6t4ohqFcqzszj3qO+pokJ9GqKQ= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=MONRno6p; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf17.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700492052; a=rsa-sha256; cv=none; b=kMWD9TZ/ne/Bv34KdMPau4U65KWhXMZTDTrUDdkSBBEXEEdgBQlzoI0TUoUCJYbceCT5ys LMKD5IUJH45NfpUoMqO0jDrzbvDSNuPeUdh5RTTFs1aGUOI7/YGseacaaeOAtbIdM6EcHT IHcuvVt59fFFWZGLYqr+D8JcQCB0ZJQ= Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AKEenPb031878; Mon, 20 Nov 2023 14:54:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : mime-version; s=pp1; bh=pHEHZ61IzDkvkO46Xyp/tMYTkEieSxEfukYbA/B4d2Q=; b=MONRno6phyTdoV+TzCOKUfqlPvuV6zvh5qYmPCegPFmoQhXo/vc1in/w3RmY/iFwAe1n 83FNrHFI/wIAmCxtMzOd6bl756ieBsdLQhV19DVQgiGvRC0FL0B+OlurmJHw13vuNiSc r2aYLzN4WT0mW/nmO3O59eBtEj0oUeQfCWKxBmi4CNwC8EgFSNFoLpXljoPOLiVfyxRO YqS2CGfQJQgd/U0hED6fLxHPpVX1io7qqFP4a7/zzYPbMV5CfYDRMS1xfDPFAm+44bhn BDQwxXoNdwN5mdhb6U9D+fwAn9Mv/aZNTJ1KAflOGCqTxbLrCOL7DmT3IyH5aFr9WVaF Pg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ug89ej85n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 14:54:08 +0000 Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AKEfdpO002498; Mon, 20 Nov 2023 14:54:07 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ug89ej85a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 14:54:07 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3AKDQw3S008793; Mon, 20 Nov 2023 14:54:06 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uf93khp9n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 14:54:06 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AKEs3Ma22413850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 Nov 2023 14:54:03 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 26E1F20040; Mon, 20 Nov 2023 14:54:03 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E629E20049; Mon, 20 Nov 2023 14:54:02 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 20 Nov 2023 14:54:02 +0000 (GMT) From: Sumanth Korikkar To: linux-mm , Andrew Morton , David Hildenbrand Cc: Oscar Salvador , Michal Hocko , "Aneesh Kumar K.V" , Anshuman Khandual , Gerald Schaefer , Alexander Gordeev , Heiko Carstens , Vasily Gorbik , linux-s390 , LKML Subject: [PATCH v3 3/3] mm: use vmem_altmap code without CONFIG_ZONE_DEVICE Date: Mon, 20 Nov 2023 15:53:54 +0100 Message-Id: <20231120145354.308999-4-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120145354.308999-1-sumanthk@linux.ibm.com> References: <20231120145354.308999-1-sumanthk@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 3mrIshPRLx2NhH13KZJAfBn2xHoRpTlq X-Proofpoint-ORIG-GUID: kmSa7hg3x680ryqobdqsYpND44qbLYC- Content-Transfer-Encoding: 8bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-20_14,2023-11-20_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=710 phishscore=0 spamscore=0 impostorscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 bulkscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311200103 X-Rspamd-Queue-Id: 58D184000B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5hszkn136tj5a7jr4tcgrxd587nmnzkx X-HE-Tag: 1700492052-551579 X-HE-Meta: U2FsdGVkX18odQPRVRnjYc1q45FJfA2+K0vV9zfF+GYBOLrDagbmiCODIeSdZY8sng/twj5qWdJM7zg52jrxJI3YTarGZEat0dm69jAEAYIjEuLuguO/RzhFXRGeA6omJoho/Ug3joy0Krtx5jzmF7TH7XrRqlIJAErB9JE0UsbVQRt48lBCT69QEvHAkjcphubcRsh13QyNUXkU71sQP3kKhPzSPR0ZDPRKAjlDCJrQWebZI6QdIptlditKWcgAaME+lnMhbVojSx3FpayLAHOGZuUO3lLlMCPduleKwDYKvz6PPUNMAnLaJK3/pbePEOWBmAPEfCf+rNwnA3hEqbLgVT30iiyYtycAPf0eO0BcR0QEKvZpEa7zhecfSdS2CM/5TTVseNJwICcLX+vwjzPWuwtn+8G5eyu5TLfrgveR55wrx7DqqyF4vVBPnY/o3CiYsCG7hpf+y/yup+d2hvNHNTjM0vUpnPDvrmhC0Ozdd08WYgTPXSPwbx+FSgKCRMdKcKQe5spAIiZ4Ur/2Yc478Xb8HTZ0VU8GQ+keUxoutUBFSDuYIJRBAFBfRFWHDfaQq5fTWuumki4vwAGGwtUvqTSiT2eQxZK/dClU/XmNvB5jm6n3nBiW/H9s7qeSWP+SMD7VLJfMxqFwONZdVVQkkxe0005qN81zUWQcLG5rHcdEAwvoivAk+e2LmvTURDDR3zz4Gs8zznxReLkHKVq68Xb1nlK+tsvp5KGjGJr8c/7vpyAEDrIN1pFbks/JCO3k1RZNmyou3Jy2OpnKKty9D0G9GaoQGqITVIs8BZC1geYUGsFpDfl9evzu1egbE6MiTO132Ng9U9XEN1TKfufjnP1K8ycQkUV47OhRAx9BFZOWF+WqSYVShDBamStDENrHvU/rAv2i9ZWsUsHcsEkKPuS/MsyMFeHwy4yO/ONKSgpx4IntaBDa8EytQcgvXBfq6sPy4Lu7t/mqOAu lDgpWvhy t1+Uqv2TzADUh3m/9sZGIsw0U5uqw7vwwbDtem3zY+8bS3SGzniCzYMLX/59dIaaZ16kWtPVLFFUf/Nd8ig8zKFJMIpgkfazjoifEfOmSG9v29zKok7Yi8sVzXFUNY0e54X9NLM3ZTVa1adCSxOVYeEs8OObDix3mOESKfvWi/DUaf0pAgUKis+ZxqpzMd7qyJWx73q0chQV2c9lVO5cGfKmfaofI5GXnBvkocYC/NDPPM1JOw97jlHV/T196cawW26/G/hlpjEssQxzDA0xfuy9Gr6vTSaGedToc757ZRsHozh8= 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: vmem_altmap_free() and vmem_altmap_offset() could be utlized without CONFIG_ZONE_DEVICE enabled. For example, mm/memory_hotplug.c:__add_pages() relies on that. The altmap is no longer restricted to ZONE_DEVICE handling, but instead depends on CONFIG_SPARSEMEM_VMEMMAP. When CONFIG_SPARSEMEM_VMEMMAP is disabled, these functions are defined as inline stubs, ensuring compatibility with configurations that do not use sparsemem vmemmap. Without it, lkp reported the following: ld: arch/x86/mm/init_64.o: in function `remove_pagetable': init_64.c:(.meminit.text+0xfc7): undefined reference to `vmem_altmap_free' Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202311180545.VeyRXEDq-lkp@intel.com/ Reviewed-by: Gerald Schaefer Acked-by: David Hildenbrand Signed-off-by: Sumanth Korikkar --- include/linux/memremap.h | 12 ------------ include/linux/mm.h | 26 ++++++++++++++++++++++++++ mm/memremap.c | 14 +------------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 1314d9c5f05b..744c830f4b13 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -196,8 +196,6 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pfn, struct dev_pagemap *pgmap); bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn); -unsigned long vmem_altmap_offset(struct vmem_altmap *altmap); -void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns); unsigned long memremap_compat_align(void); #else static inline void *devm_memremap_pages(struct device *dev, @@ -228,16 +226,6 @@ static inline bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn) return false; } -static inline unsigned long vmem_altmap_offset(struct vmem_altmap *altmap) -{ - return 0; -} - -static inline void vmem_altmap_free(struct vmem_altmap *altmap, - unsigned long nr_pfns) -{ -} - /* when memremap_pages() is disabled all archs can remap a single page */ static inline unsigned long memremap_compat_align(void) { diff --git a/include/linux/mm.h b/include/linux/mm.h index bf5d0b1b16f4..f2344fd8acbe 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3786,6 +3786,32 @@ void vmemmap_free(unsigned long start, unsigned long end, struct vmem_altmap *altmap); #endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP +static inline unsigned long vmem_altmap_offset(struct vmem_altmap *altmap) +{ + /* number of pfns from base where pfn_to_page() is valid */ + if (altmap) + return altmap->reserve + altmap->free; + return 0; +} + +static inline void vmem_altmap_free(struct vmem_altmap *altmap, + unsigned long nr_pfns) +{ + altmap->alloc -= nr_pfns; +} +#else +static inline unsigned long vmem_altmap_offset(struct vmem_altmap *altmap) +{ + return 0; +} + +static inline void vmem_altmap_free(struct vmem_altmap *altmap, + unsigned long nr_pfns) +{ +} +#endif + #define VMEMMAP_RESERVE_NR 2 #ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP static inline bool __vmemmap_can_optimize(struct vmem_altmap *altmap, diff --git a/mm/memremap.c b/mm/memremap.c index bee85560a243..9531faa92a7c 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -422,19 +423,6 @@ void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap) } EXPORT_SYMBOL_GPL(devm_memunmap_pages); -unsigned long vmem_altmap_offset(struct vmem_altmap *altmap) -{ - /* number of pfns from base where pfn_to_page() is valid */ - if (altmap) - return altmap->reserve + altmap->free; - return 0; -} - -void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns) -{ - altmap->alloc -= nr_pfns; -} - /** * get_dev_pagemap() - take a new live reference on the dev_pagemap for @pfn * @pfn: page frame number to lookup page_map -- 2.41.0