From nobody Sat Feb 7 21:24:05 2026 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29BAE1799F for ; Fri, 16 Jan 2026 20:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768596799; cv=none; b=RQQ4n7OY3lSgxHQmq/1McS/jF570vw4HgmiyqJLZE6Uir7uZjYxv4+5h+j/FQwek9IizzOArAbIx5uAroCAfntoHGPDM3vx16c+TmhQintW3askoSo9Bo/ptPR2e1WqF8Ukd9vuflB7KlzKIIywi76Qgik3aQ/NFwoQqwqKTu2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768596799; c=relaxed/simple; bh=cihrYZNRdjJIuXr0piHB7e8pdjojNx9Q3HggmsK01AY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=In2DNp89Lolx2ZUf7U5NtKPrvstaAnXi76PkpDHV+thF9ewONZMmFAVd0FGh+cKZUyWe7AYqV91uaLNfiy0tV7NjnRwB8RyXCSVbZs/PNyAQynsWpwuuw+5snHat/blyhYXXSz+desdt1pkXJInvfHoyrIlkeMn2lAG1MmZQkYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=kcHkbaNO; arc=none smtp.client-ip=95.215.58.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="kcHkbaNO" 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=1768596786; 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; bh=tfmijTxxqbRMuICsoRtTverNeZ8jwLHJm8kbNLNJYC4=; b=kcHkbaNOCn+GafJjIS7kkYKMxNb3mCgXzXJr/82xwYjAxL6ENTLg3HG5Jl53QiozqjlgTK J87kA9WkOkTx+qirmSaM/Bn4RTxWN+XmXZeJxqpOnVc6dAO9enpaEmrRvQ085bBEWR7q9p 5S06TvUh7TM4SJhuaPDbnA7kmaXWf2o= From: Yosry Ahmed To: Andrew Morton Cc: David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Qi Zheng , Shakeel Butt , Davidlohr Bueso , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yosry Ahmed , stable@vger.kernel.org Subject: [PATCH] mm: Restore per-memcg proactive reclaim with !CONFIG_NUMA Date: Fri, 16 Jan 2026 20:52:47 +0000 Message-ID: <20260116205247.928004-1-yosry.ahmed@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Commit 2b7226af730c ("mm/memcg: make memory.reclaim interface generic") moved proactive reclaim logic from memory.reclaim handler to a generic user_proactive_reclaim() helper to be used for per-node proactive reclaim. However, user_proactive_reclaim() was only defined under CONFIG_NUMA, with a stub always returning 0 otherwise. This broke memory.reclaim on !CONFIG_NUMA configs, causing it to report success without actually attempting reclaim. Move the definition of user_proactive_reclaim() outside CONFIG_NUMA, and instead define a stub for __node_reclaim() in the !CONFIG_NUMA case. __node_reclaim() is only called from user_proactive_reclaim() when a write is made to sys/devices/system/node/nodeX/reclaim, which is only defined with CONFIG_NUMA. Fixes: 2b7226af730c ("mm/memcg: make memory.reclaim interface generic") Cc: stable@vger.kernel.org Signed-off-by: Yosry Ahmed Acked-by: Michal Hocko Acked-by: Shakeel Butt --- mm/internal.h | 8 -------- mm/vmscan.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 33eb0224f461..9508dbaf47cd 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -615,16 +615,8 @@ extern unsigned long highest_memmap_pfn; bool folio_isolate_lru(struct folio *folio); void folio_putback_lru(struct folio *folio); extern void reclaim_throttle(pg_data_t *pgdat, enum vmscan_throttle_state = reason); -#ifdef CONFIG_NUMA int user_proactive_reclaim(char *buf, struct mem_cgroup *memcg, pg_data_t *pgdat); -#else -static inline int user_proactive_reclaim(char *buf, - struct mem_cgroup *memcg, pg_data_t *pgdat) -{ - return 0; -} -#endif =20 /* * in mm/rmap.c: diff --git a/mm/vmscan.c b/mm/vmscan.c index 7b28018ac995..d9918f24dea0 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -7849,6 +7849,17 @@ int node_reclaim(struct pglist_data *pgdat, gfp_t gf= p_mask, unsigned int order) return ret; } =20 +#else + +static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_m= ask, + unsigned long nr_pages, + struct scan_control *sc) +{ + return 0; +} + +#endif + enum { MEMORY_RECLAIM_SWAPPINESS =3D 0, MEMORY_RECLAIM_SWAPPINESS_MAX, @@ -7956,8 +7967,6 @@ int user_proactive_reclaim(char *buf, return 0; } =20 -#endif - /** * check_move_unevictable_folios - Move evictable folios to appropriate zo= ne * lru list --=20 2.52.0.457.g6b5491de43-goog