From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 CD842194A6C for ; Wed, 10 Dec 2025 08:01:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765353722; cv=none; b=nnh2up+7y9dvvWZUR0MwFLU9mNTEsGJMjpuK3VUWuQlIYTFwLwTiydWmMVaMu/Mb5O2/SLCS0oL0iV5rzijs6R1kj20REIE4PiIgrbJ8A6OJqGzC+84ju/kz1skEbXJEJCQdIQoxowmhP+C/qxgXhdfImHP6lc1cAuKTfGHZXII= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765353722; c=relaxed/simple; bh=LX8v6z/ah3+Qpk3C8yiRf3o4MPLYa8STtLsBAqPjamQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=vAbXUXKmHfeiYpHjc5GbvC0z8ZtDjcFEUbGcKxsWz5w6KKRD6/d7b80OSl+tMt/XN8NLPoQwsZmIP4w9ih06F7FJA2YGZSx1VsgIVjTAyG5AqeBEz0S/6Ve9NyFTS0ZOppazBsXGCMxiYcetOZ81dMeBJk+4l4MnSaeVq7736S0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=OYHvrxDv; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="OYHvrxDv" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-477a1c28778so79922305e9.3 for ; Wed, 10 Dec 2025 00:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1765353718; x=1765958518; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=DkVuj9mbdsClta7Votk9X9DX3sJA8TqrW8wJK43sNi0=; b=OYHvrxDva3wKMS6jndlNMFlKdxb6nza6YP5bwVZEQT7l4R4J3VmfGviqYDwJe/Uvx1 /OcYjA05ihQ2trUQtKUAUENLiFTD/EAathSbEN1vVBticp2qYtr0y+FmeC1likE0OsQI s5tJeNyhBhVJNb5x1B2//QpTKiAFoar5XKH1wJn0UGW861saIt4bScNWaJzoKYxY6Rsj Algl1eARw0E3bMm4pL5R5/VX7GmI1uZoGnQlyHHybshJmghB1By5adFdlFv1l9Jrb+UM cLXZnGC3rdHPBkbQYDXB5kp+/NOUXMZ4v0PO85arrrRQwlzrzGPs+fh/9jm4EwqQ5pm9 aAtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765353718; x=1765958518; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DkVuj9mbdsClta7Votk9X9DX3sJA8TqrW8wJK43sNi0=; b=sz/USSLBEXF6vOkOyKcQJREcwU7R6MwNO84ujm33UPZV3b41LCQ9Q8aF1Uh3uBm5jb paWouoMnwCl7SDsq55Gp9ZUwFPOsnXn3ceGOQ0NrBpgUJtzQJcioyC0jkMYzHKCFHRB1 YBDD1CAteRjYjVodrSs9LIdFyrdd7+CutiOk9NYYmSoOpqhBfnMTpU0uOvDhUU74mDy1 ebFyItPsFdRQUaufTih26SImHNBxQcc4BBBKu0sFF4n+ZUmtv2vxZz1stoR5h+M7TrqT zAMifaKO+YR1bhiheznWvwkV7SFa+1gHICNN4gAD2tfRXlI9ZhQJ5QJVcPGvhIU4CNZf 5qcA== X-Forwarded-Encrypted: i=1; AJvYcCWWG2EJ/eE5NzLhkGARz1w5WFL8dMR7DQ+qyRcPOXXY8r9yoHkWmbnJUxThhvIM5njY8zpEnn8qJQpuKss=@vger.kernel.org X-Gm-Message-State: AOJu0YyFeKx8MhkWpo2xOOqYiRIl4wLtKsLctMmOVO/IqI8EHFpnpKop Irel/cnTqozKrQi+HcRIlnmN+vcyI/hhhcwYef28DjQ+nLFGc7AJ57Mfh9dGy1Rmodw= X-Gm-Gg: ASbGncvg75Dv9HleKONflHP2Lq6iJgrNxc2MdzmqEa9cLFco1RUz7e5McdQaeR//j2B U0Q76ZQRZh8O83weq1PuFvJNB9jEyxqu3QcTAE3N3JvYM5yRzjo8R9jq7l2rXlC+FKfAvRoYUlC 23KBFJXzOsUuTJ6ELj2bqFc6P/6dH4L4xG/p8ryutbVlcTdyqFibggJzdrjgfJuHA2KX/zUN/Ua 4RtYU2J2ejOctRzpwfEq14DzlM1X8YOFVR/kbRQVoGP/CxWFOAnN4qaE9z7FTXiehH4BEC8rDgU 6y2G0E2K278+v/1A2lgBZ7+RutVsQUP8nyBYuYpgbpq3SNT5ABBely+kcJHdBAGfFWI/A8elys+ Lj29QyxKNJiONXcjxsQi2WzALO0AydftTkJods+sBHHDFgowTmkYrfBTTE20g6EH15fMC3yTTU/ +9N7WMD0LKWohdEtfozTL6vIJH X-Google-Smtp-Source: AGHT+IEy/SB+X1dvqUJNoBvVJAi+SW3SwFAbjV31jUhKRSf9pIbkpxwopdcXvKFxbuwv92aXLPBn+A== X-Received: by 2002:a05:600c:c165:b0:477:6e02:54a5 with SMTP id 5b1f17b1804b1-47a8378cdf5mr12959395e9.18.1765353718060; Wed, 10 Dec 2025 00:01:58 -0800 (PST) Received: from localhost (109-81-30-110.rct.o2.cz. [109.81.30.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a82d31ec4sm32888435e9.8.2025.12.10.00.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Dec 2025 00:01:57 -0800 (PST) Date: Wed, 10 Dec 2025 09:01:51 +0100 From: Michal Hocko To: Chen Ridong Cc: hannes@cmpxchg.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, axelrasmussen@google.com, yuanchu@google.com, weixugc@google.com, david@kernel.org, zhengqi.arch@bytedance.com, lorenzo.stoakes@oracle.com, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, lujialin4@huawei.com Subject: Re: [PATCH -next v2 1/2] memcg: move mem_cgroup_usage memcontrol-v1.c Message-ID: References: <20251210071142.2043478-1-chenridong@huaweicloud.com> <20251210071142.2043478-2-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20251210071142.2043478-2-chenridong@huaweicloud.com> On Wed 10-12-25 07:11:41, Chen Ridong wrote: > From: Chen Ridong > > Currently, mem_cgroup_usage is only used for v1, just move it to > memcontrol-v1.c > > Signed-off-by: Chen Ridong Makes sense Acked-by: Michal Hocko Thanks > --- > mm/memcontrol-v1.c | 22 ++++++++++++++++++++++ > mm/memcontrol-v1.h | 2 -- > mm/memcontrol.c | 22 ---------------------- > 3 files changed, 22 insertions(+), 24 deletions(-) > > diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c > index 6eed14bff742..0b50cb122ff3 100644 > --- a/mm/memcontrol-v1.c > +++ b/mm/memcontrol-v1.c > @@ -427,6 +427,28 @@ static int mem_cgroup_move_charge_write(struct cgroup_subsys_state *css, > } > #endif > > +static unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > +{ > + unsigned long val; > + > + if (mem_cgroup_is_root(memcg)) { > + /* > + * Approximate root's usage from global state. This isn't > + * perfect, but the root usage was always an approximation. > + */ > + val = global_node_page_state(NR_FILE_PAGES) + > + global_node_page_state(NR_ANON_MAPPED); > + if (swap) > + val += total_swap_pages - get_nr_swap_pages(); > + } else { > + if (!swap) > + val = page_counter_read(&memcg->memory); > + else > + val = page_counter_read(&memcg->memsw); > + } > + return val; > +} > + > static void __mem_cgroup_threshold(struct mem_cgroup *memcg, bool swap) > { > struct mem_cgroup_threshold_ary *t; > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 6358464bb416..e92b21af92b1 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -22,8 +22,6 @@ > iter != NULL; \ > iter = mem_cgroup_iter(NULL, iter, NULL)) > > -unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap); > - > void drain_all_stock(struct mem_cgroup *root_memcg); > > unsigned long memcg_events(struct mem_cgroup *memcg, int event); > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index e2e49f4ec9e0..dbe7d8f93072 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3272,28 +3272,6 @@ void folio_split_memcg_refs(struct folio *folio, unsigned old_order, > css_get_many(&__folio_memcg(folio)->css, new_refs); > } > > -unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > -{ > - unsigned long val; > - > - if (mem_cgroup_is_root(memcg)) { > - /* > - * Approximate root's usage from global state. This isn't > - * perfect, but the root usage was always an approximation. > - */ > - val = global_node_page_state(NR_FILE_PAGES) + > - global_node_page_state(NR_ANON_MAPPED); > - if (swap) > - val += total_swap_pages - get_nr_swap_pages(); > - } else { > - if (!swap) > - val = page_counter_read(&memcg->memory); > - else > - val = page_counter_read(&memcg->memsw); > - } > - return val; > -} > - > static int memcg_online_kmem(struct mem_cgroup *memcg) > { > struct obj_cgroup *objcg; > -- > 2.34.1 > -- Michal Hocko SUSE Labs