From patchwork Sat Mar 15 17:49:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 14018164 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 5CAA0C28B2F for ; Sat, 15 Mar 2025 17:49:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07315280003; Sat, 15 Mar 2025 13:49:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 02266280001; Sat, 15 Mar 2025 13:49:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E55F0280003; Sat, 15 Mar 2025 13:49:46 -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 C53F5280001 for ; Sat, 15 Mar 2025 13:49:46 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 19E36161F4D for ; Sat, 15 Mar 2025 17:49:48 +0000 (UTC) X-FDA: 83224523256.13.31A8733 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) by imf04.hostedemail.com (Postfix) with ESMTP id 68E0240009 for ; Sat, 15 Mar 2025 17:49:46 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LVtOFiDf; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf04.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.186 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=1742060986; 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=cmS5hv6xwjGOhhAkz0IaR50zSoZuuoSBRO/S5eqp4mA=; b=hSPwZix/WRvawoicfXLObbBurf6fqQk2Q7RrUG2ZBbF/kcnhnUW2mANAb0HUlDRZcB0GgG qCFZbJlPE8Q/MR9ORbQJG39jBYA9rjfwM3Ehv2HQj3EQ7nJWLUqCRZd1bGIlu+5+ez6Pp2 bR4J/ROo82CUPG2icLQzf3G1F3Vd2EA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742060986; a=rsa-sha256; cv=none; b=8G+n/OZkux/FRluOEcpV/MSyQgo8Cg4OcIVDsF8q8jB5SMQSIDl8LyQlMP/XEr+Q9DM0tY vz9EIVYi5S5LII2rdx287z+Ew6ot2mPSPwZH+355eyC9h0dGQI4E8XrWwqc/L+gQNyc0dN xzz3HprjWvGiKzxHhaJzoRt95KAiTHA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LVtOFiDf; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf04.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.186 as permitted sender) smtp.mailfrom=shakeel.butt@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=1742060984; 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=cmS5hv6xwjGOhhAkz0IaR50zSoZuuoSBRO/S5eqp4mA=; b=LVtOFiDfJTfbraclra86x+fCaQarFRpDuvgbtcbJPyfEGkmeTvyYet4jd9Nwe7MYVclJnn uuJLQQVD62W9ZBqiSKhDpcCrLRrD//QYT9PyfmzobpzgN56PeZJewgqDV+tc22Dfa0cBft 3TEADM+PDuzpeOAVrq4zauWky81Tgxs= 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 1/9] memcg: remove root memcg check from refill_stock Date: Sat, 15 Mar 2025 10:49:22 -0700 Message-ID: <20250315174930.1769599-2-shakeel.butt@linux.dev> In-Reply-To: <20250315174930.1769599-1-shakeel.butt@linux.dev> References: <20250315174930.1769599-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 68E0240009 X-Stat-Signature: 3ez8w8wy8awz3ip1y564appok4umry69 X-HE-Tag: 1742060986-257301 X-HE-Meta: U2FsdGVkX19wSSN0C6ZKMLHVE79x6wqwBr1VjPHCJ/JqOKg08b2x+AG0TdgB/nHlPgypMDBs+BfJmxNYbN1YJD4UVM287Y1A6RS5sQMF4ViTh5qrwwIrh+LLWGcnVaNsNBnsBU5VbmxJ8BkjykUP3EXlB2mqtJT/J50TfIgtB30YK3dGAUorwaGSmOIgtCe9MTNUWI/2bTIiFZ+tcx+mKEg3P4URZC/D5S69Aw68IBXVyfiy2i5jMFSwALj0ZsdKbrIeVgjiwJSd/x08gphsw+Lt5N/xkZvG/wBGMqqRRgBU5rHJQIJ5NIg2G/P/RAspDjLKw7MX+3ufBAikrM5xNWywaDtwtxlAYDHH0rCxyWOqJuyzoTVaw4FimZ93AggAr3CE1QzAeRQYu7AvoyHdcFFr6Vp0k/wNxxRY/gwfzvLZo0LAH+V1iUcGyAAnlSDHxrEnqrePATFmkO6Ge45/bzXTpKrTjJq0eP8fMW8lpE5v3KtSva8CXL3d2NjJbjMOJI+AX56hAjVYK3gaA0cvGl4W8u9Z1qVpnCFrcFuzIeekDaEZWMGrYsehXeytK41uJxMCHyZWVD3Py/uK3EAOBEl2Q8pF4//eBaewCxL2HAtW3fz/j7G6sLs1d2sRPN08t1mR+d/fWFOtUe2xZjFzaaSPIOtB8QP/i08B/Ffe0FzwEP43tAEwSp9jsVxw6TaD+CUKeWzm5P1djv8vBC5Q6yclJEGYi11knRxERvkrUzd0TyjoJY+Xk0BKvYn/5WEZRkWJUWFnMiHQjrjXseETxEzoCVgeA89KJd1u1rfP1yR40fVlNL2q+gdEuhe9hnZcUtHmZPzkWUMHNtuOc8UKY4kNiGQTFjzVMqLTcfhIWn3v9JDupB40lOpaDk1g96KYDU0F1MG0VLhBwsLuFmJEwsHWmckqv6V2KkhR3TZ0YFySxU/BvdTy8iILXC4EYgq6y+ZK5xeoQQIPPXAavAz zY9mV+uO +uTlMxRZCu7twB4vwmSiEU++cnKT+1O3zxt0US8o40FqnOkD/O5NbrvWor1VFy4J/IMUbCMS1g1QgNryQDLSAUSCZu068HHIA6TQRt/j6C1dBI3g3Jf4b9texis01ApP63WrrzMHiMy70n1xF4CcTL65cHYz0YOw1xnC51yU3Vc8pzvFSjg+9ujZIXcNI0iwB5pqpcwL9ot6ZJiVihsgIhkYhWw== 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: refill_stock can not be called with root memcg, so there is no need to check it. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b29433eb17fa..c09a32e93d39 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1883,6 +1883,7 @@ static void __refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) drain_stock(stock); } +/* Should never be called with root_mem_cgroup. */ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { unsigned long flags; @@ -1892,8 +1893,6 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) * In case of unlikely failure to lock percpu stock_lock * uncharge memcg directly. */ - if (mem_cgroup_is_root(memcg)) - return; page_counter_uncharge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_uncharge(&memcg->memsw, nr_pages);