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 19A2AC3ABD8 for ; Fri, 16 May 2025 18:32:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1555C6B009C; Fri, 16 May 2025 14:32:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DB6C6B009D; Fri, 16 May 2025 14:32:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9B876B009E; Fri, 16 May 2025 14:32:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C89E96B009C for ; Fri, 16 May 2025 14:32:49 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D635A1A0E25 for ; Fri, 16 May 2025 18:32:50 +0000 (UTC) X-FDA: 83449617300.03.E2C4108 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) by imf06.hostedemail.com (Postfix) with ESMTP id 34AB8180006 for ; Fri, 16 May 2025 18:32:48 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=XfU57lfu; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf06.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.184 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747420369; a=rsa-sha256; cv=none; b=P8zbwplns6CO9GW3b3nLdI2uMk86iyXE+0sUb7pgzd/kbsbE6OoVIahX0D2vwRZAWLNuii PNOcRvft71QJDbMHRFp6FKvMYZFwX83PMKhpofUbKYWcdKnmrpWws116O/mIzSn0DZKKin CM4NpgBBW4OjTBBb/2AWf7wEzNeqrZM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=XfU57lfu; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf06.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.184 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747420369; 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=e7buLwUiQQ0DffKeVj3U+ImrNAav4xz6Np8Ze41l6/o=; b=ZMmDFiutPD15hesKiGMfBiiz9sDjJQ/EJmkMbteB39dPSfjrWZThul/F93mz9zWeppSB5J skvrFfrijlnC8LpUgd6P374/qd0bHed1RmUuXhmNO6hr3aNEQjI8fYXmJm/w3fJfVj27ts pjQxLGltfMRz9wTMDl1jEFFoIUc5Klw= 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=1747420367; 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=e7buLwUiQQ0DffKeVj3U+ImrNAav4xz6Np8Ze41l6/o=; b=XfU57lfuJWIcI//4FgUsBj/ZtAr/tsPZh7cX1goI/fmy5EwWHr3npMKZ9MJEZaIuDBjgeN yNITiCI2+LocitoWlqWFGJzsZcrfI9a19SfSbZbttlX1v47cz/28Ypvw3ZnTGHWdrf66j3 q3ZveCvIB1nP049XTKQll6oqranjMAE= 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 3/5] memcg: add nmi-safe update for MEMCG_KMEM Date: Fri, 16 May 2025 11:32:29 -0700 Message-ID: <20250516183231.1615590-4-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-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 34AB8180006 X-Stat-Signature: zn6wf9jikbqquq8m4dgc6czcebjmkqri X-HE-Tag: 1747420368-441933 X-HE-Meta: U2FsdGVkX18rAUJh1YlL9RjuGt1BOHlsm3dQY9F6ksY4okA5zH4FE4NItUitw1ntsA3nnQzMvRUWc95LuzE6Ed98+rFvsL3uF4ayFfgc5iqGEkqYVElZfxAGP89rjxb9rrxPAoq7h/cwq1s72cCdbvlrtdPFXcOwYmMQZ2KVrBdhkOvLWUo5GNTalrGAnNtJnEOBqlC5GHLqYt8HNlCTcbREOfCcZOAo6mcvGgUg71CNMR4ffI/XgNvtbn/vNJZLalhtkHOzRmYxM/Dq/sero/wSfWY7obO9r2ucHoYcBMTL6PhEpkpJbkNZE4tJnHlNK7+4+FDqpRL44Y0gpAkZI/XuD6qak+idl1qNGgp2Cg/dj0R/2XVZwQQxumF3PQJ0QZl1082GcrVB7mqAGKP8bhR5fgXiA4P/Bt8Z+6Yek7bEb3XkBF4a7PwGIFaHWcjHoBqPPcLcH8knyurNLytEjZVtcIPTRMYYB4L6e8n6icnTsRqvJ83VKvzVpdsKXgTUlsLpETvQIy/lcDrsUkQx58IsTtm3kSsX5SqQ0DXBJrdCF0y+7h5Cw4Z6azbZf4K64t7HsXJmPuvi/OpVr9B4nEtZ5eueA6RMEGde4/sDf6MNbjvVjCbkw0t0ortK18/eO73sN50k/XZxUEm4u8LEYbnHIEflPUNKuv15bXb/N2JP4lREXqrzUSWJqu/sw2oqmvKpgdbNhIUEivJ2ov1Mx+7On5dWx749A0eN0r0gLQa+8afWin1fZvD4NADKaqDeQqcF4Q+QC9FOQGV1kLjs1vfsV13ZcVUmPH/Tz0+qEfgzaMdyE7Nz85yGjIIsDcmpVzxRArKMoeWNA8SC2NSrbRZDf8I8AosQp2+YmQp2NqE4ttQUK99/hD4fxEmh5LhlXYzjNEx1OYaPKLEVeeA9U8TfHtE1/a0oZYepN2XrfocqXF4ScyTKsB+aRVRy+MsLtURjSZzxKc5B84KbCDT VAGG84eE Q1sbgiXUMof/A4T4Lhvgd3x4193Q8hQLO+LiOn3/8R64RUH8ULHigYda/R70mtNN8ZQlv9V95+ZAPMZG/M7pdf6yKCs2n0wWYd5g/7Uh88mctA1Mfk4yN0gB5RRwPWJ8b2XyAELCJe67sF4IFGzRGnyGDOtUczhiJrGKOeewA/D/riiosAPkGorPXbEor9g31avMEzRHb+BSoYjHA/KhgBFxFXlopnCPMJEs2 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 charging and uncharging code path needs to update MEMCG_KMEM appropriately. Let's add support to update MEMCG_KMEM in nmi-safe way for those code paths. Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka --- mm/memcontrol.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a2f75f3537eb..2c415ea7e2ec 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2729,6 +2729,23 @@ struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio) return objcg; } +#ifdef MEMCG_NMI_NEED_ATOMIC +static inline void account_kmem_nmi_safe(struct mem_cgroup *memcg, int val) +{ + if (likely(!in_nmi())) { + mod_memcg_state(memcg, MEMCG_KMEM, val); + } else { + /* TODO: add to cgroup update tree once it is nmi-safe. */ + atomic_add(val, &memcg->kmem_stat); + } +} +#else +static inline void account_kmem_nmi_safe(struct mem_cgroup *memcg, int val) +{ + mod_memcg_state(memcg, MEMCG_KMEM, val); +} +#endif + /* * obj_cgroup_uncharge_pages: uncharge a number of kernel pages from a objcg * @objcg: object cgroup to uncharge @@ -2741,7 +2758,7 @@ static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, memcg = get_mem_cgroup_from_objcg(objcg); - mod_memcg_state(memcg, MEMCG_KMEM, -nr_pages); + account_kmem_nmi_safe(memcg, -nr_pages); memcg1_account_kmem(memcg, -nr_pages); if (!mem_cgroup_is_root(memcg)) refill_stock(memcg, nr_pages); @@ -2769,7 +2786,7 @@ static int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp, if (ret) goto out; - mod_memcg_state(memcg, MEMCG_KMEM, nr_pages); + account_kmem_nmi_safe(memcg, nr_pages); memcg1_account_kmem(memcg, nr_pages); out: css_put(&memcg->css); -- 2.47.1