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 X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C2F7C433E1 for ; Fri, 19 Jun 2020 13:24:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 51D3020DD4 for ; Fri, 19 Jun 2020 13:24:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CJRWyD/9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51D3020DD4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A1EDB8D00A4; Fri, 19 Jun 2020 09:24:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D2568D009E; Fri, 19 Jun 2020 09:24:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BE1E8D00A4; Fri, 19 Jun 2020 09:24:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id 72B408D009E for ; Fri, 19 Jun 2020 09:24:50 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 321AF181AC9CB for ; Fri, 19 Jun 2020 13:24:50 +0000 (UTC) X-FDA: 76946031540.05.flame72_0901dc226e19 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 0DB2318002068 for ; Fri, 19 Jun 2020 13:24:50 +0000 (UTC) X-HE-Tag: flame72_0901dc226e19 X-Filterd-Recvd-Size: 6080 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 13:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592573088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4phBcYIcyCrrYt5CM0C0IxjrUdGZT9FNgwbh9vRJOyc=; b=CJRWyD/9qWYRzGeTOrFcS2V5Zk754uRbtXdcdFSLO0XkN09oUJhgieve4R2LquU8WkFTxL 6tiokkXMB1qVyuBAZjnwZhU7j6KywpwkSjD49bSCBU6renzjwZ+XSv//owQD1jFwqP16DV Dd4+TerNYWzxaLzVi38JKlHLbAqlR6Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-489-pMhfVnzJPDWAG6D3Jeqiqg-1; Fri, 19 Jun 2020 09:24:45 -0400 X-MC-Unique: pMhfVnzJPDWAG6D3Jeqiqg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB595101326F; Fri, 19 Jun 2020 13:24:18 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-137.ams2.redhat.com [10.36.113.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA32BBE9A; Fri, 19 Jun 2020 13:24:16 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Johannes Weiner , Michal Hocko , Huang Ying , Minchan Kim , Wei Yang Subject: [PATCH v1 1/2] mm: drop vm_total_pages Date: Fri, 19 Jun 2020 15:24:09 +0200 Message-Id: <20200619132410.23859-2-david@redhat.com> In-Reply-To: <20200619132410.23859-1-david@redhat.com> References: <20200619132410.23859-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Rspamd-Queue-Id: 0DB2318002068 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable 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: The global variable "vm_total_pages" is a relict from older days. There is only a single user that reads the variable - build_all_zonelists() - and the first thing it does is updating it. Use a local variable in build_all_zonelists() instead and drop the local variable. Cc: Andrew Morton Cc: Johannes Weiner Cc: Michal Hocko Cc: Huang Ying Cc: Minchan Kim Cc: Wei Yang Signed-off-by: David Hildenbrand --- include/linux/swap.h | 1 - mm/memory_hotplug.c | 3 --- mm/page-writeback.c | 6 ++---- mm/page_alloc.c | 2 ++ mm/vmscan.c | 5 ----- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 4c5974bb9ba94..124261acd5d0a 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -371,7 +371,6 @@ extern unsigned long mem_cgroup_shrink_node(struct me= m_cgroup *mem, extern unsigned long shrink_all_memory(unsigned long nr_pages); extern int vm_swappiness; extern int remove_mapping(struct address_space *mapping, struct page *pa= ge); -extern unsigned long vm_total_pages; =20 extern unsigned long reclaim_pages(struct list_head *page_list); #ifdef CONFIG_NUMA diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 9b34e03e730a4..d682781cce48d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -835,8 +835,6 @@ int __ref online_pages(unsigned long pfn, unsigned lo= ng nr_pages, kswapd_run(nid); kcompactd_run(nid); =20 - vm_total_pages =3D nr_free_pagecache_pages(); - writeback_set_ratelimit(); =20 memory_notify(MEM_ONLINE, &arg); @@ -1586,7 +1584,6 @@ static int __ref __offline_pages(unsigned long star= t_pfn, kcompactd_stop(node); } =20 - vm_total_pages =3D nr_free_pagecache_pages(); writeback_set_ratelimit(); =20 memory_notify(MEM_OFFLINE, &arg); diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 28b3e7a675657..4e4ddd67b71e5 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2076,13 +2076,11 @@ static int page_writeback_cpu_online(unsigned int= cpu) * Called early on to tune the page writeback dirty limits. * * We used to scale dirty pages according to how total memory - * related to pages that could be allocated for buffers (by - * comparing nr_free_buffer_pages() to vm_total_pages. + * related to pages that could be allocated for buffers. * * However, that was when we used "dirty_ratio" to scale with * all memory, and we don't do that any more. "dirty_ratio" - * is now applied to total non-HIGHPAGE memory (by subtracting - * totalhigh_pages from vm_total_pages), and as such we can't + * is now applied to total non-HIGHPAGE memory, and as such we can't * get into the old insane situation any more where we had * large amounts of dirty pages compared to a small amount of * non-HIGHMEM memory. diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0c435b2ed665c..7b0dde69748c1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5903,6 +5903,8 @@ build_all_zonelists_init(void) */ void __ref build_all_zonelists(pg_data_t *pgdat) { + unsigned long vm_total_pages; + if (system_state =3D=3D SYSTEM_BOOTING) { build_all_zonelists_init(); } else { diff --git a/mm/vmscan.c b/mm/vmscan.c index b6d84326bdf2d..0010859747df2 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -170,11 +170,6 @@ struct scan_control { * From 0 .. 200. Higher means more swappy. */ int vm_swappiness =3D 60; -/* - * The total number of pages which are beyond the high watermark within = all - * zones. - */ -unsigned long vm_total_pages; =20 static void set_task_reclaim_state(struct task_struct *task, struct reclaim_state *rs) --=20 2.26.2