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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5EDCC3ABD8 for ; Fri, 16 May 2025 18:33:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C095C6B009E; Fri, 16 May 2025 14:33:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BB86C6B009F; Fri, 16 May 2025 14:33:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA7836B00A0; Fri, 16 May 2025 14:33:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8A3656B009E for ; Fri, 16 May 2025 14:33:15 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E25C81D1074 for ; Fri, 16 May 2025 18:33:16 +0000 (UTC) X-FDA: 83449618392.26.7E9CE02 Received: from out-178.mta1.migadu.com (out-178.mta1.migadu.com [95.215.58.178]) by imf11.hostedemail.com (Postfix) with ESMTP id 2C8264000D for ; Fri, 16 May 2025 18:33:14 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Di7RQo/2"; spf=pass (imf11.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.178 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747420395; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=i/4zf437IrqL+bvg/IVOZSFq3ZgAp6BMJpR2kns0ovY=; b=JwJkTPiedUZ7609QpSSBto43oaUKphfE6CGHiwmqW1CMMPRD/dESj9ilwsGL3npEqRPrMy 5D0UXrlV7/bJWi/TCtghT0CN4ZmayAZpN5o51jKHNWM6hY8cXDhbEyAh5dM7cnhzDv4XVx 5P27njYo3YIJlyszo3p6ZpLD+KWhf9o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747420395; a=rsa-sha256; cv=none; b=Ei4RpJgVjxIhBFMPeU1NPZuutT5VDXP3mdpsdfCFdoTcyMOtYe9ApTIicJOW93hcjppSS2 oZEjuef4mKBqnNpH7a3jqZF4LO8vR//AG/PIxdTzHIg7W53E+u/xvnWahKQkNaMBG8aLzB k0xu+DH58wK6i43/7Fis+yXmHhxacIA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Di7RQo/2"; spf=pass (imf11.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.178 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1747420393; 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=i/4zf437IrqL+bvg/IVOZSFq3ZgAp6BMJpR2kns0ovY=; b=Di7RQo/2oq5FZDJ19Yi6mGtoPlZoNhcA5ZzGc1n6W0uYVahbdnoCzg7sUbkeIoG/aQvzgY wxikgpCYcx1SZmEYyGqsMTgzhiqNZ0EB5W8EK/00iGK+Isis1LulOde5wKv+IXpQmPEokn CUOUQOOrMWMnl96odp3vqD8ra+rfIjg= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Alexei Starovoitov , Sebastian Andrzej Siewior , Harry Yoo , Yosry Ahmed , Peter Zijlstra , Mathieu Desnoyers , Tejun Heo , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH v3 4/5] memcg: nmi-safe slab stats updates Date: Fri, 16 May 2025 11:32:30 -0700 Message-ID: <20250516183231.1615590-5-shakeel.butt@linux.dev> In-Reply-To: <20250516183231.1615590-1-shakeel.butt@linux.dev> References: <20250516183231.1615590-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 2C8264000D X-Stat-Signature: tc7ci3p9ue4rp7f6739ub8foykprkos9 X-Rspam-User: X-HE-Tag: 1747420394-411048 X-HE-Meta: U2FsdGVkX1++ApXtCFoti8hMUw80qX9zhMPkPBLozzzuF4pUB2OJajTaF+MLN6xcOhnH43mFGFW2J3a5n7bYfAtQAlxa3le8WtiH37macvPkgz0iC2RWAVQbbOKfCvgz6PPXyCDUpG/3UsTopfVqfIolxWYYqA4gbUoXTk7r3Xm7Nah+ZNCLMjO5WPt5pP+SR14FpIVUwO3swIsLrW28UKIUGkabSvJU2VueKVCkzWQFp2zHpLFCHwlfW0z6qGhufPkoCDxxCIsmByrE5PTUjJCbQGYAp59vDXN4fHdRktMHsiiKR+F0xDaii8ByHs2fdSSmf1M4KRUxSe4WIV1fMIaBM1fp/QjCVi2Db2m3Xs5rUGdempGzxUFpiUE0YgnfGvUts3aSYyDkl5cr5PBKlOBASMFurmBDAL7Dg3UwgBHO5hFzvW+/S7WzVX/iYv7erch5rPqtK4d5jvtSpQw3XEcfhe+nXji13tUGMDVctUAnTaZiS4fz7mI1lPzKgK7QlBktqyiGglBPRQQu7V5l2biUYJdqJ5ea93AFw2Gwt/c8sy9M2vn94IF+Mo6IbjGCDQkI7/t93S+lTFHuHqziO0oFEbeXdgA+tthR+7ot5SE+VaGj1l42mIyf0P3H7gNzQ2Hp1BKLD2b6Ymb7tW88vGJaakTL/6vaqnY85k3coyJzaFV/7pJCJAVX5q40cpPtZ+4bb2amZkesGQNLALS2XG4djFprFBm1B6eNzKitVAGwZ4vECBt10nT7sbeRa7h7fOIkX+sEYaPg60dn4aBM5ImHBXFyruO+XfG5jFjfpF+p6ullJU1+5GzlgMaAlNt4GbqV7ReXrQsR2ocLalmfJ+1wvTMfz7jtM1ZVip6QUHay5anfC9LlMJrBWtaT0Zx2ANoaoM8lCslJ84oiUaKCks0xtccmiTK7MqHPlFC8y9V1OagtGtHYZ8BTFZVBGlhexWQSdhN64Snxxu89LZM Le+nn/NQ /PzKibtk7kSGXHK2v0wviG72y9GNGt9i97rYdLOuBS+JHAy2OmdImxQKtwC2Rx0Qjys/Ws14KokjJf1qOM7wgAkLVKhCG6FoKY+GhKJTkzFpvl9I77UJO/kUrkf3bzlmxPaBb+HH+37hVQrk4Ubc4Slikj1j8OImpcePGDWdTAo6P2yY= 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: List-Subscribe: List-Unsubscribe: The objcg based kmem [un]charging can be called in nmi context and it may need to update NR_SLAB_[UN]RECLAIMABLE_B stats. So, let's correctly handle the updates of these stats in the nmi context. Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka --- mm/memcontrol.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2c415ea7e2ec..e96c5d1ca912 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2517,17 +2517,47 @@ static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) folio->memcg_data = (unsigned long)memcg; } +#ifdef MEMCG_NMI_NEED_ATOMIC +static inline void account_slab_nmi_safe(struct mem_cgroup *memcg, + struct pglist_data *pgdat, + enum node_stat_item idx, int nr) +{ + struct lruvec *lruvec; + + if (likely(!in_nmi())) { + lruvec = mem_cgroup_lruvec(memcg, pgdat); + mod_memcg_lruvec_state(lruvec, idx, nr); + } else { + struct mem_cgroup_per_node *pn = memcg->nodeinfo[pgdat->node_id]; + + /* TODO: add to cgroup update tree once it is nmi-safe. */ + if (idx == NR_SLAB_RECLAIMABLE_B) + atomic_add(nr, &pn->slab_reclaimable); + else + atomic_add(nr, &pn->slab_unreclaimable); + } +} +#else +static inline void account_slab_nmi_safe(struct mem_cgroup *memcg, + struct pglist_data *pgdat, + enum node_stat_item idx, int nr) +{ + struct lruvec *lruvec; + + lruvec = mem_cgroup_lruvec(memcg, pgdat); + mod_memcg_lruvec_state(lruvec, idx, nr); +} +#endif + static inline void mod_objcg_mlstate(struct obj_cgroup *objcg, struct pglist_data *pgdat, enum node_stat_item idx, int nr) { struct mem_cgroup *memcg; - struct lruvec *lruvec; rcu_read_lock(); memcg = obj_cgroup_memcg(objcg); - lruvec = mem_cgroup_lruvec(memcg, pgdat); - mod_memcg_lruvec_state(lruvec, idx, nr); + account_slab_nmi_safe(memcg, pgdat, idx, nr); rcu_read_unlock(); } -- 2.47.1