From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0036A417BD3 for ; Mon, 20 Jul 2026 19:35:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784576136; cv=none; b=G/ivwG0Nkz+KLrpRGHbzo2yNVp8aCEt5d3sZAey3z2moMBNur9vwPt4meotXkuzLPXEsSAxPh7xXMhxjDZQ58fzH9BVkhxZYjre/tPy258Nsmcebbhv0Mc+Oh1AGvoRlT710yL1yKkbccw3wtNSdKnfXoIxxHHDom/thoHeVVzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784576136; c=relaxed/simple; bh=6wvL9kFs+/iObzzTHi4ROLnjN3QU20HiRZxAvTAZnCY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SDIY3tPoOkTqS2uGxQKvd6Imxy9GAw2J0XDtw+DEncfL7DT4DX9e44G98+2RM0CGBqL9MkdHDvlzvAGF8QBie7U7LhRE/SdHu3U/6HWyZcsN+y0zzmPha216QSXTQqYXTI1VDyzk4Mi0cf7YOu3qfr+IOPjeqZqWmWrV5EzGdvQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=L4gW76ap; arc=none smtp.client-ip=209.85.219.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="L4gW76ap" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-8ff20870ac7so82739616d6.1 for ; Mon, 20 Jul 2026 12:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1784576130; x=1785180930; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=5vrQuTcVEPlse/fTzTDhuMYNi8KtlAM6dYGGAEP65OU=; b=L4gW76apk6imA1g4FBxC9a71rNNIXDqP81v2URm2fTko6neDHc4aT3I5ftm7tXDFua 8GWJHf3tdHj+oG+yAgj450arymSnKbycLSK3dD6CuMKetOSSo54k9gd2N8LIJG4JMm/R Bss853mH478zjRHByEyp4kw9ZY7HXtxWjN3MdW7VECQPcuBHDf8s1JgP++vh4hLt2NUF WjYPRRYWTGD2KzQHAQzE/A9c6GcvlGXEQb76dj1oDbygBjEt00Z8oE4ZHIFYoCaJIZlU LWexaTdGub23r0ZB5UvXw2FWB6bV8y2oo71nUEvYy2a+fr9HUMyAEGVEp8HalmvfTOzd p5cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784576130; x=1785180930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=5vrQuTcVEPlse/fTzTDhuMYNi8KtlAM6dYGGAEP65OU=; b=g7bMdwAwE1qL9ZxkPEfzl8KvviqNc7XPfjNQHUrMBh8cHl+HcENgL+ubj08cHOEV41 ntjRzdqzgz8DNIuGbWmBn8S3bVWb0jvbKzcu2d+u42g6LF8KAM5hR8CTkvTHhwDI4C2H Ozn42LnJsou/OA4h4yR6d8FXsVrgThp/ZVJjffwYY3jiSbthTJhn7Ame3daGdRyV9b5z BEN2bv7XN36otEOL46CRDcRTNI5O2obgFVBa3PXsA5veAEzdR4OG/xYKOBFHumvow7IH Vb6Y5qM/Xh5gKzVKWY8W0gt9k++HtzmdBW0VQHtIMF0G3lj5OG83AJ/zFvZ2h4Y5yD6t b94w== X-Forwarded-Encrypted: i=1; AHgh+RqOt2kDEWxzC2cDicUcLys3kWD6ibRpi6uLi877BUuxouKF/HNSbqR+IMNVi+fXGHrXYTjjAy/D@vger.kernel.org X-Gm-Message-State: AOJu0Yyx2dJWa6BT49yiIoFEZRiNEZN55+LuE+Eq0xq5HolXH/a+5O58 +h3MERXkRA+Uhzbq7IbIxtadlcY9p7P3P3jKjiHsdYNZjrO1G4bFIuhWzbGqCOr40YU= X-Gm-Gg: AfdE7cmvK1xqvaV+fncq9fSOxXs91/PWCtj5pvPTlbISxsmgCSHAeyto8TktXfs3q9X DCyXHmTceSx5RG6PRREgukJbLAPDLTBc72LJkBJwOnW+GEhh1m8dYFC2EvWQJci2noPMuKRQDDh gchfcdG91l5pHiBMOz4K25SpX6TJBZmnRCPe2IwiQVebJbePXdlpYjYyi2uqqKVGapqONJ5KOkh Nia6Jh9JyKk4g5RWYxhYUU9afOK5MZ3jNL/SYswhrVSdbDsw+NLUyc4F3s0LQzrywdeAKKq0yvS +3Lyq24xtulFwy1m6tQA+PHccEmKBA0xnhlHxHt1pb89MCqa1N3bGNJ8KnGvqu7ALQ9dr5/owyZ urajgi1LlVGwnuFSXvXZvCgunltt2J7xqDNOu1M06d4vYTFwxiJwzsiIRCMdWtGLC/jfUgjUUdQ pAjaCYEkLnE4VcfE1gUe8TARgqNwQTzlogBUyjDrO0Ycx3NVl1M/u52Cr7KDwQlK4= X-Received: by 2002:a05:620a:4606:b0:92e:c117:5ecb with SMTP id af79cd13be357-930b430a072mr1502942385a.75.1784576130602; Mon, 20 Jul 2026 12:35:30 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F.lan (pool-173-79-60-52.washdc.fios.verizon.net. [173.79.60.52]) by smtp.gmail.com with ESMTPSA id af79cd13be357-930b545e47bsm957792285a.35.2026.07.20.12.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 12:35:30 -0700 (PDT) From: Gregory Price To: linux-mm@kvack.org Cc: Zhigang.Luo@amd.com, arun.george@samsung.com, balbirs@nvidia.com, brendan.jackman@linux.dev, yuzenghui@huawei.com, apopple@nvidia.com, alucerop@amd.com, matthew.brost@intel.com, akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, corbet@lwn.net, skhan@linuxfoundation.org, gregkh@linuxfoundation.org, rafael@kernel.org, dakr@kernel.org, djbw@kernel.org, vishal.l.verma@intel.com, dave.jiang@intel.com, alison.schofield@intel.com, osandov@osandov.com, jannh@google.com, pfalcato@suse.de, jackmanb@google.com, hannes@cmpxchg.org, ziy@nvidia.com, pbonzini@redhat.com, osalvador@suse.de, joshua.hahnjy@gmail.com, rakie.kim@sk.com, byungchul@sk.com, gourry@gourry.net, ying.huang@linux.alibaba.com, kasong@tencent.com, qi.zheng@linux.dev, shakeel.butt@linux.dev, baohua@kernel.org, axelrasmussen@google.com, yuanchu@google.com, weixugc@google.com, yury.norov@gmail.com, linux@rasmusvillemoes.dk, longman@redhat.com, ridong.chen@linux.dev, tj@kernel.org, mkoutny@suse.com, sj@kernel.org, jgg@ziepe.ca, jhubbard@nvidia.com, peterx@redhat.com, baolin.wang@linux.alibaba.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, lance.yang@linux.dev, usama.arif@linux.dev, xu.xin16@zte.com.cn, chengming.zhou@linux.dev, roman.gushchin@linux.dev, muchun.song@linux.dev, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, driver-core@lists.linux.dev, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-debuggers@vger.kernel.org, linux-fsdevel@vger.kernel.org, kvm@vger.kernel.org, cgroups@vger.kernel.org, damon@lists.linux.dev, linux-kselftest@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v5 20/36] mm/memcontrol: account private-node memory in per-node stats Date: Mon, 20 Jul 2026 15:34:14 -0400 Message-ID: <20260720193431.3841992-21-gourry@gourry.net> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260720193431.3841992-1-gourry@gourry.net> References: <20260720193431.3841992-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Private nodes folios are charged like any other - the node's per-cpu lruvec counters are increment even for N_MEMORY_PRIVATE. The memcg-level totals in memory.stat therefore include this memory, but the per-node views do not: - mem_cgroup_css_rstat_flush() folds the per-node percpu deltas into the aggregate only for N_MEMORY nodes, so a private node's lruvec aggregate is never refreshed. - memory.numa_stat (v2) and the v1 numa_stat skip private nodes, so they never emit an Nx= field for one. So memory.numa_stat does not sum to memory.stat once a cgroup has memory on a private node. Include N_MEMORY_PRIVATE in the flush/display process so private-node memory is folded in and reported per node. This is pure accounting of memory that already exists and is already charged, so it is unconditional - regardless of future capabilities. Signed-off-by: Gregory Price --- mm/memcontrol-v1.c | 8 ++++++-- mm/memcontrol.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 2dc599484d006..5e464e52dfb9a 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -2132,14 +2132,18 @@ static int memcg_numa_stat_show(struct seq_file *m, void *v) const struct numa_stat *stat; int nid; struct mem_cgroup *memcg = mem_cgroup_from_seq(m); + nodemask_t reportable; mem_cgroup_flush_stats(memcg); + /* Private nodes hold cgroup memory too, report them. */ + nodes_or(reportable, node_states[N_MEMORY], node_states[N_MEMORY_PRIVATE]); + for (stat = stats; stat < ARRAY_END(stats); stat++) { seq_printf(m, "%s=%lu", stat->name, mem_cgroup_nr_lru_pages(memcg, stat->lru_mask, false)); - for_each_node_state(nid, N_MEMORY) + for_each_node_mask(nid, reportable) seq_printf(m, " N%d=%lu", nid, mem_cgroup_node_nr_lru_pages(memcg, nid, stat->lru_mask, false)); @@ -2151,7 +2155,7 @@ static int memcg_numa_stat_show(struct seq_file *m, void *v) seq_printf(m, "hierarchical_%s=%lu", stat->name, mem_cgroup_nr_lru_pages(memcg, stat->lru_mask, true)); - for_each_node_state(nid, N_MEMORY) + for_each_node_mask(nid, reportable) seq_printf(m, " N%d=%lu", nid, mem_cgroup_node_nr_lru_pages(memcg, nid, stat->lru_mask, true)); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f0dde52dc9e0e..4d79e238bc57d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4496,6 +4496,7 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) struct mem_cgroup *parent = parent_mem_cgroup(memcg); struct memcg_vmstats_percpu *statc; struct aggregate_control ac; + nodemask_t reportable; int nid; flush_nmi_stats(memcg, parent); @@ -4524,7 +4525,9 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) }; mem_cgroup_stat_aggregate(&ac); - for_each_node_state(nid, N_MEMORY) { + /* Private nodes must also be accounted or numa_stat is misleading */ + nodes_or(reportable, node_states[N_MEMORY], node_states[N_MEMORY_PRIVATE]); + for_each_node_mask(nid, reportable) { struct mem_cgroup_per_node *pn = memcg->nodeinfo[nid]; struct lruvec_stats *lstats = pn->lruvec_stats; struct lruvec_stats *plstats = NULL; @@ -4947,9 +4950,13 @@ static int memory_numa_stat_show(struct seq_file *m, void *v) { int i; struct mem_cgroup *memcg = mem_cgroup_from_seq(m); + nodemask_t reportable; mem_cgroup_flush_stats(memcg); + /* Private nodes hold cgroup memory too, report them. */ + nodes_or(reportable, node_states[N_MEMORY], node_states[N_MEMORY_PRIVATE]); + for (i = 0; i < ARRAY_SIZE(memory_stats); i++) { int nid; @@ -4957,7 +4964,7 @@ static int memory_numa_stat_show(struct seq_file *m, void *v) continue; seq_printf(m, "%s", memory_stats[i].name); - for_each_node_state(nid, N_MEMORY) { + for_each_node_mask(nid, reportable) { u64 size; struct lruvec *lruvec; -- 2.53.0-Meta