From patchwork Mon Aug 8 19:48:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Tomlin X-Patchwork-Id: 12939099 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 4C7F7C00140 for ; Mon, 8 Aug 2022 19:48:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CEC5B6B0073; Mon, 8 Aug 2022 15:48:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C75278E0002; Mon, 8 Aug 2022 15:48:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEE728E0001; Mon, 8 Aug 2022 15:48:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 9D47D6B0073 for ; Mon, 8 Aug 2022 15:48:28 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 79B56A5852 for ; Mon, 8 Aug 2022 19:48:28 +0000 (UTC) X-FDA: 79777462296.31.5448B58 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 0C2041A013B for ; Mon, 8 Aug 2022 19:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659988107; 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=IEGgPc6kXu5gJq3u5V+y6qTg7ywEaMnnfFNE/DMiRTs=; b=GQK54kTZLdpofVv5tshqqFJtI1NMMTBjJ13m9nwa1iSIeaR/51RoOkbCkAtpSEwkgd1+VZ upMiLjGVsnORxjYbIGo006urdBiAfxi97IkPfxNW0uAZTOyBTxuLAcGL4DNq+8E7k38WjU Pwx3UJx1Qv4Hm8dfQL+Z+XL1ReJEj9U= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-515-wEnHlUBDNH6mJ6rmEgML8Q-1; Mon, 08 Aug 2022 15:48:26 -0400 X-MC-Unique: wEnHlUBDNH6mJ6rmEgML8Q-1 Received: by mail-wr1-f69.google.com with SMTP id x5-20020adfbb45000000b0021ee56506dfso1635339wrg.11 for ; Mon, 08 Aug 2022 12:48:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=IEGgPc6kXu5gJq3u5V+y6qTg7ywEaMnnfFNE/DMiRTs=; b=K5tQIQ/TFlQG7ENXVSWxLgCEIIZT7NgOMhFUO2xXl6xUiyOQzq+Efp7Q8Gy5p3Vi+w WpOHZt7dMZ3y2H8c2FHDi7C28U7WVpKt91Tt/yCAF8rd1yS5+6p+g7tH/JeQUBukqHmE aAKiI0mJCuFUejA8by+747HWT9kkpOhRGOLtnW3wOO1eqiOkmnuAxDklH/+nRvByYWvr 0+CFSvVib8xpuuk5RqOc4zs3CmBjf9rGHwRk9NETLwh60l+29s4uQcKFdEAnQkKPjSEr NHnksV2MakmoF2RsENM0RfuMPMQoRa9qj8I+VaMaGX/5lxclGYYRBgTw6BelU9Pq9cLZ jTgQ== X-Gm-Message-State: ACgBeo1REeP5nCCqfgAxk9Pr0LsFSGiF8Kgy7bWjCWougNASI1lZ0ZGI EDmHUzADOdCFsU+BJJVov9DbJEVq0EDArQ0oYJsU03561jlBfTBSTrWM7AzfdOoIDgAfP1YKEWX DnK9HHf+VLA== X-Received: by 2002:a05:6000:a13:b0:220:62e6:5f79 with SMTP id co19-20020a0560000a1300b0022062e65f79mr12348670wrb.45.1659988105663; Mon, 08 Aug 2022 12:48:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Db4VKdX6HbbVZxJFXbXkTzkfDbMXt99KIC4g2B5bXybiUQFPjoT64TLqnJf38iLorwCfxAA== X-Received: by 2002:a05:6000:a13:b0:220:62e6:5f79 with SMTP id co19-20020a0560000a1300b0022062e65f79mr12348652wrb.45.1659988105429; Mon, 08 Aug 2022 12:48:25 -0700 (PDT) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id g17-20020a5d5551000000b0021e4f595590sm12076081wrw.28.2022.08.08.12.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 12:48:24 -0700 (PDT) From: Aaron Tomlin To: frederic@kernel.org, mtosatti@redhat.com Cc: cl@linux.com, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, pauld@redhat.com, neelx@redhat.com, oleksandr@natalenko.name, atomlin@atomlin.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v6 1/2] mm/vmstat: Use per cpu variable to track a vmstat discrepancy Date: Mon, 8 Aug 2022 20:48:19 +0100 Message-Id: <20220808194820.676246-2-atomlin@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808194820.676246-1-atomlin@redhat.com> References: <20220808194820.676246-1-atomlin@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659988108; a=rsa-sha256; cv=none; b=RCOhLcuxUD0Q/a4DKr6tOufbBAnt2instptQwmBHH1NndFf9FCHzmDL8Ck8Ybc877Zj/+N DDgScYUKza+s6lO3WEwHKGSvTPMTlZuRz3OZojG8CiudI2iRg/9KgOw7pCTZakCeDVCw7J wr2Mi6tWsFqhmQoAx18urU9P6leYDwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659988108; 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=IEGgPc6kXu5gJq3u5V+y6qTg7ywEaMnnfFNE/DMiRTs=; b=vK63oAy+rEMsndnocMNTeyvY46xER5c7/DRZQgf9gnHiDLo1IZCjDq4Dtcn4OgqRgICCnY mMnspkqm7l8Zi106kH44p5Mj7x/42i/vnUjj9GXC40iw77kHbiVFwuJE1qXP5vIR4lZoo1 Spf3wD+GRyM685/01dAVz0tGyBFtqQk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GQK54kTZ; spf=pass (imf19.hostedemail.com: domain of atomlin@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=atomlin@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Stat-Signature: xcy1c3qaq7onyok6ujckxhrrcom4jkes X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0C2041A013B Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GQK54kTZ; spf=pass (imf19.hostedemail.com: domain of atomlin@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=atomlin@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1659988107-912163 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: This patch incorporates an idea from Marcelo's patch [1] where a CPU-specific variable namely vmstat_dirty is used to indicate if a vmstat imbalance is present for a given CPU. Therefore, at the appropriate time, we can fold all the remaining differentials. [1]: https://lore.kernel.org/lkml/20220204173554.763888172@fedora.localdomain/ Signed-off-by: Aaron Tomlin --- mm/vmstat.c | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/mm/vmstat.c b/mm/vmstat.c index 373d2730fcf2..51564b7c85fe 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -195,6 +195,12 @@ void fold_vm_numa_events(void) #endif #ifdef CONFIG_SMP +static DEFINE_PER_CPU_ALIGNED(bool, vmstat_dirty); + +static inline void mark_vmstat_dirty(void) +{ + this_cpu_write(vmstat_dirty, true); +} int calculate_pressure_threshold(struct zone *zone) { @@ -367,6 +373,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item, x = 0; } __this_cpu_write(*p, x); + mark_vmstat_dirty(); if (IS_ENABLED(CONFIG_PREEMPT_RT)) preempt_enable(); @@ -405,6 +412,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item, x = 0; } __this_cpu_write(*p, x); + mark_vmstat_dirty(); if (IS_ENABLED(CONFIG_PREEMPT_RT)) preempt_enable(); @@ -603,6 +611,7 @@ static inline void mod_zone_state(struct zone *zone, if (z) zone_page_state_add(z, zone, item); + mark_vmstat_dirty(); } void mod_zone_page_state(struct zone *zone, enum zone_stat_item item, @@ -671,6 +680,7 @@ static inline void mod_node_state(struct pglist_data *pgdat, if (z) node_page_state_add(z, pgdat, item); + mark_vmstat_dirty(); } void mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item, @@ -1873,6 +1883,7 @@ int sysctl_stat_interval __read_mostly = HZ; static void refresh_vm_stats(struct work_struct *work) { refresh_cpu_vm_stats(true); + this_cpu_write(vmstat_dirty, false); } int vmstat_refresh(struct ctl_table *table, int write, @@ -1937,6 +1948,7 @@ int vmstat_refresh(struct ctl_table *table, int write, static void vmstat_update(struct work_struct *w) { if (refresh_cpu_vm_stats(true)) { + this_cpu_write(vmstat_dirty, false); /* * Counters were updated so we expect more updates * to occur in the future. Keep on running the @@ -1948,35 +1960,6 @@ static void vmstat_update(struct work_struct *w) } } -/* - * Check if the diffs for a certain cpu indicate that - * an update is needed. - */ -static bool need_update(int cpu) -{ - pg_data_t *last_pgdat = NULL; - struct zone *zone; - - for_each_populated_zone(zone) { - struct per_cpu_zonestat *pzstats = per_cpu_ptr(zone->per_cpu_zonestats, cpu); - struct per_cpu_nodestat *n; - - /* - * The fast way of checking if there are any vmstat diffs. - */ - if (memchr_inv(pzstats->vm_stat_diff, 0, sizeof(pzstats->vm_stat_diff))) - return true; - - if (last_pgdat == zone->zone_pgdat) - continue; - last_pgdat = zone->zone_pgdat; - n = per_cpu_ptr(zone->zone_pgdat->per_cpu_nodestats, cpu); - if (memchr_inv(n->vm_node_stat_diff, 0, sizeof(n->vm_node_stat_diff))) - return true; - } - return false; -} - /* * Switch off vmstat processing and then fold all the remaining differentials * until the diffs stay at zero. The function is used by NOHZ and can only be @@ -1990,7 +1973,7 @@ void quiet_vmstat(void) if (!delayed_work_pending(this_cpu_ptr(&vmstat_work))) return; - if (!need_update(smp_processor_id())) + if (!__this_cpu_read(vmstat_dirty)) return; /* @@ -2000,6 +1983,7 @@ void quiet_vmstat(void) * vmstat_shepherd will take care about that for us. */ refresh_cpu_vm_stats(false); + __this_cpu_write(vmstat_dirty, false); } /* @@ -2021,7 +2005,7 @@ static void vmstat_shepherd(struct work_struct *w) for_each_online_cpu(cpu) { struct delayed_work *dw = &per_cpu(vmstat_work, cpu); - if (!delayed_work_pending(dw) && need_update(cpu)) + if (!delayed_work_pending(dw) && per_cpu(vmstat_dirty, cpu)) queue_delayed_work_on(cpu, mm_percpu_wq, dw, 0); cond_resched();