From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC5D139B4A9 for ; Fri, 22 May 2026 22:06:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779487609; cv=none; b=aAC7RZaxotZrx+oVIaMUMZOH73AuYIujpLId2f6HRzHTstQFmdk6NsZSAhzYshIZewgclM+BAyFusAGxMSko0ykS3n6msx+QuZzyccmKN1oj0cTNZTuOwsqJBquKvhCrraVdtGbCoAWgiIXot8A5ita4TNWzSWfNjy/hjuXCZcs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779487609; c=relaxed/simple; bh=wi2AftUjWyoieHh7H6LppbP8hmxwRBEpUtyqklssfNo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uSPmsk6oR5MVuHmDSr868QU2dxBuBroMEna3t2gLubCb/T9MXehODHt4bQVN/5fkr/xS/6Kcp6p+zU26ZptnY3IoJhy5r0Dd6moq3n9Mdrdwh+qMFp8vPMofU2s13txU7mP5QM/m6W10vIfD0A2J++Fv+Cpkv3hpcY5lmMW0FUw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IztMW+2I; arc=none smtp.client-ip=209.85.160.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IztMW+2I" Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-43acf1694daso4071094fac.3 for ; Fri, 22 May 2026 15:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779487607; x=1780092407; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2LcIS+VJgzgWoo9AJl45fIdipLbvB6geiavxJnRYEKM=; b=IztMW+2IoqZmmQMpE1aZZIL5a24uM40p63Wi42GhEvYNJ4/y1JA+mdoCTHVRo0XK32 P2N7+34V9YhxOr8AvaETJTovmN9g0omXvkO/ctivTk6felrW6iYmRmXn6EOf/3nN0dwo Gj/tmK5ZlkrTtoferQjYDNSAwkNes4IKpk6HWGdWnmbWfqDP9PgbLuDKiUvJibF/5ae2 ndbncz+kdOATgK9GJPFKizL+/o+67JaTUEedfSUajVQgF4Z0yZix6Amm7ZqYl3gkYv/H dDLxc2wBUctkJEZ2iACe0YERvi57zjaz6aX8+t4rQVrugOutT7mdwgpqot9D03GgDhoS QN8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779487607; x=1780092407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2LcIS+VJgzgWoo9AJl45fIdipLbvB6geiavxJnRYEKM=; b=X3d/XxeZqAzFA9UmNeayZrLcmAYS6WcNYxis6CqhBSSgKyt4yYCaZopucYZABYMisR PGP4FetSkEGQhI9PGtIo+RqowpKwvJDZS/mvA0LB1dnvIFzYbDOoaRk7sVH1sZUAMURO buh6fn9IWICbavgJ3JwHRQzAxsK2706QPIsvuxn/7L6A8rItA8DhZdXpr9V2DNDNFCn8 WjDDNo3MreIXzATnM4DDEAp5NC/945LE8V07qUTdmEdJ/5bvI7fnyBMsnGJQa7K7GHwV m9caeK21uaCaIP+EGIADEnMDA8582JrvL88RzFd0yhCPqrNWTK2jslMgPmG7QYmthtq9 lOTw== X-Forwarded-Encrypted: i=1; AFNElJ9Z0+okBPlQL0Ilr6OdkbZKoyPdNni7nWcv7ta2I1FG2kxfshbRndCHiDdZE9V58Ddl5uBfJtjL@vger.kernel.org X-Gm-Message-State: AOJu0YzIt2rNdPgMcLRvdZKKQCPDWrv3hI7uQb1gZ5wbDpRbYCysilaV 35+qNkZypx+rSuXLTxU7iaws2XX17rBGbcprlEGT0L+MiF8qEjHUYgQ1 X-Gm-Gg: Acq92OE6dIONt/ZY+OW8oYwQuaKUsTH8aQToHp/ijT1LUIMpH4s0LEHnSUTG08hY1JJ CgKXpjVUuxKzJxBWfU25TFKsgnAFjTiAeu35XPOuVMw3K5POhLzskLhuFBtuZG18dr/lLU9rOm0 bWLzi8aQlrsqulkWKkCXDtrYprVH2C1i4b/bbVoPHHjILfWXtYEvNpNz81mPy+1tDaSFr8NNuku /vmyKpPEpeYUZiiybHiXtHby+vS8dm1FphccMe2uCI0cYRoYrl1CpftR5hncGZO7osnIVwVuQ0I x0vAr2GhZpWtRk4Zp/u1JUjjjfzarSUm7rU4t5alCfA4y2WG1TJfF8/t4Rdxf119noT3d5hiDWU d9qnJOHtKXuyYnZ/gKHExxq5DXo0dDkhvv5v+selTsticE3lvKyAy+W+pe73v/GwNA9G96+hoEg 9OMasbOmeUvkF0pIfUjIyz8E2fykzcpv+rr3NBstlAp/K/bvpHx6lfhg== X-Received: by 2002:a05:6870:310e:b0:439:baa5:9f21 with SMTP id 586e51a60fabf-43b5ae75b29mr3333686fac.26.1779487606711; Fri, 22 May 2026 15:06:46 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:59::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-43b63512d63sm2857806fac.2.2026.05.22.15.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 15:06:45 -0700 (PDT) From: Joshua Hahn To: Johannes Weiner , Michal Hocko Cc: Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [PATCH 7/7 v2] mm/memcontrol: remove unused memcg_stock code Date: Fri, 22 May 2026 15:06:25 -0700 Message-ID: <20260522220627.1150804-8-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260522220627.1150804-1-joshua.hahnjy@gmail.com> References: <20260522220627.1150804-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Now that all memcg_stock logic has been moved to page_counter_stock, we can remove all code related to handling memcg_stock. Note that obj_stock is untouched and is still needed. FLUSHING_CACHED_CHARGE is preserved so that it can be used by obj_stock as well. Suggested-by: Johannes Weiner Signed-off-by: Joshua Hahn --- mm/memcontrol.c | 183 ------------------------------------------------ 1 file changed, 183 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index fc1e1b10b6ab6..24774c272ef8c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1810,24 +1810,7 @@ void mem_cgroup_print_oom_group(struct mem_cgroup *memcg) pr_cont(" are going to be killed due to memory.oom.group set\n"); } -/* - * The value of NR_MEMCG_STOCK is selected to keep the cached memcgs and their - * nr_pages in a single cacheline. This may change in future. - */ -#define NR_MEMCG_STOCK 7 #define FLUSHING_CACHED_CHARGE 0 -struct memcg_stock_pcp { - local_trylock_t lock; - uint8_t nr_pages[NR_MEMCG_STOCK]; - struct mem_cgroup *cached[NR_MEMCG_STOCK]; - - struct work_struct work; - unsigned long flags; -}; - -static DEFINE_PER_CPU_ALIGNED(struct memcg_stock_pcp, memcg_stock) = { - .lock = INIT_LOCAL_TRYLOCK(lock), -}; struct obj_stock_pcp { local_trylock_t lock; @@ -1851,47 +1834,6 @@ 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); -/** - * consume_stock: Try to consume stocked charge on this cpu. - * @memcg: memcg to consume from. - * @nr_pages: how many pages to charge. - * - * Consume the cached charge if enough nr_pages are present otherwise return - * 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) -{ - struct memcg_stock_pcp *stock; - uint8_t stock_pages; - bool ret = false; - int i; - - if (nr_pages > MEMCG_CHARGE_BATCH || - !local_trylock(&memcg_stock.lock)) - return ret; - - stock = this_cpu_ptr(&memcg_stock); - - for (i = 0; i < NR_MEMCG_STOCK; ++i) { - if (memcg != READ_ONCE(stock->cached[i])) - continue; - - stock_pages = READ_ONCE(stock->nr_pages[i]); - if (stock_pages >= nr_pages) { - WRITE_ONCE(stock->nr_pages[i], stock_pages - nr_pages); - ret = true; - } - break; - } - - local_unlock(&memcg_stock.lock); - - return ret; -} - static void memcg_uncharge(struct mem_cgroup *memcg, unsigned int nr_pages) { page_counter_uncharge(&memcg->memory, nr_pages); @@ -1899,51 +1841,6 @@ static void memcg_uncharge(struct mem_cgroup *memcg, unsigned int nr_pages) page_counter_uncharge(&memcg->memsw, nr_pages); } -/* - * Returns stocks cached in percpu and reset cached information. - */ -static void drain_stock(struct memcg_stock_pcp *stock, int i) -{ - struct mem_cgroup *old = READ_ONCE(stock->cached[i]); - uint8_t stock_pages; - - if (!old) - return; - - stock_pages = READ_ONCE(stock->nr_pages[i]); - if (stock_pages) { - memcg_uncharge(old, stock_pages); - WRITE_ONCE(stock->nr_pages[i], 0); - } - - css_put(&old->css); - WRITE_ONCE(stock->cached[i], NULL); -} - -static void drain_stock_fully(struct memcg_stock_pcp *stock) -{ - int i; - - for (i = 0; i < NR_MEMCG_STOCK; ++i) - drain_stock(stock, i); -} - -static void drain_local_memcg_stock(struct work_struct *dummy) -{ - struct memcg_stock_pcp *stock; - - if (WARN_ONCE(!in_task(), "drain in non-task context")) - return; - - local_lock(&memcg_stock.lock); - - stock = this_cpu_ptr(&memcg_stock); - drain_stock_fully(stock); - clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags); - - local_unlock(&memcg_stock.lock); -} - static void drain_local_obj_stock(struct work_struct *dummy) { struct obj_stock_pcp *stock; @@ -1960,86 +1857,6 @@ static void drain_local_obj_stock(struct work_struct *dummy) local_unlock(&obj_stock.lock); } -static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) -{ - struct memcg_stock_pcp *stock; - struct mem_cgroup *cached; - uint8_t stock_pages; - bool success = false; - int empty_slot = -1; - int i; - - /* - * For now limit MEMCG_CHARGE_BATCH to 127 and less. In future if we - * decide to increase it more than 127 then we will need more careful - * handling of nr_pages[] in struct memcg_stock_pcp. - */ - BUILD_BUG_ON(MEMCG_CHARGE_BATCH > S8_MAX); - - VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); - - if (nr_pages > MEMCG_CHARGE_BATCH || - !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. - */ - memcg_uncharge(memcg, nr_pages); - return; - } - - stock = this_cpu_ptr(&memcg_stock); - for (i = 0; i < NR_MEMCG_STOCK; ++i) { - cached = READ_ONCE(stock->cached[i]); - if (!cached && empty_slot == -1) - empty_slot = i; - if (memcg == READ_ONCE(stock->cached[i])) { - stock_pages = READ_ONCE(stock->nr_pages[i]) + nr_pages; - WRITE_ONCE(stock->nr_pages[i], stock_pages); - if (stock_pages > MEMCG_CHARGE_BATCH) - drain_stock(stock, i); - success = true; - break; - } - } - - if (!success) { - i = empty_slot; - if (i == -1) { - i = get_random_u32_below(NR_MEMCG_STOCK); - drain_stock(stock, i); - } - css_get(&memcg->css); - WRITE_ONCE(stock->cached[i], memcg); - WRITE_ONCE(stock->nr_pages[i], nr_pages); - } - - local_unlock(&memcg_stock.lock); -} - -static bool is_memcg_drain_needed(struct memcg_stock_pcp *stock, - struct mem_cgroup *root_memcg) -{ - struct mem_cgroup *memcg; - bool flush = false; - int i; - - rcu_read_lock(); - for (i = 0; i < NR_MEMCG_STOCK; ++i) { - memcg = READ_ONCE(stock->cached[i]); - if (!memcg) - continue; - - if (READ_ONCE(stock->nr_pages[i]) && - mem_cgroup_is_descendant(memcg, root_memcg)) { - flush = true; - break; - } - } - rcu_read_unlock(); - return flush; -} - static void schedule_drain_work(int cpu, struct work_struct *work) { /* -- 2.53.0-Meta