From patchwork Sun Mar 5 13:36:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 13160142 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 EFD97C6FA9E for ; Sun, 5 Mar 2023 13:41:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5DF86B0074; Sun, 5 Mar 2023 08:41:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CE7916B0075; Sun, 5 Mar 2023 08:41:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B38AD6B0078; Sun, 5 Mar 2023 08:41:49 -0500 (EST) 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 A229C6B0074 for ; Sun, 5 Mar 2023 08:41:49 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 71232C063A for ; Sun, 5 Mar 2023 13:41:49 +0000 (UTC) X-FDA: 80534957538.17.ED9872F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id B1A1E180015 for ; Sun, 5 Mar 2023 13:41:47 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="MylP7h/E"; spf=pass (imf06.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=mtosatti@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678023707; a=rsa-sha256; cv=none; b=OsZ8h+UQwpCmDd7wl73o/U8Hc7Ag9LleuhO9n10RsEVtiGPOGxCV6BipVFPKs12zRP5z3h VUC5/3QhDkDQ4Y7BfVn8xLJoFXell04e9yLBOpLHYxh3lu+P9nfwjJDbmtCTDDDD1qxn6n VxOvzGrHgqYGNwFgGWIKmFbQJH1ulMA= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="MylP7h/E"; spf=pass (imf06.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=mtosatti@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=1678023707; 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:in-reply-to: references:references:dkim-signature; bh=gz8YmAWe77MPk6KLnyeDeBjg9daGz/JZkyszI8+E0yI=; b=mQYjJEhA+wGhbJDDOcium4L2OTPL0gqucK+Q9LqtsddaUGr/3mB41aHVxL9bAlHrQ8/E4G 5NEApPCAf28JbP+KsA6pb1jz6XKj7cTOSqo4wn7wC6hPBmGtm3OSNjeaj3dEcCLLqmIcZ3 7s8UO3/aUxX9BS90hzyeQoSRvapu21E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678023707; 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: references:references; bh=gz8YmAWe77MPk6KLnyeDeBjg9daGz/JZkyszI8+E0yI=; b=MylP7h/EPQHbDp5gvbsdvWRLGUAx+dwTz7co/y6+oCG//mU2xi/yoJZVyszidBG4HQSimc GVevrYjnV1T8rnBkR/QeM9nyZRFrGRIR+zcrnYI0uLQjLS/IkcZQyuAXv/6qPOzkEo5/nR rU+m0d5XlZQoBONMiWZ4EQ7YOewZXD4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-394-d6kOwlJUP_-kTTRd0MJH1g-1; Sun, 05 Mar 2023 08:41:43 -0500 X-MC-Unique: d6kOwlJUP_-kTTRd0MJH1g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3236C185A7A4; Sun, 5 Mar 2023 13:41:43 +0000 (UTC) Received: from tpad.localdomain (ovpn-112-2.gru2.redhat.com [10.97.112.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A78002166B26; Sun, 5 Mar 2023 13:41:42 +0000 (UTC) Received: by tpad.localdomain (Postfix, from userid 1000) id 17F0D401344BD; Sun, 5 Mar 2023 10:41:23 -0300 (-03) Message-ID: <20230305134053.436759976@redhat.com> User-Agent: quilt/0.67 Date: Sun, 05 Mar 2023 10:36:58 -0300 From: Marcelo Tosatti To: Christoph Lameter Cc: Aaron Tomlin , Frederic Weisbecker , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Russell King , Huacai Chen , Heiko Carstens , x86@kernel.org, David Hildenbrand , Marcelo Tosatti Subject: [PATCH v4 01/12] mm/vmstat: remove remote node draining References: <20230305133657.255737580@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspam-User: X-Rspamd-Queue-Id: B1A1E180015 X-Rspamd-Server: rspam01 X-Stat-Signature: 6cse859ajajspa4966wi7k6iykyq4kdt X-HE-Tag: 1678023707-326374 X-HE-Meta: U2FsdGVkX1+tG/msCYSUNS2Y85Bs7xpXgrJQIK10oqcf1cBCNStRpE0DQjiNctAW3TVzE9i9FC4ZUroPePFIPEpUWh7KEmpiZK0L98pGwmaNd8vqejUqXfR/FYQdDBTmU7HtHDD6X1abucGAZodsqHOMYr0URMuXsfIo8FcvpgaPKc3ogoUI4bBtur5YpsvDGRyVbchSgd52ysxn/mzG3+D/2neBvyKyidSpawSjTaDzGvTlnTIQ3jkq7TEHCP6ZpePrscTxMqRF1fJAGIq2da7/XX3Fh2kjZ/RZCqB8nPQnt8hqgI2oIkTUOLP261n7S5h28PzekMf3p8J+QEuG3WhnSW2j198CU1zeKfhPIsVxbH4Zm8+bjloVor9AWZYjUYV2RAjc52vDM5uZBEZeap/dRUkQu6GiDPt3AN9c1NID/HAaaew1PP8KRhG28k2irArKSI5ojNTiT7M+VeDWp+x35b75iPnhfux2niZT4akJwV138h6BCgTLrf6UTsgBmHPygFxgxbS9o+RK+mFj8KPMJuYv/9p0q/RsrZzSkRUCBh/ovJK8nd95LBACBeu8So3J4659znADHcpXoJcQFzYu+1sg53eQxfLb0Sbr+azzYO0iLpgN43WzPRaqXlBZdj1EA8WNdCXPfzdzGpSxjK9XRG8qsGS/31x9gnimGoPXuv3PZFHBAmjkKMcDtwLVyuQaQDeTmPBxLNZ8bG1MoHrajkgOiLJXr6Vitd97AYuayG7zk609Fu5KxgjGk+1p2EA2223GGxbhQg8kkYlCHP27aN3tluVh87EYGwODOgkqsC4+slJtzt8WKdmH8mnrIKaZxDlMJYpnsDe1Du9hhnidJto/Y9/UZ+CRRl4XyDtjvYDaepI7buKNAuVSUF2I6eJi/7ENC2nKYcP57nUCRHRKC/y2sfMrauMeX2jnOyJIe1dBFs2hJEQnFwF8MjoCwnZ/srS3rZtkpBU4mC8 5KNCns2a YS0SS11mpAwoNqJ61RScL6TIUfGLullKiyJPaCmSPAuQ/uwWSeXykUqhzABkE+V2+ex+LSlxEXSJ7LSIEpPDQ0IsHMd2QNfd0OFT0u4p5i2KFEaGefp44cJTj3xbCMvGBYuOmmrXWztzvz5x6BihkrN2y+Zzr20q3UfFPajQ99E1tZMjPYu2uGWARo6KWG2CdZr2i4CJ2ZlMETvRK1PzUnbnvEw9wnMRwhBhlomNXwiwn84I= 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: Draining of pages from the local pcp for a remote zone should not be necessary, since once the system is low on memory (or compaction on a zone is in effect), drain_all_pages should be called freeing any unused pcps. For reference, the original commit which introduces remote node draining is 4037d452202e34214e8a939fa5621b2b3bbb45b7. Acked-by: David Hildenbrand Signed-off-by: Marcelo Tosatti Index: linux-vmstat-remote/include/linux/mmzone.h =================================================================== --- linux-vmstat-remote.orig/include/linux/mmzone.h +++ linux-vmstat-remote/include/linux/mmzone.h @@ -679,9 +679,6 @@ struct per_cpu_pages { int high; /* high watermark, emptying needed */ int batch; /* chunk size for buddy add/remove */ short free_factor; /* batch scaling factor during free */ -#ifdef CONFIG_NUMA - short expire; /* When 0, remote pagesets are drained */ -#endif /* Lists of pages, one per migrate type stored on the pcp-lists */ struct list_head lists[NR_PCP_LISTS]; Index: linux-vmstat-remote/mm/vmstat.c =================================================================== --- linux-vmstat-remote.orig/mm/vmstat.c +++ linux-vmstat-remote/mm/vmstat.c @@ -803,20 +803,16 @@ static int fold_diff(int *zone_diff, int * * The function returns the number of global counters updated. */ -static int refresh_cpu_vm_stats(bool do_pagesets) +static int refresh_cpu_vm_stats(void) { struct pglist_data *pgdat; struct zone *zone; int i; int global_zone_diff[NR_VM_ZONE_STAT_ITEMS] = { 0, }; int global_node_diff[NR_VM_NODE_STAT_ITEMS] = { 0, }; - int changes = 0; for_each_populated_zone(zone) { struct per_cpu_zonestat __percpu *pzstats = zone->per_cpu_zonestats; -#ifdef CONFIG_NUMA - struct per_cpu_pages __percpu *pcp = zone->per_cpu_pageset; -#endif for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) { int v; @@ -826,44 +822,8 @@ static int refresh_cpu_vm_stats(bool do_ atomic_long_add(v, &zone->vm_stat[i]); global_zone_diff[i] += v; -#ifdef CONFIG_NUMA - /* 3 seconds idle till flush */ - __this_cpu_write(pcp->expire, 3); -#endif } } -#ifdef CONFIG_NUMA - - if (do_pagesets) { - cond_resched(); - /* - * Deal with draining the remote pageset of this - * processor - * - * Check if there are pages remaining in this pageset - * if not then there is nothing to expire. - */ - if (!__this_cpu_read(pcp->expire) || - !__this_cpu_read(pcp->count)) - continue; - - /* - * We never drain zones local to this processor. - */ - if (zone_to_nid(zone) == numa_node_id()) { - __this_cpu_write(pcp->expire, 0); - continue; - } - - if (__this_cpu_dec_return(pcp->expire)) - continue; - - if (__this_cpu_read(pcp->count)) { - drain_zone_pages(zone, this_cpu_ptr(pcp)); - changes++; - } - } -#endif } for_each_online_pgdat(pgdat) { @@ -880,8 +840,7 @@ static int refresh_cpu_vm_stats(bool do_ } } - changes += fold_diff(global_zone_diff, global_node_diff); - return changes; + return fold_diff(global_zone_diff, global_node_diff); } /* @@ -1867,7 +1826,7 @@ int sysctl_stat_interval __read_mostly = #ifdef CONFIG_PROC_FS static void refresh_vm_stats(struct work_struct *work) { - refresh_cpu_vm_stats(true); + refresh_cpu_vm_stats(); } int vmstat_refresh(struct ctl_table *table, int write, @@ -1877,6 +1836,8 @@ int vmstat_refresh(struct ctl_table *tab int err; int i; + drain_all_pages(NULL); + /* * The regular update, every sysctl_stat_interval, may come later * than expected: leaving a significant amount in per_cpu buckets. @@ -1931,7 +1892,7 @@ int vmstat_refresh(struct ctl_table *tab static void vmstat_update(struct work_struct *w) { - if (refresh_cpu_vm_stats(true)) { + if (refresh_cpu_vm_stats()) { /* * Counters were updated so we expect more updates * to occur in the future. Keep on running the @@ -1994,7 +1955,7 @@ void quiet_vmstat(void) * it would be too expensive from this path. * vmstat_shepherd will take care about that for us. */ - refresh_cpu_vm_stats(false); + refresh_cpu_vm_stats(); } /* Index: linux-vmstat-remote/mm/page_alloc.c =================================================================== --- linux-vmstat-remote.orig/mm/page_alloc.c +++ linux-vmstat-remote/mm/page_alloc.c @@ -3176,26 +3176,6 @@ static int rmqueue_bulk(struct zone *zon return allocated; } -#ifdef CONFIG_NUMA -/* - * Called from the vmstat counter updater to drain pagesets of this - * currently executing processor on remote nodes after they have - * expired. - */ -void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp) -{ - int to_drain, batch; - - batch = READ_ONCE(pcp->batch); - to_drain = min(pcp->count, batch); - if (to_drain > 0) { - spin_lock(&pcp->lock); - free_pcppages_bulk(zone, to_drain, pcp, 0); - spin_unlock(&pcp->lock); - } -} -#endif - /* * Drain pcplists of the indicated processor and zone. */