From patchwork Mon Mar 18 14:21:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13595403 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 92B51C54E5D for ; Mon, 18 Mar 2024 14:22:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D987F8E0006; Mon, 18 Mar 2024 10:22:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CFA8B8E0005; Mon, 18 Mar 2024 10:22:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B73498E0006; Mon, 18 Mar 2024 10:22:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A54378E0005 for ; Mon, 18 Mar 2024 10:22:13 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 73832A0564 for ; Mon, 18 Mar 2024 14:22:13 +0000 (UTC) X-FDA: 81910374546.02.30C117D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id B1F8440007 for ; Mon, 18 Mar 2024 14:22:11 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YXQpOaMC; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710771731; a=rsa-sha256; cv=none; b=BUtQn7kXrvlWdTyql2WGdSaG4Rz94sVLIv/aJTcXZkMDQ3UyrrZaL3qdmX8KdQfok4IfQ2 dWTJZocC+ZuGZHI3yIQoQmP0XuVJloWUtzcbCT76q19TFYy3P+oTH1rcAKvcbvNiuDJhra Or/DMjRbQe3ZooISI/DKnZNYO2E700Q= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YXQpOaMC; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1710771731; 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=D/H22rgu+0Eg3oELZT1F8mB3L7t/pq1y95Fbs8e1Y/U=; b=2cNj1GVQFsV+3gF0rOkf5eB/GgmWVcRSMOmrkqdd31WAjmym3adMxlOpvNZcRc1tYl2fYz sr1qv5PRWSSZqvfM3fF+SNq5IefXnNCuksffPZzTr0G7GgtSRHP281NybNUUcWyt0QprGD r+Gh+ZjHadW3Eb3CqaLSzwKNMvIaZtA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710771731; 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=D/H22rgu+0Eg3oELZT1F8mB3L7t/pq1y95Fbs8e1Y/U=; b=YXQpOaMC5VYJGmGlWMb2wG3NFWITYeVdBq7oWEBjYNjkOORqwGuVSeGUbwsPkhgLcKM2Nh JKU3hfELaJg/g4KknyaLpCAhJRnb1DE8gVJNwNc2X0adxXLFekY1nk/If2arOtqwQ6kZi/ 8EPIdIiDb5OsBR42lNSjVI1OINOKvHk= 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-43-gnPigdkEN5yTi6k7RKI_9g-1; Mon, 18 Mar 2024 10:22:09 -0400 X-MC-Unique: gnPigdkEN5yTi6k7RKI_9g-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 4F4BF800265; Mon, 18 Mar 2024 14:22:08 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65BA7492BD1; Mon, 18 Mar 2024 14:22:05 +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 5/6] mm/mm_init.c: remove unneeded calc_memmap_size() Date: Mon, 18 Mar 2024 22:21:37 +0800 Message-ID: <20240318142138.783350-6-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-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B1F8440007 X-Stat-Signature: emrpfd7kwcxchq19enh3cwg9niawdijo X-HE-Tag: 1710771731-869312 X-HE-Meta: U2FsdGVkX1+WkmNs+kGpENBA8AT+tRshd475583QI1NMyC84bSl6YY/BlOuHGi5EL69r8CnpC1Qw91E5jahjBq83kmTcv2c3LjCjHeF+PSgK0C1S9+0WT7lR6YiVUV0yJumQQr74HnPMXZhsvC8S/hkz3zdCPYTRAjiHP7xMExKS0iCmINFEQSE4wlNVpHtclc+gEKppWN6aal10nN2BTHY6wxL/2Zm6lGGbM0QP6hdT1B24pei4QzbyrCPalpgh8cKoxLI3Vlu/BV7kdrX5BIU9B68jvCCX0Ly1L/5ZoDNJ1cQiJRCSUaRdFBOx2VSjUwOoYXwCBnAbO0EPNI/68NOEVnxk2rgKa9uyLiPPhLw9UFaJznmpIvXd9rIJy0OzHDIvY8Al23YL8lMi1dE3k4WOuB7UFk4i14Kom21nMiMhuIte0dAWRnAMZXy6n7iriB5whvMQA/MCxknL3vgIseyy/Zui7Z/bYJ7p3sJOMJuqTne8Q1CumolodharDpuQXXtYpijaGL8tI5FVF1n/GjLmmenyoO8ezWU8Ztg1lp1YKhnfvSmqUlWiTcyr01w9HIh858QxNcKHtHoSjg8IzvAmtpmIalLqRqJ2RnCYSaNE0FbETTQIht0ziVKUOH6YUmnTshikRie0tVx/H/TZhPYyvhzr4qEHU67+4Q49jBeKm1m44Hx0XRfV1n+ehPSP6QMitP3Yao6jNg924xnqyDZxdMN/b34Tqwl9nX0XnZML5nouWU1VMfWTVNPFfMrmJ4PYf3YXvN9Ffee7p0VfhS43uuovv9DPjQEOciZ6T1wpfOEQp1GHjP0/FByuxLnczzL9hvDw4+3i+37fSm62K4SEOkrBs43FOH/ft3qOum0fTofIqSIjfyq+ri5MQlFoHThnFLG0GUXpz1Tg/nbroiJhYvZuQaDl74A5GQw4QHJ61MiIC52qYk1QCumicQF47OBwueHX3BJsbTK37mQ KvGMRPq+ nRIwfzv7Gfo7vwaGuj+R8utsfeYHEmFYgNw6zX0l3eM5GlaPv+5iVE5WoDsKPMvGVKzwJPYCYbJEoD9or+wsadFL3ih5V4eZDL2kk6qDInErEVmtN+ELQ7571yxznuqpb/LMjsRrPT17UNvWXSb2hOZnb+ARyzCLynfWPUHB3LyFpNWkHd8d6EftmmiafNaeubTibrmtX0V1fhhMhSOA72TMJlQ== 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 --- mm/mm_init.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 55a2b886b7a6..9ed4b9e77c4a 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) {