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 39C81C3ABD8 for ; Wed, 14 May 2025 05:08:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34B396B00C7; Wed, 14 May 2025 01:08:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2ABA76B00C8; Wed, 14 May 2025 01:08:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D9E76B00C9; Wed, 14 May 2025 01:08:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DEF166B00C7 for ; Wed, 14 May 2025 01:08:57 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 27CA8140516 for ; Wed, 14 May 2025 05:08:58 +0000 (UTC) X-FDA: 83440333956.20.CCE3DF6 Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) by imf17.hostedemail.com (Postfix) with ESMTP id 6BDD740008 for ; Wed, 14 May 2025 05:08:56 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PI+Wah95; spf=pass (imf17.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.171 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=1747199336; 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=xC5RBxF4eBzFymaVkf9baProDnaZ4BeheVCZ1DfU/iY=; b=dJSNDMxHP20re08+HlJdZ0HsVILJU73RvWkej87xzvnZLy2i0pDKo6MJRdn+MUcY86SZQa sA5AfvEoHNgre5HlnXdCgsk9X30cNjGxB3iXWcwdh7P/glHTL+GAJunT+Q9HknRdf42GmN M1ZwRsf6Xsg7b6TAWYLAp416XtmQL7I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747199336; a=rsa-sha256; cv=none; b=ZDm/tu+fN3/JFqgxaB0aIRieXDVLbD8L91CkjhyeLkvu8rI+FopbnApQgyucgdEo5dZDO+ 5AvrmlgipiIPUpqH19C6vAMfz4Jo+KQGBCGiq9OuUG7SjiiGX5w0Jj3d0igbucVeul2Nqc P+HCl0V+pQChehuemSpQY5DPgU1wjoY= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PI+Wah95; spf=pass (imf17.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.171 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=1747199334; 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=xC5RBxF4eBzFymaVkf9baProDnaZ4BeheVCZ1DfU/iY=; b=PI+Wah95f6MktFReQlC/4aD465VPjdqw+yos246Ps3NMi+oVXCoK7JlakLaMf5CyEDIpwI eXmnkviLfiN4yhHfA5YuLKcvFXKwbUTwMkmirDXq0FZX917m2gTcEoEUh5qQUIv7V8W7zN NWXaEq3w6rVYg/RyCkoClgSuMC10OXg= 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 , bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 4/7] memcg: make count_memcg_events re-entrant safe against irqs Date: Tue, 13 May 2025 22:08:10 -0700 Message-ID: <20250514050813.2526843-5-shakeel.butt@linux.dev> In-Reply-To: <20250514050813.2526843-1-shakeel.butt@linux.dev> References: <20250514050813.2526843-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: 6BDD740008 X-Stat-Signature: 4paoa8c4nobzcb7x8nc3axbj3n16jin9 X-Rspam-User: X-HE-Tag: 1747199336-874034 X-HE-Meta: U2FsdGVkX18g8Nq6Tdo46x9DZ7lFRRcqqhd18priYgvg6lzJl0v4/0KkuMsFEf3cXIaKCEI8TUHiEQheOOkTflroANmOU0k+pjmbGnc7qoRuB6UN/XOHgHQMZtvlQ0rQu+gmeSq9Rz1DHoyg1rwv+uCGe91Js7Kimd2PH44gcqMUOco64J4wvwEYQdPotK261kINGbbN9gjuxvbitTNwvPff4ebKzh400h1aNKrQo4CO3oOeCqubZvDGMDgzu1M9s6g9ktej3V18bcLaGmQM7N95eHKwvyfs+UP4c5KZtx/KigeQAd53ZBD1ieIJiuMBPX/rKWRPS6JZ86Fg+otNYTQQeBKRWYYLVgDj1hiEmptScsvX2JR3hnu+rHlYwmS+tcPxwmM7LhoNM9vXwUe6NvoSX7mOwAdZP45lr0saBklUQZlWPDQkVKaekHMvjkSAucQ70iiM++clJAJW0N81vZlbIchP0kBaG1rlMji9JJnWFiNZBNUxTxHc1fvhFy0zSjaBf4p+SdViNxt8V+2W3/S+GnU0CxsrPSSPHoPTQWdSVCdZwyM+/UXkWHEa/QTdEu34XQPUS3xlIrk/vJD/RpdiQpScat6tR/qm66NHyKe6LhicnuSQCTg3+jsikoymxIZDuok2FT4mow8O9D53vZbwblvmjapY0cfCd4V0YRECvvzDRleihU64Pt+dFVVF7iwL8ePEySkV6NbociSfmv6nVi5G69pGYxBZo7R+Aq5IybaeqaKMnJyWIjTNXIn+PUyBbSh+TeLuc0WxxnaWzLnw+BiJcsMDRTZSZDt/1eBGEEsNZ7n8Og9vqz3eGEIr7K96VCPCgu//IkyYzNyEDyUn6oJNdFvhT52JfGTLRiABD5J8o+RqadTJyhZegvPJG1AqNKuzq3013nPPkoGRRvynEbVU7XgdhIHB7qcTpi+kpDRmYI+mzu+rxlc0P5ilwoiFTZiGteUd9EHEpXV RLqcoI51 vtF+HqUs+fpQ0vwwoMOSN+83u3M+L/GQGEpUj4XtfsvNA2aFTROpzGB/7BD49K38lk4jtkIsGUQZnpwaLY2MS9uljWYfzLxB7+JpMJBsuxUvN+vJP/FMBay1cKc8+T3D0GHqAKoOqQB+qt2iTLqW974EVhLs4v30ud9yrwoRRmIhxWeq3tbt2hfSb+8RD0SoFfgtcNJ9WR+xF3Ega2XcYI46ObzuuCsUKtELZ 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: Let's make count_memcg_events re-entrant safe against irqs. The only thing needed is to convert the usage of __this_cpu_add() to this_cpu_add(). In addition, with re-entrant safety, there is no need to disable irqs. Also add warnings for in_nmi() as it is not safe against nmi context. Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka --- include/linux/memcontrol.h | 21 ++------------------- mm/memcontrol-v1.c | 6 +++--- mm/memcontrol.c | 6 +++--- mm/swap.c | 8 ++++---- mm/vmscan.c | 14 +++++++------- 5 files changed, 19 insertions(+), 36 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 38a5d48400bf..0a8336e8709f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -946,19 +946,8 @@ static inline void mod_lruvec_kmem_state(void *p, enum node_stat_item idx, local_irq_restore(flags); } -void __count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx, - unsigned long count); - -static inline void count_memcg_events(struct mem_cgroup *memcg, - enum vm_event_item idx, - unsigned long count) -{ - unsigned long flags; - - local_irq_save(flags); - __count_memcg_events(memcg, idx, count); - local_irq_restore(flags); -} +void count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx, + unsigned long count); static inline void count_memcg_folio_events(struct folio *folio, enum vm_event_item idx, unsigned long nr) @@ -1432,12 +1421,6 @@ static inline void mod_lruvec_kmem_state(void *p, enum node_stat_item idx, } static inline void count_memcg_events(struct mem_cgroup *memcg, - enum vm_event_item idx, - unsigned long count) -{ -} - -static inline void __count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx, unsigned long count) { diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 3852f0713ad2..581c960ba19b 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -512,9 +512,9 @@ static void memcg1_charge_statistics(struct mem_cgroup *memcg, int nr_pages) { /* pagein of a big page is an event. So, ignore page size */ if (nr_pages > 0) - __count_memcg_events(memcg, PGPGIN, 1); + count_memcg_events(memcg, PGPGIN, 1); else { - __count_memcg_events(memcg, PGPGOUT, 1); + count_memcg_events(memcg, PGPGOUT, 1); nr_pages = -nr_pages; /* for event */ } @@ -689,7 +689,7 @@ void memcg1_uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout, unsigned long flags; local_irq_save(flags); - __count_memcg_events(memcg, PGPGOUT, pgpgout); + count_memcg_events(memcg, PGPGOUT, pgpgout); __this_cpu_add(memcg->events_percpu->nr_page_events, nr_memory); memcg1_check_events(memcg, nid); local_irq_restore(flags); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 75616cd89aa1..b666cdb1af68 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -826,12 +826,12 @@ void __mod_lruvec_kmem_state(void *p, enum node_stat_item idx, int val) } /** - * __count_memcg_events - account VM events in a cgroup + * count_memcg_events - account VM events in a cgroup * @memcg: the memory cgroup * @idx: the event item * @count: the number of events that occurred */ -void __count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx, +void count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx, unsigned long count) { int i = memcg_events_index(idx); @@ -845,7 +845,7 @@ void __count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx, cpu = get_cpu(); - __this_cpu_add(memcg->vmstats_percpu->events[i], count); + this_cpu_add(memcg->vmstats_percpu->events[i], count); memcg_rstat_updated(memcg, count, cpu); trace_count_memcg_events(memcg, idx, count); diff --git a/mm/swap.c b/mm/swap.c index 77b2d5997873..4fc322f7111a 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -309,7 +309,7 @@ static void lru_activate(struct lruvec *lruvec, struct folio *folio) trace_mm_lru_activate(folio); __count_vm_events(PGACTIVATE, nr_pages); - __count_memcg_events(lruvec_memcg(lruvec), PGACTIVATE, nr_pages); + count_memcg_events(lruvec_memcg(lruvec), PGACTIVATE, nr_pages); } #ifdef CONFIG_SMP @@ -581,7 +581,7 @@ static void lru_deactivate_file(struct lruvec *lruvec, struct folio *folio) if (active) { __count_vm_events(PGDEACTIVATE, nr_pages); - __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, + count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_pages); } } @@ -599,7 +599,7 @@ static void lru_deactivate(struct lruvec *lruvec, struct folio *folio) lruvec_add_folio(lruvec, folio); __count_vm_events(PGDEACTIVATE, nr_pages); - __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_pages); + count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_pages); } static void lru_lazyfree(struct lruvec *lruvec, struct folio *folio) @@ -625,7 +625,7 @@ static void lru_lazyfree(struct lruvec *lruvec, struct folio *folio) lruvec_add_folio(lruvec, folio); __count_vm_events(PGLAZYFREE, nr_pages); - __count_memcg_events(lruvec_memcg(lruvec), PGLAZYFREE, nr_pages); + count_memcg_events(lruvec_memcg(lruvec), PGLAZYFREE, nr_pages); } /* diff --git a/mm/vmscan.c b/mm/vmscan.c index 0eda493fc383..f8dfd2864bbf 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2037,7 +2037,7 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, item = PGSCAN_KSWAPD + reclaimer_offset(sc); if (!cgroup_reclaim(sc)) __count_vm_events(item, nr_scanned); - __count_memcg_events(lruvec_memcg(lruvec), item, nr_scanned); + count_memcg_events(lruvec_memcg(lruvec), item, nr_scanned); __count_vm_events(PGSCAN_ANON + file, nr_scanned); spin_unlock_irq(&lruvec->lru_lock); @@ -2057,7 +2057,7 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, item = PGSTEAL_KSWAPD + reclaimer_offset(sc); if (!cgroup_reclaim(sc)) __count_vm_events(item, nr_reclaimed); - __count_memcg_events(lruvec_memcg(lruvec), item, nr_reclaimed); + count_memcg_events(lruvec_memcg(lruvec), item, nr_reclaimed); __count_vm_events(PGSTEAL_ANON + file, nr_reclaimed); spin_unlock_irq(&lruvec->lru_lock); @@ -2147,7 +2147,7 @@ static void shrink_active_list(unsigned long nr_to_scan, if (!cgroup_reclaim(sc)) __count_vm_events(PGREFILL, nr_scanned); - __count_memcg_events(lruvec_memcg(lruvec), PGREFILL, nr_scanned); + count_memcg_events(lruvec_memcg(lruvec), PGREFILL, nr_scanned); spin_unlock_irq(&lruvec->lru_lock); @@ -2204,7 +2204,7 @@ static void shrink_active_list(unsigned long nr_to_scan, nr_deactivate = move_folios_to_lru(lruvec, &l_inactive); __count_vm_events(PGDEACTIVATE, nr_deactivate); - __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_deactivate); + count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_deactivate); __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); spin_unlock_irq(&lruvec->lru_lock); @@ -4621,8 +4621,8 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, __count_vm_events(item, isolated); __count_vm_events(PGREFILL, sorted); } - __count_memcg_events(memcg, item, isolated); - __count_memcg_events(memcg, PGREFILL, sorted); + count_memcg_events(memcg, item, isolated); + count_memcg_events(memcg, PGREFILL, sorted); __count_vm_events(PGSCAN_ANON + type, isolated); trace_mm_vmscan_lru_isolate(sc->reclaim_idx, sc->order, MAX_LRU_BATCH, scanned, skipped, isolated, @@ -4772,7 +4772,7 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap item = PGSTEAL_KSWAPD + reclaimer_offset(sc); if (!cgroup_reclaim(sc)) __count_vm_events(item, reclaimed); - __count_memcg_events(memcg, item, reclaimed); + count_memcg_events(memcg, item, reclaimed); __count_vm_events(PGSTEAL_ANON + type, reclaimed); spin_unlock_irq(&lruvec->lru_lock); -- 2.47.1