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 4AD80C4332F for ; Tue, 14 Nov 2023 18:03:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D37AB6B0304; Tue, 14 Nov 2023 13:03:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CE7806B0306; Tue, 14 Nov 2023 13:03:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B62616B0307; Tue, 14 Nov 2023 13:03:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A70B96B0304 for ; Tue, 14 Nov 2023 13:03:25 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 87E79120BAF for ; Tue, 14 Nov 2023 18:03:25 +0000 (UTC) X-FDA: 81457331970.15.9156C88 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf17.hostedemail.com (Postfix) with ESMTP id 6C6AD4012D for ; Tue, 14 Nov 2023 18:02:57 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=V9o26zdq; 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; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699984978; a=rsa-sha256; cv=none; b=ADWakWmCCtzJhdnw/7vRjAX4jthiUICyXBiIHbNDdp0meDSEbCyspyQPILcHFjN1B8ErGx wYitNjB556CbE+nGvgM9MtYXh4aUUx6OTAqvwkUNBFTPbg+cRd7plY27xOBDmHMr5ecLg7 1gNABSsthBzQjED9xBy6Q86Rx3yRJcc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=V9o26zdq; 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; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699984978; 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=f3ODx0nEjQw7AZiZQdgaRfqK/mj0aCKaVn/urVt+O/s=; b=Ll40CcmMIJh6LZGfSXfs7qPBdNfNOn3kH0VJ8jf87nBlagELcqjYBASDxTeqNqQsCjd9H0 yzVUnmLDnlNTQtk/fVd2ciNQL9JiOaNFHv+G1hIS+rna/K0oRXIYZjX3g6i5+arzRxSmxm 6FBrPWmm3JItaEef60JEgwZAqbBA1FA= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AEHkGrI003687; Tue, 14 Nov 2023 18:02:53 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 : mime-version : content-transfer-encoding; s=pp1; bh=f3ODx0nEjQw7AZiZQdgaRfqK/mj0aCKaVn/urVt+O/s=; b=V9o26zdqvtRS6Zy9w1PHmyl/fUFs/aMac4sn3GwMb18Vi8SYVbjGxylBLmeKLmMvuLSk y/Flcf5+qhoeyUNmmcmVbxGrkB7GD5XWMrcK80I4HGfy203BEp+sTMGwZ2ms4KG8gvXU LZwcSPldP8vVAPX86SrsUXReBVJODsgm0fYXlm2JzC0cFlUyvN5Gf34rF0jvBXu5ASgD r/2SMwmxK6ttOWBwkmdMwJRHkfCWraQa2DGID2ciYbH+nu6dfEV0EvB2P3QKvqIdkKJu xZ9b3SJMRXKw0GukJq7tAXjM6Dm27VXWQ9u8kQTJ4R4cDNCH2Vaw6AJDGir1VcpTQtG/ 3g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ucce7ak4e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Nov 2023 18:02:52 +0000 Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AEHkFHc003646; Tue, 14 Nov 2023 18:02:51 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ucce7ak1q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Nov 2023 18:02:51 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3AEGXxss019651; Tue, 14 Nov 2023 18:02:50 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uamay9tc7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Nov 2023 18:02:49 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AEI2kso40829366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Nov 2023 18:02:46 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B4E7C2004D; Tue, 14 Nov 2023 18:02:46 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 59E3A20040; Tue, 14 Nov 2023 18:02:46 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 14 Nov 2023 18:02:46 +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 3/8] mm: use vmem_altmap code without CONFIG_ZONE_DEVICE Date: Tue, 14 Nov 2023 19:02:33 +0100 Message-Id: <20231114180238.1522782-4-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231114180238.1522782-1-sumanthk@linux.ibm.com> References: <20231114180238.1522782-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: gh2OxY0_rfZXOYpRCD07_I0KQppgYvSj X-Proofpoint-ORIG-GUID: oHrM96tYm2-NwV52JlE9xvwvtGj3q7oa 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-14_18,2023-11-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 mlxlogscore=921 malwarescore=0 bulkscore=0 clxscore=1011 spamscore=0 impostorscore=0 priorityscore=1501 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311140137 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 6C6AD4012D X-Stat-Signature: un8y7zttetwk4y83shqmbwrdbynu5ynj X-Rspam-User: X-HE-Tag: 1699984977-482860 X-HE-Meta: U2FsdGVkX19kZlE/BIQY6891VVtQeV9MEXp9/ivnItkLIyIGNk2iQJppv+Xvr05hN7vTqRuxfvv3PsO8B4oJkISrf09OJW2zouqv+bFmkbROxytH2Inp6ZGfNq/ukamw4mmjPU6mTYP3HJHjniv9hROFvZdeX4c2Y+/gGIlVb/Z3H1Me+b2DCEoDv8806o3E7ofCRJMQc8Yi92sCEkvtftPlhDfxRYEMH4B/1YJBpyhLNLFWH+TXVF2JKMKFIDeYQ/m/lkHa+5p6LTGP/2COAdoOjLed2Rm+Kworlbwgn+PlKfNPsz0ms3ZLDJug22fDrmh/dWxqAdm0mCq3/F0M7+kYxhoE6MvFvo+4Q9y9d0P5KF4nhfu7U8/6MqJRxok5krE90lzK1BloyKYuKEFKh5hibtkihVUSVTtww8jBXSfEf1iCcIfvJ77O53agEKgV79yivXBt7GjFo7RnhCv/MTOCxnnw17Ao2EOR1bJH5oVCEa+W9v6wganaZLRM3Q+fTAHXEd/8RZWUPsduh++Vwt9JHd/GiiHRqRLO70BSffgkmJh0LUBekcxV4Hm9q8TLNld93kJcfdXd2jH4YvquEm5scPp0FyT4FWMjICzvgzkNl6RAhO4bULadKKkO6Dje6r2YfTRcEcfQwof0bRqXj7vmlhXB1y3kd+eShFgGkkitx1qlQmrfar+U+wsD196Esq389dEf27MSNFTwWPIMY50tjEAQoe3XtnUyMlqXp1CKwyL6KWpD1vskrhYIZVNibphZGS5VqX/rBlvHsKsmFrcZGoQlSyPFit13OxEvhxVHlSD9PQSSSs8/JGjKAVmTc7Kyj4rjfH8lz0YDUaM9WC4hwIiFKf55+A4WB8KWYAp+uwaxhEI1UL2WWfemRsg/qoYt9YVMHmuntXuUw4QkZ88qunvl8pOH+hp4Nj+WIdYwsqeRrbqTofaOlhYLf491ZCjWP4MOszGTK/b6xUk dHDNcV3n ZV6yswS995gtY61jpb/LMEbarlKyquenvxnILL0yzOYGFPJTXqavSON4kI3YmOBmhZK4u8ATYpNeujEOOsW3Y4pCip9JESWWkpUbGWukGa2ohHr7tFLZe7aCxpOpW42nVziZl1ZFehDqqfImxxvkurKK2JFUl2NgZDJD2HH2jl8KUW0soCVrBfwfYG6f6FIoG0b1OmWIsTBBF6OQc7ltZN0FnJxCo6iIAqPB+ 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. Hence, move it to sparse-vmemmap.c Reviewed-by: Gerald Schaefer Signed-off-by: Sumanth Korikkar --- include/linux/memremap.h | 12 ------------ include/linux/mm.h | 2 ++ mm/memremap.c | 14 +------------- mm/sparse-vmemmap.c | 13 +++++++++++++ 4 files changed, 16 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..5edb0dfd2d01 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3765,6 +3765,8 @@ pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, struct vmem_altmap *altmap, struct page *reuse); +unsigned long vmem_altmap_offset(struct vmem_altmap *altmap); +void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns); void *vmemmap_alloc_block(unsigned long size, int node); struct vmem_altmap; void *vmemmap_alloc_block_buf(unsigned long size, int node, 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 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index a2cbe44c48e1..bd1b9a137f93 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -46,6 +46,19 @@ static void * __ref __earlyonly_bootmem_alloc(int node, MEMBLOCK_ALLOC_ACCESSIBLE, node); } +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; +} + void * __meminit vmemmap_alloc_block(unsigned long size, int node) { /* If the main allocator is up use that, fallback to bootmem. */ -- 2.41.0