From patchwork Fri Mar 3 19:58:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 13159447 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 509D1C64EC4 for ; Fri, 3 Mar 2023 20:00:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCC506B007E; Fri, 3 Mar 2023 15:00:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CF5E96B0072; Fri, 3 Mar 2023 15:00:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 937866B0080; Fri, 3 Mar 2023 15:00:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 726876B0074 for ; Fri, 3 Mar 2023 15:00:39 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5149D80A32 for ; Fri, 3 Mar 2023 20:00:39 +0000 (UTC) X-FDA: 80528654598.24.18DAA65 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id E864A1C002F for ; Fri, 3 Mar 2023 20:00:35 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Bbo3oW5k; spf=pass (imf21.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=1677873637; 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=IfmEZbI07ssv3V+KDjFdIQuKlrQcGRyABc4XWTDPLx0uzRnUMsmsi5CoWJobfhZt89BciC RAmaRnQQ5kFZB9X/SOqQEY+EAzfpNjJNb7yg2qMCwQvo9OFhkjlAtJ5QCP+1zzPz5pPeh4 2ov+dGH5rCvXCdqu3YWGxrhEsWLkpA8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Bbo3oW5k; spf=pass (imf21.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=1677873637; a=rsa-sha256; cv=none; b=l5ubE0tU0iQlDLQn0wiH8lOLb/3jPGAjssDn9raaVS+tYNr2TWZ7IxQLxMUSSD0AZNEZxC SxDxnW7wQKVfrSgCJPRGKLR8LVhZDU0Chlbl/UYdWTkKPagy0AQn4tyJ5idRYBC8t7VzDF jfitSbj1rrU/20gAVZzyJDcmC388n0U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677873635; 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=Bbo3oW5kwuKXovhqSTi01jPs4eqgWklMw9ijOd21qcthYzYk/FLLuOTMtvw9H+mGzvVq7Y csK7Hz81Iz0MJ4pi670S/S98Tn2R1+AGjFvHk1B0U6Tiqd72yem7kC66EmC0JUg4Yqqw/E 2r1wNkT2fdqrPIFxL+dqdf7evd4GeJo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518-geIIwn8RNXmtnWL1QLi5hQ-1; Fri, 03 Mar 2023 15:00:32 -0500 X-MC-Unique: geIIwn8RNXmtnWL1QLi5hQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97BA8280AA46; Fri, 3 Mar 2023 20:00:30 +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 2AE3B440D8; Fri, 3 Mar 2023 20:00:30 +0000 (UTC) Received: by tpad.localdomain (Postfix, from userid 1000) id 8A25240E00366; Fri, 3 Mar 2023 17:00:12 -0300 (-03) Message-ID: <20230303195908.774798959@redhat.com> User-Agent: quilt/0.67 Date: Fri, 03 Mar 2023 16:58:42 -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 v3 01/11] mm/vmstat: remove remote node draining References: <20230303195841.310844446@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: E864A1C002F X-Stat-Signature: iweimikzcpjxpo4omou54ukxenqjnqju X-Rspam-User: X-HE-Tag: 1677873635-447673 X-HE-Meta: U2FsdGVkX19GCqjzNq+7FE3B1OrHNeqc3oizjvh0L4l9Xii4daLcYI/KMx13ZqwLWC2WLePwwqSd5cHACROE3TCM7iwa7Fbl/uNygrVRNIoAVVIg+UKw6DIpZpji0tXk/sGl7g605Ju9gNbrghgPUWXkZGLp58v4lv9AlzzFPpymadXIYbyrQj8DXNFduXPwC6mK8TzPWExJrc66rTxlLCHMh+KVFUipt/kxZDK7CCEi762clU+Zi1p4KcRIveuwOQMECJ7DINXHyqSZZsSWMT9Fs2krWFLKzjoA4G8/w2HG3iEqYFdSaPDSv0VfXULa7KUDpJwSaIoDnvOoG5QJTHBrc+nS06tTaT7ZIvu7pw3UsDX3TdSY2Xw9hmKIQo+k+dpFvu6Mgl6kpHxgl9Kuy1prDZzOgHMekpi3fNUjnIXuzBio14u+RUe4VpY//VU4GjgI8bEJummNx4kXklDkmfQYzhgN8d412ZimPvUuSjIDF6hchEzusyO6Q33u5pPZEiDEBeQyKxo+jHQl0+LeAcvJlgM9837ZIMw+g/GSEtGGghmd/ijJSTnxVDllfrmV5RaBZ7zapomNz0NgOckIHizAzKnMt+mLabHYCqs+2VQ2aFhpw6LypA5wA/0aUX6pEF9RGITgNWEwWvhMJcq76cSuo/A2J8Eq90buDGLqMziuPikdpQWIYi80I3j0dkEVJcdlCjI3eNPDV9l0b3jfT3W5cWO8FN1tVLzuf4TN62lbNHMoW0Nm9PpXWj0X2RCeB//SRrXAMmSN6ljDJiYbb7bGqwBMPBqkBt/V7j2vCR0wG61cDn8ERO8LKMKqnn08MDQGMktEkoUU7h+M7zCZB/s2Y0zIywdXPM/nwwhA3px6P4/gRXuUstjaAngc2BHM2ftxZv+hZKQLOSmiXGHkgvzNQK+3uQ1BSWlHbA3VZ/SOwzAJXbgHoTd+AJWPHUrpGrQUgHrCGD/o3QlMYEI Z4YSpvEf A46RtK76fDs1P+I0FQ2jCj+gRJIddsAGN5M5uL98gGsa6KasndCczu4QukgV01kiWTaKRtMhibqVRmwHH2jTkoPAtaaMyogoyUlAon2/sE1HU0zkK78tneHEjCMeCGG8P/ErYh43ytISsPEU0i1JEBdvpufQl4vksOezpGpd7sQUWERQ9mYeFeaO43oYo5alrU/sGw0ZoQSs0t9saDAuoV6FOg1TFJauYw8PMGwIvm4vsFTk= 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. */