From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) (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 D21C338656C for ; Mon, 25 May 2026 19:05:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779735906; cv=none; b=WlEaCzfBYKaypZyqLcnqHq9UIUOnXhJLGvOeamJnyjSgpK28s1oQF3CdcKND5Y8n4mTLVI6SVZdMG85UAtivwp0qwhl3qvQckmfa74IDg+1LsL6+6juImVW6sXbTD+kLxDR91VShWBORIEYAShx2CTu9JGiygXzAKkdnE9aNvDw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779735906; c=relaxed/simple; bh=bTlx5xfQqrhQmXD9/D84ZEOgc8v5KD0QPZ0MqCBJAak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HOPYS80mAATzyjl1zy/hTLIu1XU/BUtrRjbahVUWv1r0XRTDhjkSdZEJHTPsN6nLAzIE155x4bpAZ009WkmlM0Sjkx5vmlG/m/9Q19kHm9WR0wawqvjWQ91dUjaNZ5qpvkUZOtXHtRAhio6/1K9GcRmXG6uVfaWDiqLZU1KBveU= 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=RsOgzCmz; arc=none smtp.client-ip=209.85.210.41 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="RsOgzCmz" Received: by mail-ot1-f41.google.com with SMTP id 46e09a7af769-7e6061b3fd7so1804111a34.2 for ; Mon, 25 May 2026 12:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779735903; x=1780340703; 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=SMrn8GveLC1NdRQvZAymrZa6CvaW/GKC3sRoShkKmw8=; b=RsOgzCmz19SDcp7N2tzO7U20cJnRdApwyrwl91AREGuSiJHM2aqVBAB2OReqHdtkv3 37Fn4wzXMO+s/vkJk+7b6VBQBkd/aYqtPVFcZA3OKqpSDsBpfCD811HuIj52oyOdSvfJ 9XEaePuBwDe7m+AulLrErG6LlLx3YyhAhYPOTn2on/cavANlXTVi5B2ziJmEq0NkFuV5 zu3T/L8HV3tl3nkmCHbIshJxWukdIHUhg96SiNMMdKO/sUJgnQCdCm22+M3PLWBhCcF1 FqcH+pGrRScyW5HXkS+xmA/tA2D1EPgGcfbTX9POJu4bB+9GRq+mg7g13E6zxmW77PNl xSBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779735903; x=1780340703; 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=SMrn8GveLC1NdRQvZAymrZa6CvaW/GKC3sRoShkKmw8=; b=L3f/MiSHpSSiBy6JU0zFCzY5HL2qZRiyoy82ModuF5wyRFgRmg5kCqRbek2A3A19nV ZAo57FuVfv6BwtSYflvETJOoEBjywzohHm41PTinMRvVTRDpJDeUwNI0sDOMlSKTHtCy CYLzBBMfCKEEkC4vYCE6tqWPv1lxIxaDAyJ4fWWtnKCF0yTXIHQJOzwtVg+lMJ2MPJ6G S3Le0tFqiX+0OYJZo4lV6xXLfV1qotS+Wwf/QD9v9N3SxxABEKqsGDHK7KPAb8cvpIDI Z5Df/NRhfKReOMVQGl3hJE9mfdGYPZLUbw7/xGB+2F/jlon7Tq1t92CTBRQiXteN/C5D tlUw== X-Forwarded-Encrypted: i=1; AFNElJ8YvcfNDKQhFL75yY/aINDFH0oERu83+JMCYrPelPR8ES46X593ZOJxq/8dhOTLKG/RTiPx4GANHzQ76XA=@vger.kernel.org X-Gm-Message-State: AOJu0YxaSSm6k/aLQu2c9dYSVGHH4EhHOUWf79k/NGdB4VaB+j71MsHv QMBXBJrwK49+4kLngSDQL/TJHT5y2SiWnEBIT/LGbHbQeUOxfcGxixGl X-Gm-Gg: Acq92OH7s+TgFrcaf7hAdMfKlCxdJwjucmgeZ1MWhj2Xpbtv3h9CyQB13xQ5UH71JWW YjPLfEIcl96M3tslEq+xm7Q2U4s9q/SwrBeqxLrgMyhEAO9mOOQpz6s2YDCdGtOLeoxzlXOWSTR 6FjMk8wGguL59h6MddeWLdlibWEUAodTODhPkjkb8zryv4yjPUd7N6p25z9ostHeaVJK3Un53q/ QLg8aezY/5M3ly/pxNP73GQ6VyJ/FVWb7pVKHc5xJw5pB0zXixDhG6EUxTIjsavbBrQL86leJvx rXaj7k/n6SCb5ffn17kwIrDQHDKj8fluXgbHUWcoZX4XwoZGxcvNWQEs/58sLH79by/3nYMpJsL 8pUCpQ/YFUiFqZddXL8dYlOMVSygWkDLu0XHMbKOinQfK1tNryJfEYJqBPZOFJgP93Rb7mhGcbJ fIJx2EMWX8Dqnmaj8WTj93SBc5nG8sUsKI3xkd8FE1YEIrBnWQpUbUIw== X-Received: by 2002:a05:6830:610d:b0:7d7:c985:3a30 with SMTP id 46e09a7af769-7e5fee82ab6mr9298026a34.11.1779735903615; Mon, 25 May 2026 12:05:03 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:70::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e6065e6aabsm7915197a34.13.2026.05.25.12.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2026 12:05:03 -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 3/7 v3] mm/page_counter: introduce stock drain APIs Date: Mon, 25 May 2026 12:04:50 -0700 Message-ID: <20260525190455.2843786-4-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260525190455.2843786-1-joshua.hahnjy@gmail.com> References: <20260525190455.2843786-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 Introduce page_counter variants to replace memcg stock draining functions. page_counter_drain_stock_local() drains the stock of the local CPU, taking a local stock lock to serialize against concurrent charges. page_counter_drain_stock_cpu() does the same, but without taking a local lock. This is possible because it will only be called from the CPU hotplug path, where the CPU is dead and there cannot be any more charges. Suggested-by: Johannes Weiner Signed-off-by: Joshua Hahn --- include/linux/page_counter.h | 3 +++ mm/page_counter.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/linux/page_counter.h b/include/linux/page_counter.h index c7e3ab3356d20..ffe13224213c9 100644 --- a/include/linux/page_counter.h +++ b/include/linux/page_counter.h @@ -111,6 +111,9 @@ static inline void page_counter_reset_watermark(struct page_counter *counter) int page_counter_enable_stock(struct page_counter *counter, unsigned int batch); void page_counter_disable_stock(struct page_counter *counter); void page_counter_free_stock(struct page_counter *counter); +void page_counter_drain_stock_local(struct page_counter *counter); +void page_counter_drain_stock_cpu(struct page_counter *counter, + unsigned int cpu); #if IS_ENABLED(CONFIG_MEMCG) || IS_ENABLED(CONFIG_CGROUP_DMEM) void page_counter_calculate_protection(struct page_counter *root, diff --git a/mm/page_counter.c b/mm/page_counter.c index e002688bf7f1a..fbfe9a1b29d2e 100644 --- a/mm/page_counter.c +++ b/mm/page_counter.c @@ -389,6 +389,40 @@ void page_counter_free_stock(struct page_counter *counter) counter->stock = NULL; } +void page_counter_drain_stock_local(struct page_counter *counter) +{ + struct page_counter_stock *stock; + unsigned long nr_pages; + + if (!counter->stock) + return; + + local_lock(&counter->stock->lock); + stock = this_cpu_ptr(counter->stock); + nr_pages = stock->nr_pages; + stock->nr_pages = 0; + local_unlock(&counter->stock->lock); + + if (nr_pages) + page_counter_uncharge(counter, nr_pages); +} + +void page_counter_drain_stock_cpu(struct page_counter *counter, + unsigned int cpu) +{ + struct page_counter_stock *stock; + unsigned long nr_pages; + + if (!counter->stock) + return; + + stock = per_cpu_ptr(counter->stock, cpu); + nr_pages = stock->nr_pages; + if (nr_pages) { + stock->nr_pages = 0; + page_counter_uncharge(counter, nr_pages); + } +} #if IS_ENABLED(CONFIG_MEMCG) || IS_ENABLED(CONFIG_CGROUP_DMEM) /* -- 2.53.0-Meta