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 C37E33955DA for ; Fri, 22 May 2026 22:06:37 +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=1779487599; cv=none; b=tcTqiIuvbH/Gxd65diKDusqWz4Q6Q5KKqCB/k1mpo+P7SgUxNkup6uYfWbFIP8J9PvJloAUIFctt3ZnCQlGnQ9xcA5ZOvEJaK6X91wAM0C0UR7F4dZjtVlBMsoumg20VgoAitQhWzzHx+7whpmsb+nWGBZFrw+snVZPn0MuoURA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779487599; c=relaxed/simple; bh=bTlx5xfQqrhQmXD9/D84ZEOgc8v5KD0QPZ0MqCBJAak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=URfbGjdjP/eotfEPEX5z0IDTdyyExwvMx2PEJCwv8RMp3sdZ+RG9uUJP6liqDxQ5oWwM8K8BC5A1PiCmeVSd77gST1wEI6J3CXBXvHSWyjPQPG0kh3/4gvl8Y7KqJPyVhKeJHxlJIeZJuCkuXKzBZBrW/yv4f0VyS2Pwj85R608= 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=mxPSIi/4; 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="mxPSIi/4" Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-43496e6a964so5686366fac.2 for ; Fri, 22 May 2026 15:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779487597; x=1780092397; 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=mxPSIi/4k6JBre2aaBdze56tkWq+g26v7BlVrm0H6xbeMR4bRznxIzK0F7063CXFKj lOXzJGoUAZ3ztiwqUCY2r2OrsMqz88byrw9WUPRnH7Qo6UyAnSuXR/Q/U1Iy0Nkgw8hP 178zCqh9J7aLXP4x1OFnUuoc8SI6cAG/A3SB1b8ROpweLWNJ/ktLxeDTNGGrI8koZO6v l+OAGCzy0nH+04vgnDmiTDW4YPS/Wlyxoc6MC80LK0ttBkDCblracVSrAgznpRQ8qLMc M3U8YCj5UqI5GX7XCiC9QMCjfRE2Ba4bj+ES0zeoeRcFGpDaE6GIeazWXSZvNE6KyuoS fOfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779487597; x=1780092397; 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=PpQJ48OJcPDobDr1mT37vdYQk/+kKns1zYo3I+QK4RMPWioTYg4hLBwswuC2n/7pL4 tA3YcSlHBImYTYQ+H1LznJRbyVC6RZdX5VmS4S72u5VG0zPu+NxpOzRvMPhO4Tr6cDoM f+wTHhkZwbMWx+xDKyF5xBP3iwGzwa0+EdSk4BrzDUm5fwXYdSAGar8WpZE2rFisRREg lfs9SgkKP9IoEhCv/T/1JAypmggVxPSMSHqIFTb+fsN4R+jCF3h7LBOujRaIjKHRbsNo 8xJWqzVeN5FUNm9/WHFC/QrAyLOtqwXiPH8LuDPrTgryrySc9pLAtUZ81OjnniZX228m eljA== X-Forwarded-Encrypted: i=1; AFNElJ8Isy7FhF2MyMmmGD+TsW/r5sGsZicrNCJUzkeBzf+PQQl7FQvGu02SlvvL9yLx48aDGbzIWHu98pPrDJQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyg7UvUu4vTSX7rXRlTOHfmIJZrCSYvqWamfHUpZFQyeqApoiTI hY+tM8+6AdEgKiiGUn/RNBgEijV+LdPegVt91t3xed75co7wsdTY17gz X-Gm-Gg: Acq92OHoVW82gJNI5qCZp/hrrb50n3jl3aBtgaqXfDh9xF4jjpTdFjfQdiqWFOIvYLF VudwHVSL79LfggWBiA+hP7lb9keLuX0XEDN0tJ0Y40dYycSczEpnD0S8kMPPUSXvFFt0UPCo3+p JRSOWt98ZOfn74KIwzDubqpFmGFyAPkQrlJF2w+aDMGToUpfJmgTEMXEl95+kA10VnsJzMb+gRD lSBWzwXV+H9mvmmxOurDIRhxDT2x9zW8BT1sxOmBqEwfIs9mZnKxsVP1iGWrPv1yDNcU/SP4pDm FKgbSfzqntwAMCnV3w6IUIwLQzkdHTXb4DS1mnLgksXW2VDHTCcac+Jf5ecNzjbrcVJVZ47TEg/ 1oKVdcstvOmqMJWxX4m72nDPNnxC9ESlihikJ7DSuEL+qoPk7xajQBAg4Kx65rlb7IFjbbKzKAx klv4iAZLLultZDlqeUOZvVsJboquS5CDfxRAdQlBoryHd0AsFKN7Lphg== X-Received: by 2002:a05:6820:1995:b0:67b:b8d0:a7d5 with SMTP id 006d021491bc7-69d7ecb113emr2975215eaf.53.1779487596841; Fri, 22 May 2026 15:06:36 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:54::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-69d83709124sm1455347eaf.5.2026.05.22.15.06.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 15:06:35 -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 v2] mm/page_counter: introduce stock drain APIs Date: Fri, 22 May 2026 15:06:21 -0700 Message-ID: <20260522220627.1150804-4-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: 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