From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 967933911B6 for ; Tue, 23 Jun 2026 18:01:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782237696; cv=none; b=C3dwCX0+/VZEBrOU6MSiPwpTfI9HPKZL1aZMFXl1bpPOZuLUuJ4u9MsFtLN3qpp1EsO6CBXUk54pHET9FXg8PwgUG1aUho7gldons1GQJnlLTvyd4lwwsKZrZp/8qUkaB+jX+ep/eDPn4s2yNeatKcrCbxnzb/W+q38F0LNn8WQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782237696; c=relaxed/simple; bh=K6gS/X2YrKn9d5QZUeR/ZfHv71hXucHz9Qvun4pzJJg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bjiHFwQDXP6MPhQT2JFb+IgtHOlhEy4oGYaBWfJOkVQhpPBLkYmDDw0taV4QUSVoHTJiRVUD8MP3mHQguLcJ5Fso1BRIOYjMqaaYSn0S/h7SPc/qu8Vj7H23Vn+jg5/65eZqlQNWVribqnAfPh//1EpNEP08dk7MtbKmPBP5tkk= 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=MAiI6vVp; arc=none smtp.client-ip=209.85.210.50 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="MAiI6vVp" Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-7e94cd6f99aso164135a34.3 for ; Tue, 23 Jun 2026 11:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782237694; x=1782842494; 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=AV1AMv1DdRElmEAq04xArjlt0DIa0cx6rlJTbGmfpe8=; b=MAiI6vVpQWBkjEAdx7v/2j8WXva/obHQXBOGEVcQ69Vpvnj0HPaZ7exGqRSGcyWuPK lm8EC+QoQ8b0s52oBY/YrTkFi2aIRWDcUydTFCJhuMfnXtx/F5ADPoozfSJqV8RVUnP2 QYU40uF3CxtXUOK8peD6X1up3WBy1uGtusvZ8A552ApK+LE486nG2REkdOdQUZ1cd3HV ncUW8fxpS8gcnJsC+kOB01gH+zKvrPiqX4ZHm4roCqdWcK5f9lsjYi7j9xKz08vNSQKs z0xPuEL3MRHnDbnnXih1v9FcMAd6AVyfOqSjEAq7wZPxLd+voNVxhrM0j+vX1Jlnrcrf DDSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782237694; x=1782842494; 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=AV1AMv1DdRElmEAq04xArjlt0DIa0cx6rlJTbGmfpe8=; b=pQe64jQ/cQPAvolkvY4xgxuHThxJWBxSyBLHDC5qzYEdpveMhGA96mJ2lJk+vblW+3 G1Aeuxphd9nTMawx1nAA9Kd2Kcmq0cbJ4V0tk8wRBhCyuOpqEdcTy894abDr8mhEAUhY S1Xwi0sXu15t9NIrwAIhmhJEouXBFsiUkjCOdPNubspbXWasdO8Im79A8D+x2k7Vdakz t1EAwVYarY6uOAQ9WNsEulNolhi4CEBYyByOKSMXXJqnps5DF3186lMcmRGSTsDW+Mwd iXSyhQ7wMREbJ772rH9e+m45nYqpy1YM7cfq2nKnCUeJZC2FlP11pGV57esT2KkPiOsm 16nw== X-Forwarded-Encrypted: i=1; AFNElJ8uPG+4MaMuaTxdeYUIhNpvmBF+dB0w51pWNUzteavf+eaWOX3c3ITz3mqh7NX0WoLRN2ZKQu9OUm5flzo=@vger.kernel.org X-Gm-Message-State: AOJu0YxJUZ0EJQNgH9FihzB/Wo8iZa3qGLgJgNzoOYGuTYB4nkfbx/u5 IISvPLgMg6LO9d4SsCOmaz79Q4Xbp4g+BgF0eViSPJzpd1hbz5xS7vyg X-Gm-Gg: AfdE7cld75ZsV0gPSfoi16odt2qVA72UFf5Ekwauv5iiWVdmGdJGlvIp696GncWS0J5 ooZC5x+j6cO2yuu0+rE/P4qqV3fLIS9GvatO1TfvX9eM+kztUFt74Y1wxEFcb5FrqPfj06fjXPj hvGXHOrFAw2h6GD0YTkdTEIsmcrYtnfmKILxgbaTMPMtpWDg4bcOG2V8MusN+YSUBTGGP4xkSbi 5pGVY6mIzLwbwPRfQFmEzLl/r31LYGKeiiaKCYzXqOvBJh69n3Ekk7omyIl7z+YjdBl6jT/flT+ 6tszX6g2hBu/+wWwbPaKkAno0jcedGCKlkB+BYAYwUwJL4kdmqFKupVEnEakf84OrD6I32MVa8h iI0ZGry2elV1aMOaYDPlOJhzvdje7cQfbEJapoZdwSTggJUjl1asz1B6YUznPFd6R2owWg/3M0h IrzdlnqHo/nq2A0JxKlQfSk3y3lMg2EwTM76hX8H2+hQ== X-Received: by 2002:a05:6830:7109:b0:7dc:c7aa:22d4 with SMTP id 46e09a7af769-7e9867c537fmr179348a34.1.1782237692753; Tue, 23 Jun 2026 11:01:32 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:c::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e944296d7asm9374720a34.19.2026.06.23.11.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 11:01:32 -0700 (PDT) From: Joshua Hahn To: Johannes Weiner , Michal Hocko Cc: Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v4 5/5] mm/memcontrol: remove unused memcg_stock code Date: Tue, 23 Jun 2026 11:01:23 -0700 Message-ID: <20260623180124.868655-6-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260623180124.868655-1-joshua.hahnjy@gmail.com> References: <20260623180124.868655-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@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 | 186 ------------------------------------------------ 1 file changed, 186 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 846800917af49..762fb8914c308 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1998,25 +1998,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; - uint8_t drain_idx; -}; - -static DEFINE_PER_CPU_ALIGNED(struct memcg_stock_pcp, memcg_stock) = { - .lock = INIT_LOCAL_TRYLOCK(lock), -}; /* * NR_OBJ_STOCK is sized so the entire hot path of obj_stock_pcp @@ -2065,47 +2047,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); @@ -2113,51 +2054,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; @@ -2174,88 +2070,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 = stock->drain_idx++; - if (stock->drain_idx == NR_MEMCG_STOCK) - stock->drain_idx = 0; - 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