From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (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 C883136654C for ; Tue, 24 Mar 2026 11:32:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774351942; cv=none; b=OSr9Ce4d02G0J6Yz3rtBijARE4VCkETC+yEkai3xZkJ6KMQprXpB/hEIKm4AGh9M9FbJ0KK/bDztBTpeBYLyjDB3f4pkgpzE4WXUIQA6A5Z4beME68EX78tVn/av+lCA2EjLMNjrUGBfDV5xV1ZjqLjNAq0gsu90l1CcSRt+Kds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774351942; c=relaxed/simple; bh=kVbrYMP5pt1BQk2q3WW9YiMA91YhgZOOKnk1hZLVEjU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XKB9Mrnc3xYblfGDZIlbaZLlpfmTbqEg1zhl9VyetIL5ClN6BzzMzSttnV9rHyqHnjp+Q+o5AxKs0oEt2RlOdXNo/GN13U3Cjotnd/1lRCba+3Y+5NH/67Bl62a4Lo+/GKXhNrs7/Mv6olTKVOcVMFDWehNBCf1mplv/rCNFpv0= 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=NaNSuwSY; arc=none smtp.client-ip=91.218.175.183 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="NaNSuwSY" 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=1774351938; 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=BCaKEuNZgtMKShDR3GzW8YFYwaQK2TRr8wn9CI/U184=; b=NaNSuwSYI6PnCqbD9J36YVjsVWmD6Ny8LaZejVUy68EH3pyfRieEISYijBF4m5yDJeyGRP +dj6NIgziOLWGBmGEBSubDSqCvxnQdtELXU2nx8lAbayEDtzZLhTJuRMv+sksKvuRa+Jk5 QsUBnXjkLaFWa//A4bOe5dINv1WYedY= 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 , Usama Arif Subject: [PATCH] fix: mm: memcontrol: convert objcg to be per-memcg per-node type Date: Tue, 24 Mar 2026 19:31:26 +0800 Message-ID: <20260324113206.26539-1-qi.zheng@linux.dev> 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: 8bit X-Migadu-Flow: FLOW_OUT From: Qi Zheng Reset pn->orig_objcg to NULL to prevent obj_cgroup_put() from being called agagin in __mem_cgroup_free(). Reported-by: Usama Arif Signed-off-by: Qi Zheng --- mm/memcontrol.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 992a3f5caa62b..ad32639ea5959 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4140,8 +4140,14 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) for_each_node(nid) { struct mem_cgroup_per_node *pn = memcg->nodeinfo[nid]; - if (pn && pn->orig_objcg) + if (pn && pn->orig_objcg) { obj_cgroup_put(pn->orig_objcg); + /* + * Reset pn->orig_objcg to NULL to prevent obj_cgroup_put() + * from being called agagin in __mem_cgroup_free(). + */ + pn->orig_objcg = NULL; + } } free_shrinker_info(memcg); offline_kmem: -- 2.20.1