From nobody Fri Apr 3 16:04:47 2026 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A43683DCD88 for ; Tue, 24 Mar 2026 11:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774351965; cv=none; b=nKVjCr3jFkRAWbbBj6ABh6lhBlPVOYfG95AzxVqswDJrrl2BzcgXc+iT3UgSKz7QNg9pfKS+y8FA4paxmTQRvtD2IdtqexrTloYvMksQ9uNJo1cDtqCW/sHBp8fYqLZOa+8eO123d1AHVFSw90GX/uv3xM/xz4901Bo1FqJEfZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774351965; c=relaxed/simple; bh=IEz8k1O9pt9/U5ch/7x6kxh/Ag421XNdAFTc1EsWPA8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kt1KfUd5Nw1dJViRG3+MMDdiZKzcT+jJ6O2b1DxlzgBRei/Mh8Vj/J/1y4KntDSBXuLUGCBl2oj4ggoMeJtEmxBd8Mk760CmLFUUKtvHKI0wmPCGIf0hIUeZBlhN1n0F/iNETgPJMifIkNutYAFIwdZm8nH8HrDQNKYOk88wF64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=RnCS1WTS; arc=none smtp.client-ip=91.218.175.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="RnCS1WTS" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1774351960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mbp2ikBGYSHp7eYBpCkowJnRwz/ZIiettZ7OaupB1ME=; b=RnCS1WTSFjuHo26aHrrzV7pr4WyI4hIUkXrh0R2Z6WYadAso5dDj5d/95zU0Wr8rCQ3M6i ClRkAIt3dafHAjXQ/puVTZQDDlYFogOFA1CusD8DYjmpzamFKQIE0JqdMCvDov2/JqXe79 9d8KcFMMmMgpYNuKGEWrRAYMbBvCaXo= From: Qi Zheng To: hannes@cmpxchg.org, hughd@google.com, mhocko@suse.com, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, david@kernel.org, lorenzo.stoakes@oracle.com, ziy@nvidia.com, harry.yoo@oracle.com, yosry.ahmed@linux.dev, imran.f.khan@oracle.com, kamalesh.babulal@oracle.com, axelrasmussen@google.com, yuanchu@google.com, weixugc@google.com, chenridong@huaweicloud.com, mkoutny@suse.com, akpm@linux-foundation.org, hamzamahfooz@linux.microsoft.com, apais@linux.microsoft.com, lance.yang@linux.dev, bhe@redhat.com, usamaarif642@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 2/3] mm: memcontrol: correct the parameter type of __mod_memcg{_lruvec}_state() Date: Tue, 24 Mar 2026 19:31:28 +0800 Message-ID: <90524ca3806e24105ab5f2d69435f57c2ae034cb.1774342371.git.zhengqi.arch@bytedance.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Qi Zheng The __mod_memcg_state() and __mod_memcg_lruvec_state() were used to reparent non-hierarchical stats, the values passed to them might exceed the upper limit of the type int, so correct the val parameter type of them to long. Signed-off-by: Qi Zheng --- include/trace/events/memcg.h | 10 +++++----- mm/memcontrol.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/trace/events/memcg.h b/include/trace/events/memcg.h index dfe2f51019b4c..51b62c5931fc2 100644 --- a/include/trace/events/memcg.h +++ b/include/trace/events/memcg.h @@ -11,14 +11,14 @@ =20 DECLARE_EVENT_CLASS(memcg_rstat_stats, =20 - TP_PROTO(struct mem_cgroup *memcg, int item, int val), + TP_PROTO(struct mem_cgroup *memcg, int item, long val), =20 TP_ARGS(memcg, item, val), =20 TP_STRUCT__entry( __field(u64, id) __field(int, item) - __field(int, val) + __field(long, val) ), =20 TP_fast_assign( @@ -27,20 +27,20 @@ DECLARE_EVENT_CLASS(memcg_rstat_stats, __entry->val =3D val; ), =20 - TP_printk("memcg_id=3D%llu item=3D%d val=3D%d", + TP_printk("memcg_id=3D%llu item=3D%d val=3D%ld", __entry->id, __entry->item, __entry->val) ); =20 DEFINE_EVENT(memcg_rstat_stats, mod_memcg_state, =20 - TP_PROTO(struct mem_cgroup *memcg, int item, int val), + TP_PROTO(struct mem_cgroup *memcg, int item, long val), =20 TP_ARGS(memcg, item, val) ); =20 DEFINE_EVENT(memcg_rstat_stats, mod_memcg_lruvec_state, =20 - TP_PROTO(struct mem_cgroup *memcg, int item, int val), + TP_PROTO(struct mem_cgroup *memcg, int item, long val), =20 TP_ARGS(memcg, item, val) ); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7fb9cbc10dfbb..4a78550f6174e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -527,7 +527,7 @@ unsigned long lruvec_page_state_local(struct lruvec *lr= uvec, =20 #ifdef CONFIG_MEMCG_V1 static void __mod_memcg_lruvec_state(struct mem_cgroup_per_node *pn, - enum node_stat_item idx, int val); + enum node_stat_item idx, long val); =20 void reparent_memcg_lruvec_state_local(struct mem_cgroup *memcg, struct mem_cgroup *parent, int idx) @@ -784,7 +784,7 @@ static int memcg_page_state_unit(int item); * Normalize the value passed into memcg_rstat_updated() to be in pages. R= ound * up non-zero sub-page updates to 1 page as zero page updates are ignored. */ -static int memcg_state_val_in_pages(int idx, int val) +static long memcg_state_val_in_pages(int idx, long val) { int unit =3D memcg_page_state_unit(idx); =20 @@ -831,7 +831,7 @@ static inline void get_non_dying_memcg_end(void) #endif =20 static void __mod_memcg_state(struct mem_cgroup *memcg, - enum memcg_stat_item idx, int val) + enum memcg_stat_item idx, long val) { int i =3D memcg_stats_index(idx); int cpu; @@ -896,7 +896,7 @@ void reparent_memcg_state_local(struct mem_cgroup *memc= g, #endif =20 static void __mod_memcg_lruvec_state(struct mem_cgroup_per_node *pn, - enum node_stat_item idx, int val) + enum node_stat_item idx, long val) { struct mem_cgroup *memcg =3D pn->memcg; int i =3D memcg_stats_index(idx); --=20 2.20.1