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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 2BB50C433E0 for ; Tue, 9 Feb 2021 16:33:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B542064EBD for ; Tue, 9 Feb 2021 16:33:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B542064EBD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 12FED6B006E; Tue, 9 Feb 2021 11:33:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B8FB6B0070; Tue, 9 Feb 2021 11:33:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E73616B0071; Tue, 9 Feb 2021 11:33:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0001.hostedemail.com [216.40.44.1]) by kanga.kvack.org (Postfix) with ESMTP id D102C6B006E for ; Tue, 9 Feb 2021 11:33:30 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8EC9018044722 for ; Tue, 9 Feb 2021 16:33:30 +0000 (UTC) X-FDA: 77799274980.19.elbow69_2f133fa27608 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 671581ACC30 for ; Tue, 9 Feb 2021 16:33:30 +0000 (UTC) X-HE-Tag: elbow69_2f133fa27608 X-Filterd-Recvd-Size: 5768 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Feb 2021 16:33:29 +0000 (UTC) Received: by mail-qk1-f176.google.com with SMTP id o193so8986891qke.11 for ; Tue, 09 Feb 2021 08:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=anbL9Wexkq0QH+x4JfZ6vBo+adkAAWXAkexWmp3sHZ4=; b=uUoTNOiklG6u2aW1knB5j/h/924xUJpKPs57Dj8b9JUhO6eDFx4f+sK/hI+2XkfU7w qZ9iFDMaTnN42JrNKnouJvy6aVioYi1JQfidV0ejnNRSJ8lDP65Q8cd/Umnq57IjhMDz QMo9O0APPGpcdTdqthVXAvueK4C0BCEq0bKUbV/4UnwOswcBsHhYOVZ2QpOYL5kbkT3e e5XCOROPJWvDpgQzIUkA3f70l2e8sBRCrbe/P9JqzBGB3Vn8Rs06NRenB4XWIWYV994O BXhLDRbV5+P10DPS+ALOu/znxLWZYPgRfWOlFdPuTy2WZgK3Yzsv8WwBHW2ZbFnGGy+6 6wDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=anbL9Wexkq0QH+x4JfZ6vBo+adkAAWXAkexWmp3sHZ4=; b=EPQPnoGt1TA7kyYmBDvXw5EJ/+HiOfb8kCsf0srF2w2ZLlsMieWRVPyGt9JozW9koC xBddGxG9f32hJH1wtk3E2oPvtCnd585KFc9B4Igi+OJ5QNzv7UOeUTKHgBsmN1X/TAgy HqryP1VHKDPvvjWHgLJp0j3EPG3WNudo9uj36yqVcmjmIdnsKI3l+RkWAS+CzWumo/i4 WtGQh1nfa9RlWsAszkpWhSs2INaQwiJDdbc7comJDna+LLwUDJTxJ9lm2TsANkEZT/+x B0ynDAdIsNikf5gQGZrglHTg83yIg8MS7o9cB+PC7eNzx7inaznM7QesFwODAv1SPR+u 0wLA== X-Gm-Message-State: AOAM5310l5gSEdx7k+aHyzv8PXZdJ+FMk6UJfrY+AfHYGZZtRonNY/nq NaFLUb3bxt+nLguZKV8vVfhSsw== X-Google-Smtp-Source: ABdhPJwDoRY7xAR2fOrTYv8xy1rPzMuRpJIsFN/IiiPrGYPncEiYJ12mhSRV/4f71WsmFZmNOxOXeA== X-Received: by 2002:a37:54b:: with SMTP id 72mr8006905qkf.338.1612888409122; Tue, 09 Feb 2021 08:33:29 -0800 (PST) Received: from localhost (70.44.39.90.res-cmts.bus.ptd.net. [70.44.39.90]) by smtp.gmail.com with ESMTPSA id 18sm15860050qtw.70.2021.02.09.08.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 08:33:28 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Tejun Heo , Michal Hocko , Roman Gushchin , Shakeel Butt , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v3 1/8] mm: memcontrol: fix cpuhotplug statistics flushing Date: Tue, 9 Feb 2021 11:32:57 -0500 Message-Id: <20210209163304.77088-2-hannes@cmpxchg.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210209163304.77088-1-hannes@cmpxchg.org> References: <20210209163304.77088-1-hannes@cmpxchg.org> MIME-Version: 1.0 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 memcg hotunplug callback erroneously flushes counts on the local CPU, not the counts of the CPU going away; those counts will be lost. Flush the CPU that is actually going away. Also simplify the code a bit by using mod_memcg_state() and count_memcg_events() instead of open-coding the upward flush - this is comparable to how vmstat.c handles hotunplug flushing. Fixes: a983b5ebee572 ("mm: memcontrol: fix excessive complexity in memory= .stat reporting") Signed-off-by: Johannes Weiner Reviewed-by: Shakeel Butt Reviewed-by: Roman Gushchin Acked-by: Michal Hocko --- mm/memcontrol.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ed5cc78a8dbf..8120d565dd79 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2411,45 +2411,52 @@ static void drain_all_stock(struct mem_cgroup *ro= ot_memcg) static int memcg_hotplug_cpu_dead(unsigned int cpu) { struct memcg_stock_pcp *stock; - struct mem_cgroup *memcg, *mi; + struct mem_cgroup *memcg; =20 stock =3D &per_cpu(memcg_stock, cpu); drain_stock(stock); =20 for_each_mem_cgroup(memcg) { + struct memcg_vmstats_percpu *statc; int i; =20 + statc =3D per_cpu_ptr(memcg->vmstats_percpu, cpu); + for (i =3D 0; i < MEMCG_NR_STAT; i++) { int nid; - long x; =20 - x =3D this_cpu_xchg(memcg->vmstats_percpu->stat[i], 0); - if (x) - for (mi =3D memcg; mi; mi =3D parent_mem_cgroup(mi)) - atomic_long_add(x, &memcg->vmstats[i]); + if (statc->stat[i]) { + mod_memcg_state(memcg, i, statc->stat[i]); + statc->stat[i] =3D 0; + } =20 if (i >=3D NR_VM_NODE_STAT_ITEMS) continue; =20 for_each_node(nid) { + struct batched_lruvec_stat *lstatc; struct mem_cgroup_per_node *pn; + long x; =20 pn =3D mem_cgroup_nodeinfo(memcg, nid); - x =3D this_cpu_xchg(pn->lruvec_stat_cpu->count[i], 0); - if (x) + lstatc =3D per_cpu_ptr(pn->lruvec_stat_cpu, cpu); + + x =3D lstatc->count[i]; + lstatc->count[i] =3D 0; + + if (x) { do { atomic_long_add(x, &pn->lruvec_stat[i]); } while ((pn =3D parent_nodeinfo(pn, nid))); + } } } =20 for (i =3D 0; i < NR_VM_EVENT_ITEMS; i++) { - long x; - - x =3D this_cpu_xchg(memcg->vmstats_percpu->events[i], 0); - if (x) - for (mi =3D memcg; mi; mi =3D parent_mem_cgroup(mi)) - atomic_long_add(x, &memcg->vmevents[i]); + if (statc->events[i]) { + count_memcg_events(memcg, i, statc->events[i]); + statc->events[i] =3D 0; + } } } =20 --=20 2.30.0