From patchwork Mon Mar 18 14:21:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13595404 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 A3574C54E5D for ; Mon, 18 Mar 2024 14:22:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3AC2D8E0007; Mon, 18 Mar 2024 10:22:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 35B628E0005; Mon, 18 Mar 2024 10:22:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1886E8E0007; Mon, 18 Mar 2024 10:22:17 -0400 (EDT) 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 00F6A8E0005 for ; Mon, 18 Mar 2024 10:22:16 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B2FD940E17 for ; Mon, 18 Mar 2024 14:22:16 +0000 (UTC) X-FDA: 81910374672.06.9AEA0CC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id A8E5020024 for ; Mon, 18 Mar 2024 14:22:14 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Kc4oG2vi; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710771734; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vKTxTfeu0kP46EkkGNeeOEWSSdSnmFAW9kbc1VMhmsg=; b=0dMN5V6bVCNnrllcM7mBz9H0BkEOGAJXdU3BRuT4frvCRMnTq4Y35wJdycT68qBUFygZHF f7IrXJaSJ1arG7DVeuQrBWDF3kXaiNGeDf9ss1QuyxAWpQaSpzCmXVZkVx5/8i8fVUklY2 zoTAzCgAf5HEMr1kt0masP07SpZLLJs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Kc4oG2vi; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710771734; a=rsa-sha256; cv=none; b=WUZl/YxssSEs+yzPGd4v5lZrQUX32XbAo4O1N8aMK8jRHmdNLq30QuA6h6CQcjhQd3FAV9 xYdhugmQneNhjFmv88fOQgq8sKgYVkraU4d3RGgIlw0MiXaegZq6jfv3Csiqy1FKsFDhVC EQ2miFJOx3g+ULBJCqxRsBBfPjIygDw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710771734; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vKTxTfeu0kP46EkkGNeeOEWSSdSnmFAW9kbc1VMhmsg=; b=Kc4oG2vi3ZuJPYdF7AmF6Y0eRZ4vCHon6c7cwZ0BrN/Uiz/HRTzh1YDZPrNm3LMu/eFpog fVDHrCIjlSlLD6ATyuJ9JHri/AfR7r9sDXPTeCiYNOBPpq7HkuWUzR/btZftLbs759RsZt 6cz8rGGFd+3G9hHkUerkO2bgyrOgqaE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-418-GqW5-K1AMTGX1X-eXiw5PA-1; Mon, 18 Mar 2024 10:22:12 -0400 X-MC-Unique: GqW5-K1AMTGX1X-eXiw5PA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DBA65101A588; Mon, 18 Mar 2024 14:22:11 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB3EC492BC4; Mon, 18 Mar 2024 14:22:08 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, akpm@linux-foundation.org, rppt@kernel.org, Baoquan He Subject: [PATCH 6/6] mm/mm_init.c: remove arch_reserved_kernel_pages() Date: Mon, 18 Mar 2024 22:21:38 +0800 Message-ID: <20240318142138.783350-7-bhe@redhat.com> In-Reply-To: <20240318142138.783350-1-bhe@redhat.com> References: <20240318142138.783350-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Rspam-User: X-Stat-Signature: erhu4qtbwbdedmufzq38ro9d87wrsbjk X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A8E5020024 X-HE-Tag: 1710771734-734724 X-HE-Meta: U2FsdGVkX1/63x6SVGKoUAcuaejo9zX6zOKLZOUM6IRSD7UCrCLuojrKUSPgZhe3Owm+x37efA5okN5ZuU8c3+baqEES6D/QqGGMvZcD+K9Xwxhmvf5ztg+yX4KDaOf17R7t8GWKvZO6bNmWMp1hoAhF7P1gPRH+56hoDZYcjrfxCFT/1cBB2PO30Vwm78QUqnC0MNi6z0kYfs1glm7y1oTzbeOYzjJcgsB9RBzOIB/dJYCundYXYnoJOaRJgyrZJuYSH3CoBtHWtvgqRMCWE5hmr76aBD0A3AsExe3SiyyhIctckgC5rim6BiRjTrAzmUV4VcNFz2O6zIrSlaum6n5NUks+CgN/t6RhkC8xkJl/MJ0CBDJqMc2XxZCV/+Hdi27Z/zp1V2L1EwVID3GsF9kp+xhlsTytDMRNT/j/HlNNb9xw85avaZ5Ti6TQZdF2hlnQLj606pQYXg/WD/O44W3AnpTHNLUfdJET+aXOj3/3wfZRNmzvj2vhVZVAGiVEEmLfEL0LsGCIdRg+sApy+tIL/Ffg6K/1NdBsRIEqYSURKrMDWtYWX6f4NXaxBNrm19yq9Z2CeRfO10uSywDmuHx9hGc+UUNGrVDu4pDv94YJoRvb6MzOImv8rxrg293OGDFzXVgDWzXA4J6RAmJB7VARSONbmEldRJP+5oJhTh9KT2DPZ0Kj/2KdrWRFa/JqNdXd99fUp9myyhD7Nl0xhY+XG1sP87lBqrHtjhCU4Al6l/A5Op31fWLWt0Bz2awI0Q4Pmpo6eyv4LLlDDsuaA+MvKA3/dsGQlHkqlO6MdSJF5g/nVfkz4CmTn/zWJFF3BUaRItZ8BoDt8pHFmrot9hwJRnoST6gmOsrhgutfhzWXmIpHStvv09md8mhWJW52RjDIJAjFq+I1HXYI4CZ3w0QJ/QK1EuAaYSiwrlfR5VszPC+/g/f85Tz8GmqVVhBNKiSYP3hb7y97E6IdaWv 3qG0TP4Q eSkUVoTvX5algoqtiA4ez4CIJYLh1x2esVC6lXbS0/P5YFZPOw+WJvTX27TjwJeM8zjkMQ/bUvHioAA3hinbixrCaMs+qR5cJhWdf9Gs1hK6Pqemb5OGyc7483lQ3ip7KVhCv1ZzacvKTyl0iV1XNuOQVLeAbIDTavMZ/UHH/Yu3FgJL27t8mYXb7+KYTAipnF3Lo5Cya1YNxc4ctZRG1CBNNGw== 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: Since the current calculation of calc_nr_kernel_pages() has taken into consideration of kernel reserved memory, no need to have arch_reserved_kernel_pages() any more. Signed-off-by: Baoquan He --- arch/powerpc/include/asm/mmu.h | 4 ---- arch/powerpc/kernel/fadump.c | 5 ----- include/linux/mm.h | 3 --- mm/mm_init.c | 12 ------------ 4 files changed, 24 deletions(-) diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 3b72c7ed24cf..aa5c0fd5edb1 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -406,9 +406,5 @@ extern void *abatron_pteptrs[2]; #include #endif -#if defined(CONFIG_FA_DUMP) || defined(CONFIG_PRESERVE_FA_DUMP) -#define __HAVE_ARCH_RESERVED_KERNEL_PAGES -#endif - #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_MMU_H_ */ diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index d14eda1e8589..ae8c7619e597 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -1735,8 +1735,3 @@ static void __init fadump_reserve_crash_area(u64 base) memblock_reserve(mstart, msize); } } - -unsigned long __init arch_reserved_kernel_pages(void) -{ - return memblock_reserved_size() / PAGE_SIZE; -} diff --git a/include/linux/mm.h b/include/linux/mm.h index 1888b1935103..8147b1302413 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3221,9 +3221,6 @@ static inline void show_mem(void) extern long si_mem_available(void); extern void si_meminfo(struct sysinfo * val); extern void si_meminfo_node(struct sysinfo *val, int nid); -#ifdef __HAVE_ARCH_RESERVED_KERNEL_PAGES -extern unsigned long arch_reserved_kernel_pages(void); -#endif extern __printf(3, 4) void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...); diff --git a/mm/mm_init.c b/mm/mm_init.c index 9ed4b9e77c4a..370a057dae97 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2383,17 +2383,6 @@ void __init page_alloc_init_late(void) page_alloc_sysctl_init(); } -#ifndef __HAVE_ARCH_RESERVED_KERNEL_PAGES -/* - * Returns the number of pages that arch has reserved but - * is not known to alloc_large_system_hash(). - */ -static unsigned long __init arch_reserved_kernel_pages(void) -{ - return 0; -} -#endif - /* * Adaptive scale is meant to reduce sizes of hash tables on large memory * machines. As memory size is increased the scale is also increased but at @@ -2436,7 +2425,6 @@ void *__init alloc_large_system_hash(const char *tablename, if (!numentries) { /* round applicable memory size up to nearest megabyte */ numentries = nr_kernel_pages; - numentries -= arch_reserved_kernel_pages(); /* It isn't necessary when PAGE_SIZE >= 1MB */ if (PAGE_SIZE < SZ_1M)