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 6DAA5C3601A for ; Fri, 4 Apr 2025 01:40:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB4B96B0030; Thu, 3 Apr 2025 21:40:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E3C396B0031; Thu, 3 Apr 2025 21:40:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D033B6B0032; Thu, 3 Apr 2025 21:40:04 -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 B1FB86B0030 for ; Thu, 3 Apr 2025 21:40:04 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 779EC1CCE74 for ; Fri, 4 Apr 2025 01:40:05 +0000 (UTC) X-FDA: 83294655570.26.25A6AD2 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) by imf20.hostedemail.com (Postfix) with ESMTP id C69811C0008 for ; Fri, 4 Apr 2025 01:40:03 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GpZWu2DG; spf=pass (imf20.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.184 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=1743730804; 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=5u+sGrpirO29d1KihT1tXkrq4oUxzHcwoOXUn/c4rxU=; b=0VB8Gs1HXxlj4rQ38GCYsFaPNJdEi/2EP9900tAwluEUUUs9eyNXPXjiX1rkwixKifHZup AvvUz7BOQrpiXITY8JAssk5Hc2Gm7onmDbhoJmdXmRkCe5qGZUsjmfARyRAyqveW7wU0L6 4fJYc7DRL0x+Sb6lTd6VDWDWm4RGGmg= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GpZWu2DG; spf=pass (imf20.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.184 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743730804; a=rsa-sha256; cv=none; b=0J05s8EbYLOX4p2nBk8vGQ35H9ehr1coaXx20SUaHipA1J/0LcylpNJ/SovD4gJ7D71aPL 3kO1F99ABMmfGc2pGu+zY/JKHu9HP87JwjsuZfQdbSpAeu9/LtLh58qoCK5rjx8WV1ydku C5AJlY5jJruYEDFoHFbQLz+luubZZdg= 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=1743730802; 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=5u+sGrpirO29d1KihT1tXkrq4oUxzHcwoOXUn/c4rxU=; b=GpZWu2DG35VYXPGZhdFuTR+e+p9ZnkPyl3xCS2z4XczcVBbXrTjmdDatecs8Z3InFGsO6m b/G9QZFGWTsRdvp8vgZQ7i9qVB+FhSS2T9ZuxyYQWMcowKCC84xKlbPgOFphFlxWb7A2d/ Nn+F5vsLhhPGaCYx6WQdqaUTaFypiVU= 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: [PATCH v2 7/9] memcg: use __mod_memcg_state in drain_obj_stock Date: Thu, 3 Apr 2025 18:39:11 -0700 Message-ID: <20250404013913.1663035-8-shakeel.butt@linux.dev> In-Reply-To: <20250404013913.1663035-1-shakeel.butt@linux.dev> References: <20250404013913.1663035-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: C69811C0008 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: qpug48wju5nbx87cy5f5k353tc69b1nr X-HE-Tag: 1743730803-897959 X-HE-Meta: U2FsdGVkX18GAXF1CpjUrn0NL6HMXVqg8Ip4frSAEjg/qFlhWp1tkjYL9IhwOcopqalPKweZeetnfczcF02EpFKdOts9p8eWMTZ9M9Kz3g2zt1HWeSmP2D+x/BPX0/BncoEbfWjFYzskLmbU32oofynda7UJdZx1uW3lLinSwyZFvfQR/e9ban7k1qmXjmvvCiMmGduQQO+F5Flekj+0yC1ybRBnLbQAT7PE6fdG8e0E3/4LQfLnAkPwHYFUR+aJmPTKcJSyydiRLst4XOS74lbhqB5Nmq+YVtfJPy7WQiOkghrJiEQQFQ8RdZIoJBkWzyg+sVtUcrMwALnY3/HCIwfv2ghZ3oPwRI9rNVGkJTArcgv1GyxXqwbQ6KaAtz58GEp3zA+gih976FoWM47z0OjgUoLzFeJNr6A4m4x2u1NVpI3Oqgwsq2wmEwHAzJdsrhfdmRBQxECJOqldrfOuSBPqyNYCbLmW5DCzg0I1YHZwq2Vd6XWZoqslK7YwhInfJXZzoOjbPLOKh9uzulDQ2MVfEjqCCNmXclHCKMXe0c4jDgxgfweCYXhKk3KIfRuwg6J8079RQAaDqDwPx1TSHpv8qOJeNwHbvDUrpei1js7DlW/JxMBlrwI1huVGQK+qwLjR+hCPoQFz+g3E3K2UXjuAvWZN2tuHIJoQv+y9U2o7YRQMHk9KhnyBGR/oJd4Ux7NKI8ITXnishG8pJOZ7qRw15WV1Pa78tpV26nzOGnKNrhVynpblXLfE7VqPvCA9cdzz10+SF9dUM1BPiRL6Oev59A8EnZ2MSLmLH/a+RRtdEsq/46e5V8bIWng5V1gTuJjDMIiBOJxp0WJZqDhqAQ/It76kKssTnmbq7fKRIdnU8uv4p9IUsoHyTOFbjTQjD8tia37Qnj/oUGsQWkk/Wurbgrko8EpKcKH4nGE+2/89OHaX7tZZ1BxgOCq1ACwZdAlUB18OGhOlNOYQRaQ 04VJ8mYr tT1YUK8gjjdeR1e8OLOicUltMCKnX6YxU3yYhFtCHai21BRximT8EIEWqK74a+GpH2vXXahR2FCT6oc3IqSlIinIHjphxmZuUoCqodvhFyfggCVScmAvJobGNrg+m30Bs3d8KishDzdb0h4EJ/EQqd263PotJNEVx4q48H3Z3UsO6mBvla4sTmDgVNxAJ+CuK+Wy0I/axTcNeQcvM2JMGY9oXMRffEXfQ1hIQ 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(). Reviewed-by: Sebastian Andrzej Siewior Reviewed-by: Roman Gushchin Acked-by: Vlastimil Babka Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7988a42b29bf..33aeddfff0ba 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -710,10 +710,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 @@ -2866,7 +2868,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); -- 2.47.1