From nobody Sat Feb 7 17:55:12 2026 Received: from out-171.mta1.migadu.com (out-171.mta1.migadu.com [95.215.58.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA9B126989D for ; Tue, 29 Apr 2025 23:04:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967902; cv=none; b=NN90vJceO4tHe1wR0xxKtTd3DnpKa4x7JuKQhfY37bPuhqOt2aFSMSd7xbfY0XcZfAu8snSST17te2AdTdCW95wQsnI6gybt2Iusvkz0QgV8jxa9tqD9erT2pww3BieiFR0nB+1Zx3HYocy+O0UPfOM/VdUzTYSuip8H6N6KBdw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967902; c=relaxed/simple; bh=kNpHfcQPDo+Dwyzi8dvG+NXgW53MJezi2FuhTG11jW8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FA9ubyTmvX2CM2cTmmhQtXVVfZgb0aPRpPaN70llMq5AUYEg4VPVvFqtehNJhSdxNewpu1lDKAGCuZq24MbXrueZWajZpESquJV38K+VJYy7diCH9tzyYCrYOfbsQpNPVaixI3b2eMoEX+Cx+ACXd09fzqjo3ddCVjkGP+0mZ4U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=CJCd6vVv; arc=none smtp.client-ip=95.215.58.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="CJCd6vVv" 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=1745967896; 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=nbvCkVhHHtDcKqUC2DWDg/6KEw2udjRnrOYkfHNgmcQ=; b=CJCd6vVvXZmXfHc16o6jHtkjQhqPmzqlTLuls9wv21E9hSk5pLIRwuOpgLHAUdkr/xPWcd YcTswv8gGCM1Yzmbh01N3laHDwhpOTiw6sGCXQu1zWaXvJcc+GAOhT5P6u74GEev34ey9n DoqFyl9jm8SW2DIYAreOcNHzQRvsdqI= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Sebastian Andrzej Siewior , Vlastimil Babka , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 1/4] memcg: simplify consume_stock Date: Tue, 29 Apr 2025 16:04:25 -0700 Message-ID: <20250429230428.1935619-2-shakeel.butt@linux.dev> In-Reply-To: <20250429230428.1935619-1-shakeel.butt@linux.dev> References: <20250429230428.1935619-1-shakeel.butt@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" The consume_stock() does not need to check gfp_mask for spinning and can simply trylock the local lock to decide to proceed or fail. No need to spin at all for local lock. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 650fe4314c39..40d0838d88bc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1804,16 +1804,14 @@ static bool obj_stock_flush_required(struct memcg_s= tock_pcp *stock, * consume_stock: Try to consume stocked charge on this cpu. * @memcg: memcg to consume from. * @nr_pages: how many pages to charge. - * @gfp_mask: allocation mask. * - * The charges will only happen if @memcg matches the current cpu's memcg - * stock, and at least @nr_pages are available in that stock. Failure to - * service an allocation will refill the stock. + * Consume the cached charge if enough nr_pages are present otherwise retu= rn + * failure. Also return failure for charge request larger than + * MEMCG_CHARGE_BATCH or if the local lock is already taken. * * returns true if successful, false otherwise. */ -static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages, - gfp_t gfp_mask) +static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { struct memcg_stock_pcp *stock; uint8_t stock_pages; @@ -1821,12 +1819,8 @@ static bool consume_stock(struct mem_cgroup *memcg, = unsigned int nr_pages, bool ret =3D false; int i; =20 - if (nr_pages > MEMCG_CHARGE_BATCH) - return ret; - - if (gfpflags_allow_spinning(gfp_mask)) - local_lock_irqsave(&memcg_stock.stock_lock, flags); - else if (!local_trylock_irqsave(&memcg_stock.stock_lock, flags)) + if (nr_pages > MEMCG_CHARGE_BATCH || + !local_trylock_irqsave(&memcg_stock.stock_lock, flags)) return ret; =20 stock =3D this_cpu_ptr(&memcg_stock); @@ -2329,7 +2323,7 @@ static int try_charge_memcg(struct mem_cgroup *memcg,= gfp_t gfp_mask, unsigned long pflags; =20 retry: - if (consume_stock(memcg, nr_pages, gfp_mask)) + if (consume_stock(memcg, nr_pages)) return 0; =20 if (!gfpflags_allow_spinning(gfp_mask)) --=20 2.47.1 From nobody Sat Feb 7 17:55:12 2026 Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A40D320101D for ; Tue, 29 Apr 2025 23:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967919; cv=none; b=uPwIb5CndJ6NYT4IC3JpPjvDYssjF58NyJSfS2co58TIGxG6W8RkJWMJh1esE3DpzqRqruka0Xt9QR1i8Z8ERaHZPWIuLJcT1mGTI0565GWhisjMrJvZhCrYf23sg5vO8qDErNmVZ+DmmqmOH/6/T16MzZ2NGWQfjpc3VOC8SPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967919; c=relaxed/simple; bh=JWDhGANP8sIe9IFnB6VrxLUfLPvdgV7YcsEbsBbUKig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ka3i3gr082Bgw+A88XK/OENLgulM+FAISGw6Jm9E24c7VIPyaQ+Kwk+Y47k7LqA9bMCoG0Is4ZCF8zJ0U9fAXVxN21VgPVjKMfnOspETyweuqappcuTRUidSysncY2Bw60ls1F6RRAa0ZgZQgnC8aWpuQeKDVATYRkAAwSx+2Vc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=M1yfKabS; arc=none smtp.client-ip=91.218.175.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="M1yfKabS" 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=1745967903; 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=FedcIVEcoO0k/CPNqGJbnqtLtjq2M33qwVx6Hh8t7k8=; b=M1yfKabSFr2l+TzSsPuUKT6AH4jH6rGYGn6f7a0IS6IHgt+4cp2vBTYMlGOYujkMWVUhe1 d0QNQqffz0e2EEJV3ob/0RNbEnAgB8lDP8rqlGiVnj8T1eMwr5YRlOltwrovUksYVjeOPC IbkiPA24ZWMGQNm9pXw9qtTWPGL2T8s= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Sebastian Andrzej Siewior , Vlastimil Babka , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 2/4] memcg: separate local_trylock for memcg and obj Date: Tue, 29 Apr 2025 16:04:26 -0700 Message-ID: <20250429230428.1935619-3-shakeel.butt@linux.dev> In-Reply-To: <20250429230428.1935619-1-shakeel.butt@linux.dev> References: <20250429230428.1935619-1-shakeel.butt@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" The per-cpu stock_lock protects cached memcg and cached objcg and their respective fields. However there is no dependency between these fields and it is better to have fine grained separate locks for cached memcg and cached objcg. This decoupling of locks allows us to make the memcg charge cache and objcg charge cache to be nmi safe independently. At the moment, memcg charge cache is already nmi safe and this decoupling will allow to make memcg charge cache work without disabling irqs. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 52 +++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 40d0838d88bc..460634e8435f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1777,13 +1777,14 @@ void mem_cgroup_print_oom_group(struct mem_cgroup *= memcg) =20 #define NR_MEMCG_STOCK 7 struct memcg_stock_pcp { - local_trylock_t stock_lock; + local_trylock_t memcg_lock; uint8_t nr_pages[NR_MEMCG_STOCK]; struct mem_cgroup *cached[NR_MEMCG_STOCK]; =20 + local_trylock_t obj_lock; + unsigned int nr_bytes; struct obj_cgroup *cached_objcg; struct pglist_data *cached_pgdat; - unsigned int nr_bytes; int nr_slab_reclaimable_b; int nr_slab_unreclaimable_b; =20 @@ -1792,7 +1793,8 @@ struct memcg_stock_pcp { #define FLUSHING_CACHED_CHARGE 0 }; static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock) =3D { - .stock_lock =3D INIT_LOCAL_TRYLOCK(stock_lock), + .memcg_lock =3D INIT_LOCAL_TRYLOCK(memcg_lock), + .obj_lock =3D INIT_LOCAL_TRYLOCK(obj_lock), }; static DEFINE_MUTEX(percpu_charge_mutex); =20 @@ -1820,7 +1822,7 @@ static bool consume_stock(struct mem_cgroup *memcg, u= nsigned int nr_pages) int i; =20 if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.stock_lock, flags)) + !local_trylock_irqsave(&memcg_stock.memcg_lock, flags)) return ret; =20 stock =3D this_cpu_ptr(&memcg_stock); @@ -1837,7 +1839,7 @@ static bool consume_stock(struct mem_cgroup *memcg, u= nsigned int nr_pages) break; } =20 - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + local_unlock_irqrestore(&memcg_stock.memcg_lock, flags); =20 return ret; } @@ -1883,19 +1885,22 @@ static void drain_local_stock(struct work_struct *d= ummy) struct memcg_stock_pcp *stock; unsigned long flags; =20 - /* - * The only protection from cpu hotplug (memcg_hotplug_cpu_dead) vs. - * drain_stock races is that we always operate on local CPU stock - * here with IRQ disabled - */ - local_lock_irqsave(&memcg_stock.stock_lock, flags); + if (WARN_ONCE(!in_task(), "drain in non-task context")) + return; =20 + preempt_disable(); stock =3D this_cpu_ptr(&memcg_stock); + + local_lock_irqsave(&memcg_stock.obj_lock, flags); drain_obj_stock(stock); + local_unlock_irqrestore(&memcg_stock.obj_lock, flags); + + local_lock_irqsave(&memcg_stock.memcg_lock, flags); drain_stock_fully(stock); - clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); + local_unlock_irqrestore(&memcg_stock.memcg_lock, flags); =20 - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); + preempt_enable(); } =20 static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) @@ -1918,10 +1923,10 @@ static void refill_stock(struct mem_cgroup *memcg, = unsigned int nr_pages) VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); =20 if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.stock_lock, flags)) { + !local_trylock_irqsave(&memcg_stock.memcg_lock, flags)) { /* * In case of larger than batch refill or unlikely failure to - * lock the percpu stock_lock, uncharge memcg directly. + * lock the percpu memcg_lock, uncharge memcg directly. */ memcg_uncharge(memcg, nr_pages); return; @@ -1953,7 +1958,7 @@ static void refill_stock(struct mem_cgroup *memcg, un= signed int nr_pages) WRITE_ONCE(stock->nr_pages[i], nr_pages); } =20 - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + local_unlock_irqrestore(&memcg_stock.memcg_lock, flags); } =20 static bool is_drain_needed(struct memcg_stock_pcp *stock, @@ -2028,11 +2033,12 @@ static int memcg_hotplug_cpu_dead(unsigned int cpu) =20 stock =3D &per_cpu(memcg_stock, cpu); =20 - /* drain_obj_stock requires stock_lock */ - local_lock_irqsave(&memcg_stock.stock_lock, flags); + /* drain_obj_stock requires obj_lock */ + local_lock_irqsave(&memcg_stock.obj_lock, flags); drain_obj_stock(stock); - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + local_unlock_irqrestore(&memcg_stock.obj_lock, flags); =20 + /* no need for the local lock */ drain_stock_fully(stock); =20 return 0; @@ -2885,7 +2891,7 @@ static bool consume_obj_stock(struct obj_cgroup *objc= g, unsigned int nr_bytes, unsigned long flags; bool ret =3D false; =20 - local_lock_irqsave(&memcg_stock.stock_lock, flags); + local_lock_irqsave(&memcg_stock.obj_lock, flags); =20 stock =3D this_cpu_ptr(&memcg_stock); if (objcg =3D=3D READ_ONCE(stock->cached_objcg) && stock->nr_bytes >=3D n= r_bytes) { @@ -2896,7 +2902,7 @@ static bool consume_obj_stock(struct obj_cgroup *objc= g, unsigned int nr_bytes, __account_obj_stock(objcg, stock, nr_bytes, pgdat, idx); } =20 - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + local_unlock_irqrestore(&memcg_stock.obj_lock, flags); =20 return ret; } @@ -2985,7 +2991,7 @@ static void refill_obj_stock(struct obj_cgroup *objcg= , unsigned int nr_bytes, unsigned long flags; unsigned int nr_pages =3D 0; =20 - local_lock_irqsave(&memcg_stock.stock_lock, flags); + local_lock_irqsave(&memcg_stock.obj_lock, flags); =20 stock =3D this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached_objcg) !=3D objcg) { /* reset if necessary */ @@ -3007,7 +3013,7 @@ static void refill_obj_stock(struct obj_cgroup *objcg= , unsigned int nr_bytes, stock->nr_bytes &=3D (PAGE_SIZE - 1); } =20 - local_unlock_irqrestore(&memcg_stock.stock_lock, flags); + local_unlock_irqrestore(&memcg_stock.obj_lock, flags); =20 if (nr_pages) obj_cgroup_uncharge_pages(objcg, nr_pages); --=20 2.47.1 From nobody Sat Feb 7 17:55:12 2026 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB1AE2DAF8C for ; Tue, 29 Apr 2025 23:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967919; cv=none; b=ukGCU0AyZj2PfavOh5cUhSVxH1PjI8gN1GXk8gPtR8h+34xhfMjItUmdjRO55VwW0h6QLakx7lmFJDPOTy6tCo7v3O2dIAsKW7l+XMx7KYMZyERHsT9JF2StUT0CrPK4NkaYcRE/k/N1tOGznHbql/B/A/IPkz2O2SmnHvoUetk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967919; c=relaxed/simple; bh=tc1hDU/aNFse50dE45m+egZ3DV40eZ5vCsllZ7YkfCs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EM4pXpjiRtFb5KRiYii12fXWP2EKThLZU5lCmfrCIfPLOiAleZ1ONhBL/RztYgUU0r9FPOHo4TI7eKbHqgUTR7jxZOggSfhT7R30GPfaZQiYnIhZTlKMpFIbjbvNyUAhiDhwX6u3cSVlniA7jrnt7p0l9AcH1XXsNZQVtR6l3A0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=IJEydHmr; arc=none smtp.client-ip=95.215.58.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="IJEydHmr" 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=1745967914; 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=b4Ke4mWiw6e2yd7F2kAgGNNr9fqMvIIVtrgaLg/X10w=; b=IJEydHmrcZdZVB0Q8zMHbUaZmDAS0Lgwa0Q3gwzahmwQQcKGpy1WoG0vGKd6dUxvqyUxJQ +h8zZbGJMB1R4d5rVF3BgQi9FpqrlhyDEERvxBVFPfsuwdgFwxovCwjDXciEvOKw2CfXMh hOPIbrtjhNh3qoxjYzasEklbu5JYAFM= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Sebastian Andrzej Siewior , Vlastimil Babka , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 3/4] memcg: completely decouple memcg and obj stocks Date: Tue, 29 Apr 2025 16:04:27 -0700 Message-ID: <20250429230428.1935619-4-shakeel.butt@linux.dev> In-Reply-To: <20250429230428.1935619-1-shakeel.butt@linux.dev> References: <20250429230428.1935619-1-shakeel.butt@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Let's completely decouple the memcg and obj per-cpu stocks. This will enable us to make memcg per-cpu stocks to used without disabling irqs. Also it will enable us to make obj stocks nmi safe independently which is required to make kmalloc/slab safe for allocations from nmi context. Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka --- mm/memcontrol.c | 150 +++++++++++++++++++++++++++++------------------- 1 file changed, 91 insertions(+), 59 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 460634e8435f..8f31b35ddcb3 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1775,13 +1775,23 @@ void mem_cgroup_print_oom_group(struct mem_cgroup *= memcg) pr_cont(" are going to be killed due to memory.oom.group set\n"); } =20 +#define FLUSHING_CACHED_CHARGE 0 #define NR_MEMCG_STOCK 7 struct memcg_stock_pcp { - local_trylock_t memcg_lock; + local_trylock_t lock; uint8_t nr_pages[NR_MEMCG_STOCK]; struct mem_cgroup *cached[NR_MEMCG_STOCK]; =20 - local_trylock_t obj_lock; + struct work_struct work; + unsigned long flags; +}; + +static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock) =3D { + .lock =3D INIT_LOCAL_TRYLOCK(lock), +}; + +struct obj_stock_pcp { + local_trylock_t lock; unsigned int nr_bytes; struct obj_cgroup *cached_objcg; struct pglist_data *cached_pgdat; @@ -1790,16 +1800,16 @@ struct memcg_stock_pcp { =20 struct work_struct work; unsigned long flags; -#define FLUSHING_CACHED_CHARGE 0 }; -static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock) =3D { - .memcg_lock =3D INIT_LOCAL_TRYLOCK(memcg_lock), - .obj_lock =3D INIT_LOCAL_TRYLOCK(obj_lock), + +static DEFINE_PER_CPU(struct obj_stock_pcp, obj_stock) =3D { + .lock =3D INIT_LOCAL_TRYLOCK(lock), }; + static DEFINE_MUTEX(percpu_charge_mutex); =20 -static void drain_obj_stock(struct memcg_stock_pcp *stock); -static bool obj_stock_flush_required(struct memcg_stock_pcp *stock, +static void drain_obj_stock(struct obj_stock_pcp *stock); +static bool obj_stock_flush_required(struct obj_stock_pcp *stock, struct mem_cgroup *root_memcg); =20 /** @@ -1822,7 +1832,7 @@ static bool consume_stock(struct mem_cgroup *memcg, u= nsigned int nr_pages) int i; =20 if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.memcg_lock, flags)) + !local_trylock_irqsave(&memcg_stock.lock, flags)) return ret; =20 stock =3D this_cpu_ptr(&memcg_stock); @@ -1839,7 +1849,7 @@ static bool consume_stock(struct mem_cgroup *memcg, u= nsigned int nr_pages) break; } =20 - local_unlock_irqrestore(&memcg_stock.memcg_lock, flags); + local_unlock_irqrestore(&memcg_stock.lock, flags); =20 return ret; } @@ -1880,7 +1890,7 @@ static void drain_stock_fully(struct memcg_stock_pcp = *stock) drain_stock(stock, i); } =20 -static void drain_local_stock(struct work_struct *dummy) +static void drain_local_memcg_stock(struct work_struct *dummy) { struct memcg_stock_pcp *stock; unsigned long flags; @@ -1888,19 +1898,30 @@ static void drain_local_stock(struct work_struct *d= ummy) if (WARN_ONCE(!in_task(), "drain in non-task context")) return; =20 - preempt_disable(); + local_lock_irqsave(&memcg_stock.lock, flags); + stock =3D this_cpu_ptr(&memcg_stock); + drain_stock_fully(stock); + clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); =20 - local_lock_irqsave(&memcg_stock.obj_lock, flags); - drain_obj_stock(stock); - local_unlock_irqrestore(&memcg_stock.obj_lock, flags); + local_unlock_irqrestore(&memcg_stock.lock, flags); +} =20 - local_lock_irqsave(&memcg_stock.memcg_lock, flags); - drain_stock_fully(stock); - local_unlock_irqrestore(&memcg_stock.memcg_lock, flags); +static void drain_local_obj_stock(struct work_struct *dummy) +{ + struct obj_stock_pcp *stock; + unsigned long flags; =20 + if (WARN_ONCE(!in_task(), "drain in non-task context")) + return; + + local_lock_irqsave(&obj_stock.lock, flags); + + stock =3D this_cpu_ptr(&obj_stock); + drain_obj_stock(stock); clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); - preempt_enable(); + + local_unlock_irqrestore(&obj_stock.lock, flags); } =20 static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) @@ -1923,10 +1944,10 @@ static void refill_stock(struct mem_cgroup *memcg, = unsigned int nr_pages) VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); =20 if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.memcg_lock, flags)) { + !local_trylock_irqsave(&memcg_stock.lock, flags)) { /* * In case of larger than batch refill or unlikely failure to - * lock the percpu memcg_lock, uncharge memcg directly. + * lock the percpu memcg_stock.lock, uncharge memcg directly. */ memcg_uncharge(memcg, nr_pages); return; @@ -1958,23 +1979,17 @@ static void refill_stock(struct mem_cgroup *memcg, = unsigned int nr_pages) WRITE_ONCE(stock->nr_pages[i], nr_pages); } =20 - local_unlock_irqrestore(&memcg_stock.memcg_lock, flags); + local_unlock_irqrestore(&memcg_stock.lock, flags); } =20 -static bool is_drain_needed(struct memcg_stock_pcp *stock, - struct mem_cgroup *root_memcg) +static bool is_memcg_drain_needed(struct memcg_stock_pcp *stock, + struct mem_cgroup *root_memcg) { struct mem_cgroup *memcg; bool flush =3D false; int i; =20 rcu_read_lock(); - - if (obj_stock_flush_required(stock, root_memcg)) { - flush =3D true; - goto out; - } - for (i =3D 0; i < NR_MEMCG_STOCK; ++i) { memcg =3D READ_ONCE(stock->cached[i]); if (!memcg) @@ -1986,7 +2001,6 @@ static bool is_drain_needed(struct memcg_stock_pcp *s= tock, break; } } -out: rcu_read_unlock(); return flush; } @@ -2011,15 +2025,27 @@ void drain_all_stock(struct mem_cgroup *root_memcg) migrate_disable(); curcpu =3D smp_processor_id(); for_each_online_cpu(cpu) { - struct memcg_stock_pcp *stock =3D &per_cpu(memcg_stock, cpu); - bool flush =3D is_drain_needed(stock, root_memcg); + struct memcg_stock_pcp *memcg_st =3D &per_cpu(memcg_stock, cpu); + struct obj_stock_pcp *obj_st =3D &per_cpu(obj_stock, cpu); =20 - if (flush && - !test_and_set_bit(FLUSHING_CACHED_CHARGE, &stock->flags)) { + if (!test_bit(FLUSHING_CACHED_CHARGE, &memcg_st->flags) && + is_memcg_drain_needed(memcg_st, root_memcg) && + !test_and_set_bit(FLUSHING_CACHED_CHARGE, + &memcg_st->flags)) { if (cpu =3D=3D curcpu) - drain_local_stock(&stock->work); + drain_local_memcg_stock(&memcg_st->work); else if (!cpu_is_isolated(cpu)) - schedule_work_on(cpu, &stock->work); + schedule_work_on(cpu, &memcg_st->work); + } + + if (!test_bit(FLUSHING_CACHED_CHARGE, &obj_st->flags) && + obj_stock_flush_required(obj_st, root_memcg) && + !test_and_set_bit(FLUSHING_CACHED_CHARGE, + &obj_st->flags)) { + if (cpu =3D=3D curcpu) + drain_local_obj_stock(&obj_st->work); + else if (!cpu_is_isolated(cpu)) + schedule_work_on(cpu, &obj_st->work); } } migrate_enable(); @@ -2028,18 +2054,18 @@ void drain_all_stock(struct mem_cgroup *root_memcg) =20 static int memcg_hotplug_cpu_dead(unsigned int cpu) { - struct memcg_stock_pcp *stock; + struct obj_stock_pcp *obj_st; unsigned long flags; =20 - stock =3D &per_cpu(memcg_stock, cpu); + obj_st =3D &per_cpu(obj_stock, cpu); =20 - /* drain_obj_stock requires obj_lock */ - local_lock_irqsave(&memcg_stock.obj_lock, flags); - drain_obj_stock(stock); - local_unlock_irqrestore(&memcg_stock.obj_lock, flags); + /* drain_obj_stock requires objstock.lock */ + local_lock_irqsave(&obj_stock.lock, flags); + drain_obj_stock(obj_st); + local_unlock_irqrestore(&obj_stock.lock, flags); =20 /* no need for the local lock */ - drain_stock_fully(stock); + drain_stock_fully(&per_cpu(memcg_stock, cpu)); =20 return 0; } @@ -2836,7 +2862,7 @@ void __memcg_kmem_uncharge_page(struct page *page, in= t order) } =20 static void __account_obj_stock(struct obj_cgroup *objcg, - struct memcg_stock_pcp *stock, int nr, + struct obj_stock_pcp *stock, int nr, struct pglist_data *pgdat, enum node_stat_item idx) { int *bytes; @@ -2887,13 +2913,13 @@ static void __account_obj_stock(struct obj_cgroup *= objcg, static bool consume_obj_stock(struct obj_cgroup *objcg, unsigned int nr_by= tes, struct pglist_data *pgdat, enum node_stat_item idx) { - struct memcg_stock_pcp *stock; + struct obj_stock_pcp *stock; unsigned long flags; bool ret =3D false; =20 - local_lock_irqsave(&memcg_stock.obj_lock, flags); + local_lock_irqsave(&obj_stock.lock, flags); =20 - stock =3D this_cpu_ptr(&memcg_stock); + stock =3D this_cpu_ptr(&obj_stock); if (objcg =3D=3D READ_ONCE(stock->cached_objcg) && stock->nr_bytes >=3D n= r_bytes) { stock->nr_bytes -=3D nr_bytes; ret =3D true; @@ -2902,12 +2928,12 @@ static bool consume_obj_stock(struct obj_cgroup *ob= jcg, unsigned int nr_bytes, __account_obj_stock(objcg, stock, nr_bytes, pgdat, idx); } =20 - local_unlock_irqrestore(&memcg_stock.obj_lock, flags); + local_unlock_irqrestore(&obj_stock.lock, flags); =20 return ret; } =20 -static void drain_obj_stock(struct memcg_stock_pcp *stock) +static void drain_obj_stock(struct obj_stock_pcp *stock) { struct obj_cgroup *old =3D READ_ONCE(stock->cached_objcg); =20 @@ -2968,32 +2994,35 @@ static void drain_obj_stock(struct memcg_stock_pcp = *stock) obj_cgroup_put(old); } =20 -static bool obj_stock_flush_required(struct memcg_stock_pcp *stock, +static bool obj_stock_flush_required(struct obj_stock_pcp *stock, struct mem_cgroup *root_memcg) { struct obj_cgroup *objcg =3D READ_ONCE(stock->cached_objcg); struct mem_cgroup *memcg; + bool flush =3D false; =20 + rcu_read_lock(); if (objcg) { memcg =3D obj_cgroup_memcg(objcg); if (memcg && mem_cgroup_is_descendant(memcg, root_memcg)) - return true; + flush =3D true; } + rcu_read_unlock(); =20 - return false; + return flush; } =20 static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_byt= es, bool allow_uncharge, int nr_acct, struct pglist_data *pgdat, enum node_stat_item idx) { - struct memcg_stock_pcp *stock; + struct obj_stock_pcp *stock; unsigned long flags; unsigned int nr_pages =3D 0; =20 - local_lock_irqsave(&memcg_stock.obj_lock, flags); + local_lock_irqsave(&obj_stock.lock, flags); =20 - stock =3D this_cpu_ptr(&memcg_stock); + stock =3D this_cpu_ptr(&obj_stock); if (READ_ONCE(stock->cached_objcg) !=3D objcg) { /* reset if necessary */ drain_obj_stock(stock); obj_cgroup_get(objcg); @@ -3013,7 +3042,7 @@ static void refill_obj_stock(struct obj_cgroup *objcg= , unsigned int nr_bytes, stock->nr_bytes &=3D (PAGE_SIZE - 1); } =20 - local_unlock_irqrestore(&memcg_stock.obj_lock, flags); + local_unlock_irqrestore(&obj_stock.lock, flags); =20 if (nr_pages) obj_cgroup_uncharge_pages(objcg, nr_pages); @@ -5078,9 +5107,12 @@ int __init mem_cgroup_init(void) cpuhp_setup_state_nocalls(CPUHP_MM_MEMCQ_DEAD, "mm/memctrl:dead", NULL, memcg_hotplug_cpu_dead); =20 - for_each_possible_cpu(cpu) + for_each_possible_cpu(cpu) { INIT_WORK(&per_cpu_ptr(&memcg_stock, cpu)->work, - drain_local_stock); + drain_local_memcg_stock); + INIT_WORK(&per_cpu_ptr(&obj_stock, cpu)->work, + drain_local_obj_stock); + } =20 memcg_size =3D struct_size_t(struct mem_cgroup, nodeinfo, nr_node_ids); memcg_cachep =3D kmem_cache_create("mem_cgroup", memcg_size, 0, --=20 2.47.1 From nobody Sat Feb 7 17:55:12 2026 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D3C82DCB5D for ; Tue, 29 Apr 2025 23:05:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967927; cv=none; b=byc8aCiTLa3v4a+rckqwrYLDbOajtlYhGvYFcgnnFqdSdEfqqhmsI1B6JT1QllOG1vXslAicnGAk0sBoRD/SedoQwaRkfBhhmoGv9jVR+wEBauHCXAZnL4fyVAvUmlsq3Pb0+4UDTxPzYKebLz+yomE4UE19LyYhNSbhbUqgJHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745967927; c=relaxed/simple; bh=vUhnoYWgld5Ear31+0RTM7usI0oTO/ydOl8T94r/4j8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LMpLwCdljUtPljJH8p6uTXUcnWpzUpIbB90BMlbRs9gRhpdSAekKjfzqdDYhvpMvav3x9DrbXH13W05PCnZLYzpGZEbh3ypTdyH33ZAwb0NYI4gl+xA30MAW7LAPgAtTWbMuLLqTPm/8rVlat6NDIhFwOavpuKqAYUzaDoZHqyA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=FpN7Cos5; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="FpN7Cos5" 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=1745967922; 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=+wZ3v2muB0VupF4eSm9lwfoOuI+XDtB2dNKm1AuFXCU=; b=FpN7Cos5+LvGlJ0uN4wUjtj7q62hwDzl34qGZWAa8an12kny3cW+RWdWjX0voaSFS2d8ns baVq1k2+kMkUxX+1intyzYgXU/SVc8vJTJp1Wtg+sOl2e5cmA4RB4DfpCipF0xy/CoWPWD eKZuGCqqdWXUaFLaYqD9I2TjwG+p+hs= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Sebastian Andrzej Siewior , Vlastimil Babka , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH 4/4] memcg: no irq disable for memcg stock lock Date: Tue, 29 Apr 2025 16:04:28 -0700 Message-ID: <20250429230428.1935619-5-shakeel.butt@linux.dev> In-Reply-To: <20250429230428.1935619-1-shakeel.butt@linux.dev> References: <20250429230428.1935619-1-shakeel.butt@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" There is no need to disable irqs to use memcg per-cpu stock, so let's just not do that. One consequence of this change is if the kernel while in task context has the memcg stock lock and that cpu got interrupted. The memcg charges on that cpu in the irq context will take the slow path of memcg charging. However that should be super rare and should be fine in general. Signed-off-by: Shakeel Butt Acked-by: Vlastimil Babka --- mm/memcontrol.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8f31b35ddcb3..25bd312d0455 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1827,12 +1827,11 @@ static bool consume_stock(struct mem_cgroup *memcg,= unsigned int nr_pages) { struct memcg_stock_pcp *stock; uint8_t stock_pages; - unsigned long flags; bool ret =3D false; int i; =20 if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.lock, flags)) + !local_trylock(&memcg_stock.lock)) return ret; =20 stock =3D this_cpu_ptr(&memcg_stock); @@ -1849,7 +1848,7 @@ static bool consume_stock(struct mem_cgroup *memcg, u= nsigned int nr_pages) break; } =20 - local_unlock_irqrestore(&memcg_stock.lock, flags); + local_unlock(&memcg_stock.lock); =20 return ret; } @@ -1893,18 +1892,17 @@ static void drain_stock_fully(struct memcg_stock_pc= p *stock) static void drain_local_memcg_stock(struct work_struct *dummy) { struct memcg_stock_pcp *stock; - unsigned long flags; =20 if (WARN_ONCE(!in_task(), "drain in non-task context")) return; =20 - local_lock_irqsave(&memcg_stock.lock, flags); + local_lock(&memcg_stock.lock); =20 stock =3D this_cpu_ptr(&memcg_stock); drain_stock_fully(stock); clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); =20 - local_unlock_irqrestore(&memcg_stock.lock, flags); + local_unlock(&memcg_stock.lock); } =20 static void drain_local_obj_stock(struct work_struct *dummy) @@ -1944,7 +1942,7 @@ static void refill_stock(struct mem_cgroup *memcg, un= signed int nr_pages) VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); =20 if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock_irqsave(&memcg_stock.lock, flags)) { + !local_trylock(&memcg_stock.lock)) { /* * In case of larger than batch refill or unlikely failure to * lock the percpu memcg_stock.lock, uncharge memcg directly. @@ -1979,7 +1977,7 @@ static void refill_stock(struct mem_cgroup *memcg, un= signed int nr_pages) WRITE_ONCE(stock->nr_pages[i], nr_pages); } =20 - local_unlock_irqrestore(&memcg_stock.lock, flags); + local_unlock(&memcg_stock.lock); } =20 static bool is_memcg_drain_needed(struct memcg_stock_pcp *stock, --=20 2.47.1