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.5 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 08DE6C433E6 for ; Tue, 2 Feb 2021 18:47:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 90F1F64E51 for ; Tue, 2 Feb 2021 18:47:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90F1F64E51 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 2798D6B0006; Tue, 2 Feb 2021 13:47:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 18B706B006C; Tue, 2 Feb 2021 13:47:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EAAAA6B0070; Tue, 2 Feb 2021 13:47:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0232.hostedemail.com [216.40.44.232]) by kanga.kvack.org (Postfix) with ESMTP id CF0A26B0006 for ; Tue, 2 Feb 2021 13:47:54 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 96B2E180AD81D for ; Tue, 2 Feb 2021 18:47:54 +0000 (UTC) X-FDA: 77774212068.26.doll22_2514fe5275cd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 70ADF1804B661 for ; Tue, 2 Feb 2021 18:47:54 +0000 (UTC) X-HE-Tag: doll22_2514fe5275cd X-Filterd-Recvd-Size: 5516 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Feb 2021 18:47:53 +0000 (UTC) Received: by mail-qk1-f174.google.com with SMTP id t63so20862952qkc.1 for ; Tue, 02 Feb 2021 10:47:53 -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=MBCKydbpWga5DpiOrlHudvnTFh13spVvcDscPggPa+8=; b=iixvdo9II3CKbmX3rdwEdikCy6FYq2Xh7l6cr1JZDyZLV3tA7TuJMIZuIukFI2YdMG BTy4s/CiTvdw7jKAbWtlNoWIJe4vyWfjyD9CrO57tcOSLynLgtpULv2m6u3oUrxMqe6n cdDCwBSYaO1AFHPmCA2adqCaOiR2FF28vjLiw9S4VV2dR2P+1YK3kcyjPDRjRzQJfmHU iUdM0DlrSVzOwnsqjfhCFN1CXQKjBxXFaOvaFjkd0I314jpXy9KqXtn6Gpji3x8apJ7O WNsgg5PiF2eDrCHcn+OWgi/CW/dWhUMfSQcTW2vMCUHR5pB5jPDCL8FW9+KOOoyrSOBR s06A== 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=MBCKydbpWga5DpiOrlHudvnTFh13spVvcDscPggPa+8=; b=jcFEK70KaXcYEhHy/lHYuNh/gYA+d+xvv0bgJQNc6FigU9E185UqieYOglkC7maxNg O6d+SbhOiz2IkdvDrvsG/F592HmofoegZD2VypqwuSfoCHGxXX2s4uPo5bBnD/ziKnJ4 mAo41lf8yhQMHDt3MKRfJ3I0CNmjvEri3dRb6WlXxncyG3qz5+/hETdk9u66WOW27eiM eIARfQqXVuZH0j///QPY8oHa1IPOANMh17u5nZum4/WDQe1WATddQyIyKwIHcVTDEBuk 1uDRnLw4LCqLXjuceS+bNO/QgVE6vZ/FWF9Sr5zVOcAOxwUyc71+3zvCE3WX3Bd4p4x2 h5ig== X-Gm-Message-State: AOAM530sg6+bK9QXjCRsouI3szx6xJ7iXsHJd3AHl+ZT7/x0kZTAYx4/ wq/tPEN8/EP0jbYWhzui/8kXmTGKXO4kXQ== X-Google-Smtp-Source: ABdhPJy5MjmvwvaZM06ZkRt9SFWmclrfAONi0RAh0i6LjYYVtxj9vXig0yYsTm/dF1v/5Mq0AeSP8Q== X-Received: by 2002:a37:a40b:: with SMTP id n11mr23845773qke.430.1612291673304; Tue, 02 Feb 2021 10:47:53 -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 y135sm18881253qkb.14.2021.02.02.10.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 10:47:52 -0800 (PST) From: Johannes Weiner To: Andrew Morton , Tejun Heo Cc: Michal Hocko , Roman Gushchin , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 1/7] mm: memcontrol: fix cpuhotplug statistics flushing Date: Tue, 2 Feb 2021 13:47:40 -0500 Message-Id: <20210202184746.119084-2-hannes@cmpxchg.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210202184746.119084-1-hannes@cmpxchg.org> References: <20210202184746.119084-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. Signed-off-by: Johannes Weiner --- 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