From patchwork Mon Mar 25 14:56:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13602380 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 9C440C54E64 for ; Mon, 25 Mar 2024 14:57:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F72D6B00AB; Mon, 25 Mar 2024 10:57:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A4D96B00AC; Mon, 25 Mar 2024 10:57:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 145666B00AD; Mon, 25 Mar 2024 10:57:43 -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 F1DCD6B00AB for ; Mon, 25 Mar 2024 10:57:42 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8DAF6806B4 for ; Mon, 25 Mar 2024 14:57:42 +0000 (UTC) X-FDA: 81935865564.18.24475C2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id C60A7100020 for ; Mon, 25 Mar 2024 14:57:40 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="M/TRDeu5"; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711378660; a=rsa-sha256; cv=none; b=l+8ub0VTSNwl2+JQp4Wg9o3KTVo+Fvlh2ztZ4+7gU5FjS3NTYoL7N0sJywvptFiru8K1AC Yo+uQib5mgU7eXoZ7HeqoM5VyCc/cWkKesdFhG0n4U3T2v+6TMbeMiwYX/zaLuSBnwQ+Fq eKdPkNSNATr0xtQH4uKfQBpRVVMSJB8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="M/TRDeu5"; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711378660; 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=MVO6euUmFTCPCHk6L2/T00GcEz6lDO4YO+24ug8h660=; b=Xek3VqSwcfRDoZ+FE3Yf+WBrzlxGmG6FlnHbCdNuaKHa27abcCRvrAAqsMtuvNsI5C4FXz TUGbv+M38W4drP50v/aNNpd10ltFCrGpO70jDrs8DyNFr3tK4IUcvm2BcemO2QgDJtkCGb IgiVztXEbEw6Lo8p1j8iZVwdJnc6N+I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711378660; 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=MVO6euUmFTCPCHk6L2/T00GcEz6lDO4YO+24ug8h660=; b=M/TRDeu5lU9MmXkrBE7y1LNZJf34UV5JqEvWSkiXDuRTb2XHzI/iL+oEl2qxkM6sc8eylr w70Xq8M3Rt+WrIas66pzfxjprYTY7sUL1ltwj6McM2msoGcyqZM5q2TgqISuJtHAkAw+g5 OISFK79MoGCxohyA0jAJMdWFIFluftk= 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-124-mGMwkjhzOPWXpLUha1kWiA-1; Mon, 25 Mar 2024 10:57:37 -0400 X-MC-Unique: mGMwkjhzOPWXpLUha1kWiA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 3E7FB8007A2; Mon, 25 Mar 2024 14:57:37 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69A9D3C22; Mon, 25 Mar 2024 14:57:33 +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 v2 5/6] mm/mm_init.c: remove unneeded calc_memmap_size() Date: Mon, 25 Mar 2024 22:56:45 +0800 Message-ID: <20240325145646.1044760-6-bhe@redhat.com> In-Reply-To: <20240325145646.1044760-1-bhe@redhat.com> References: <20240325145646.1044760-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C60A7100020 X-Stat-Signature: nh6ckzstzgcugiijzu8zchnz4b9ixrnp X-Rspam-User: X-HE-Tag: 1711378660-305306 X-HE-Meta: U2FsdGVkX19clja5xAyzQscPfZYSLOauJ9Kb/qDM3/QIqAbaImycrGplLRt4/EKAPVxukdvDl4XUPljJJUZJz8FlmW0mjKS31CUjJlzBlj3qA2y4miLGS7qwsXZ7a0FaIMHwVUVZSGkvTb1L62m8XJQweKtkoVNM/W5goo0j3YYX/BlD5okVaDv9T6Q61cpVLlrgrBAV+rPUdHeaFMheEPE2E94OWPJGxahFOv9oGW8fARnimb3rL4vGFfJ2tTkykoVgHksq2+ulmOuZA9I8Zwm1/1mQUWQ2/1u27OX15eGc6Y5nJODfVQ6rODNv5dOJFA/+m0yHjffLbFjhynPXqOhasrxB3RpFaGcyyYLoTJYYMLfojBz7lC8+izJfy83iXtmfkOMh/fn0oEH7idLk7xbKSyAIS9smBOSaMfapUVW2Nrmpt1eFOsA3CPJo/xv1Dz4cE70Hy8kzONA7flsMo4Jcg/OFrcUMIWEkmr2Y3arqnQdk5sl/UozEJ79kU/A2yILr8HwPvtDJkwp1lMhGx4zXtDyTCVFxpWKruuX/wQcAxY/q5SY781g8L4mGpPI6QA4bWyAfoVlzIm3XFuy5JUsuBnVcg97gEvkNgyeOpzZLWKUowg6XAyzSvEMbEcmR+eqtmofDjyqatqbkltx7yf+/6bFlHKlO9H6Z09enkh9NYej26IaAWCERubbMJKVI+o2xWZkx7YD/2aiBeLvp3qoRwCLqMWof/ka+DrFIGS3OgBeK4ok2BaIwIppV9ymi9qqOuBnK6PVSBdIujM1UQvGJNPGCfPszjsRgjltLxL65ZraCZMK7UggS//xSuuJGRwRDEOSjysOiGvsTcuW0Uu9P4RSym1OQ+P4R5GP4Fjg7dmM84pM7v3OWn29CxlX06tX817ndxhAAvRfcvk7xOs0We+tne0mAOrTH+3lQIKqwPulQtx6suGLB+ErD6MHVmzbB9kIkAJthMbP41Y7 Gz0MuE+M Hpv4zlZ2xDAOBxb8/5AZ51XICdhSUSCEG+sYmAoepYVJwInP4poqsny4z7YqtMnLYQSnxz5M2emOlNUJGYCzGZUzzqPo25MukmPu7dNtln2rQswNcq5bDoZMN2QPKsFFwL/Z9lESijGcrYZE5dql7aU/CQ0v8LNFG+bqkzOyrQ5DJtWm3WU9r0MHouPW41KG+fXMYqIG/tzAsr134me/1/ONaSQ== 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: Nobody calls calc_memmap_size() now. Signed-off-by: Baoquan He Reviewed-by: Mike Rapoport (IBM) --- mm/mm_init.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 7f71e56e83f3..e269a724f70e 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1331,26 +1331,6 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, pr_debug("On node %d totalpages: %lu\n", pgdat->node_id, realtotalpages); } -static unsigned long __init calc_memmap_size(unsigned long spanned_pages, - unsigned long present_pages) -{ - unsigned long pages = spanned_pages; - - /* - * Provide a more accurate estimation if there are holes within - * the zone and SPARSEMEM is in use. If there are holes within the - * zone, each populated memory region may cost us one or two extra - * memmap pages due to alignment because memmap pages for each - * populated regions may not be naturally aligned on page boundary. - * So the (present_pages >> 4) heuristic is a tradeoff for that. - */ - if (spanned_pages > present_pages + (present_pages >> 4) && - IS_ENABLED(CONFIG_SPARSEMEM)) - pages = present_pages; - - return PAGE_ALIGN(pages * sizeof(struct page)) >> PAGE_SHIFT; -} - #ifdef CONFIG_TRANSPARENT_HUGEPAGE static void pgdat_init_split_queue(struct pglist_data *pgdat) {