From patchwork Fri Mar 14 06:15:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 14016308 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 7B335C28B2F for ; Fri, 14 Mar 2025 06:15:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1A9F28000B; Fri, 14 Mar 2025 02:15:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCAC428000A; Fri, 14 Mar 2025 02:15:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6C9628000B; Fri, 14 Mar 2025 02:15:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8811128000A for ; Fri, 14 Mar 2025 02:15:49 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 662F61A0ADA for ; Fri, 14 Mar 2025 06:15:50 +0000 (UTC) X-FDA: 83219145660.02.347774C Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) by imf15.hostedemail.com (Postfix) with ESMTP id AD539A000E for ; Fri, 14 Mar 2025 06:15:48 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=NzN2MoMP; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf15.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.188 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741932948; a=rsa-sha256; cv=none; b=PYP634UyBhU3Ck4NMsMMCGPRs5BzDvvoNGUSGrF1vKbKXGnOu0rsm0B+wnSvkQ8mKsc5zH Znds3iFdEe0Bctwc9yTBZTs3HZWSchMi0ZPG6G87sK5H4mDXAyZx+OOWiekifT+uvPTp8L 6Y69bYWMUlxhEofXZouVaL9BwDX7tws= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=NzN2MoMP; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf15.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.188 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=1741932948; 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=T/vOofDJKYjkd25R4JYNyNwQOb8YH2uyqN/2EfEOuLI=; b=310od2O52u3RrMD38OwRC7dZ3Jd0L/RhMmGPchH+zqgaD5uAbP3p5JfTbIGQHVuQof4N8e 6hrCAcPURvNyicgT7NC29chhZkx66uOigvlVudDkfc9Ic8foumxh+FT0bSvHo6XdAkFjxL bo4wHsJeym7fE8k796T5Ca5oCK1u28M= 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=1741932947; 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=T/vOofDJKYjkd25R4JYNyNwQOb8YH2uyqN/2EfEOuLI=; b=NzN2MoMPHTfdCiaak06HUc74OdZQIvqLAIVFB9SwXO8961DljO4pkXWKDSORvkMJpuOHCT mHFDQrUN3h5Kvgdym+MQodLK/7gwfoGuo9VU27qQeiMZAjNPLBgsbxldVen9H+7J4RVwG7 h535Oyanb8IayGBPoUMgidcRMWV3aoY= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Sebastian Andrzej Siewior , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [RFC PATCH 07/10] memcg: use __mod_memcg_state in drain_obj_stock Date: Thu, 13 Mar 2025 23:15:08 -0700 Message-ID: <20250314061511.1308152-8-shakeel.butt@linux.dev> In-Reply-To: <20250314061511.1308152-1-shakeel.butt@linux.dev> References: <20250314061511.1308152-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: rh4kbfxt58m9yj9bqnabpnd7g3b5ye1t X-Rspamd-Queue-Id: AD539A000E X-HE-Tag: 1741932948-548555 X-HE-Meta: U2FsdGVkX18Vczr2Ut90V8VujvY4SP8+ZoWgogECsRzZI6WgfpocXDRTiAuOdt3vy8cFgt+L7usE0MwsRca5T3rtl2n9b0rfo9Y96oNoF6K2N5Ug5WhSbt1sZLm+w68F0ClC7aWUfm3Ldmhcc0Rw6WtNkJPFCk98S9ByGKx/CZE3xDbEoy8X95IglNLuELZRe3ORGq8qP9iufkyeBQBR/WKHJgxwQ0/X/VBrJjKz8bygzcqSUKH2D+ALx0EM1gzV0jVs2WEcPBdopuAhIMHD+Ha1TwAFQrjFGdLvBA1XaLyFLGYM83kOcuQD+7Mtrw4VXt3qsmKz9hhFj0XrChejrIGLUAdHYXIqVRLRbAW6pnCDutftjDF2Y2c/xunr08e33C0j9dl+fOfQ6IA98zUGBJ2h2k4Rd1ZyR3wHfOdd/mX52FG8stEXWVIAH783lByJ8aKexF2a5Y+VsrTtkYZlAI2gdrVwqhaEVE6kz3IVIr/ZPBXsy3dD697KCOoAgtXyb0r54r/cpmhcKfzD+XdoFkYusjncVG8QjPUeZoBpmT3NAu0t7o/cCWY150sKjrC5/jCO3608w1YkMh10CjFPLvwseNKDEEAh9ndRm8Ps6O6UpEVrv4GEy2gfvSGR+pLxi3AAOi8KdsSuvcnRTQCjiVfABS4n4unD9DoEqIukE8TdzvlNbWp2I287fjxOLY12D6fcxWVGMQe7P4hM6Gd201q0J4Pld9ZzOovJi2yocliAI7RZxnKOoB4QWRxfqVRDu1UaguKiK9Gkyoyv9Hjv5GFh+IfJixOgqeOD41m1Bl0T7xjCjafxknPTC+dvBZ6AJ7OKMXxti/6YUL2YKa5jhmedHT14QJM5BrO5RHfpKvfYqIE7AA4NvEPrWjO2MqplWvDFc0kRn+nPq2ZepshIA/93EQ/S95ZQPPlx4wSSDzICRUR+PtmBwvoljUrPiDMVL0eChuROBnnZpaDDlaL bMbcYUSp ilTbffN3lOs+/CcpIv6bWa7hE/Mv9B6dr/EGjFBrDmC/RWdZX5E1vYEYwlE09Gy53thUCz8UL2tVyUHFabGA2DX3+8z+hffHeGClO0AG2+awG9902NMsKds3JTSP/c/dqLyFXm/Q0BxsvQwyphem5THjyJeHJa629EVGV0Oh7JT8yKhr4MWg08mkrXS+s60NP0hgKL2Y8UhiGkbL6CRtgvE7mjkm0lARbr+P0 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: For non-PREEMPT_RT kernels, drain_obj_stock() is always called with irq disabled, so we can use __mod_memcg_state() instead of mod_memcg_state(). For PREEMPT_RT, we need to add memcg_stats_[un]lock in __mod_memcg_state(). Signed-off-by: Shakeel Butt Reviewed-by: Sebastian Andrzej Siewior --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3c4de384b5a0..dfe9c2eb7816 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -707,10 +707,12 @@ void __mod_memcg_state(struct mem_cgroup *memcg, enum memcg_stat_item idx, if (WARN_ONCE(BAD_STAT_IDX(i), "%s: missing stat item %d\n", __func__, idx)) return; + memcg_stats_lock(); __this_cpu_add(memcg->vmstats_percpu->state[i], val); val = memcg_state_val_in_pages(idx, val); memcg_rstat_updated(memcg, val); trace_mod_memcg_state(memcg, idx, val); + memcg_stats_unlock(); } #ifdef CONFIG_MEMCG_V1 @@ -2845,7 +2847,7 @@ static void drain_obj_stock(struct memcg_stock_pcp *stock) memcg = get_mem_cgroup_from_objcg(old); - mod_memcg_state(memcg, MEMCG_KMEM, -nr_pages); + __mod_memcg_state(memcg, MEMCG_KMEM, -nr_pages); memcg1_account_kmem(memcg, -nr_pages); if (!mem_cgroup_is_root(memcg)) memcg_uncharge(memcg, nr_pages);