From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 1224F339714 for ; Mon, 19 Jan 2026 08:00:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768809607; cv=none; b=JVZdKDEdShHvQyeH533L1+B+XFs4wfRScf+k7kFI3C8YXbY3H8l2tBqtCmrtMrgsxzjpmVFlKKWtHfwbuMXzl9NjTAE3hUemWnXDtaYmttU/8DxiIFU4jrys+xeIRnF1vO+mZ3bRph4NeLA/5uW5j9vDwbgo166Vg9r6kuCWiR4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768809607; c=relaxed/simple; bh=ahB5PXkdKz+OudhXzR5+oJxcANGL1gzgulL++hExJ1Q=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=h1YXpBAjc1ha9kgx0yFiCniF2VrE029u44hV7O0mP/f9T+dAnY8fC6JOs4BD/ob26tInHEnb3ByXjShJ4z3UI39YAwyhsw6mAvpZP83PbOLL51oe/SKW66mwnRiYJAkiMHZSOqMk+3UErOQCfiWAGJkGEaEQZPzNo5WIzQxG8W8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=AvcfNyGP; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="AvcfNyGP" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-47d63594f7eso26602445e9.0 for ; Mon, 19 Jan 2026 00:00:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1768809604; x=1769414404; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=jye8WAd/vE4qqlECAOAdbFTMAIss/HS1MRQD2Sijk8A=; b=AvcfNyGPm4IhUqxYjIaKPc/mq/v54+N76WpR82ftvLOzy0sbvHhoB1C0enIBEsLYvG wNySXbHwoqQAF+y5upOCbzI0WUUcGGN7iC301Oc4slHPgW3/hobI8FPrxoqHbgwjobLS hTVeqZ0hYhgJ5F3G91ZIX+xAbSuJNGTzjFLLnVP/NB04MYo72JqWYV6Osxb882CSeFu5 B4qsrvQ3o9ZiSTKX7Kj+9nxld0oqk+UNegHbV70uFYHHC+tLV0s+zysHhhkV+9bvRHyi 3csfVIWb5m++E5qjINFxDpM8ajjsdSKx8faxJaKIRDsqGrwP9BAK4mkzxmUJ08Xr2umQ A2hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768809604; x=1769414404; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jye8WAd/vE4qqlECAOAdbFTMAIss/HS1MRQD2Sijk8A=; b=KSPRnmys7GQ153/ukL54xk9ePAZOrXLyWByvhuDD1/cS9l60NxT62+J2NTVdZSfl7o lG6is3+Ccl/HrZo69F8wTG94zmi8LyhJm+pBgu/tFUTd6oqrCNPHSrwIQAt29YGAqGX8 Oo20x949TAoWp51kwGU5LrTpGwNefyFpoydyMtukB8jAZbSSfhwzE5f2TD9eDkNHNs7Y zBwx/RSHqaYeT7NabpwyTQu5IQhNc88bRgDhIskF4A1EGWIW9sbc2InEFlQ7cFjrycrZ dmFcHI7TM1MF4XyB512dqh/mP0yaRDCs8QrIovbtfegdr4L+hXWJbl7Fp8RidjugT5E3 v//w== X-Forwarded-Encrypted: i=1; AJvYcCUe2D+pNCGHXdaic6Aglx1ywxTtHUuU1paGueni4WueCIlOEHGaG8pPRvADLSYopMpaYQuloEY05GmBi9w=@vger.kernel.org X-Gm-Message-State: AOJu0YynGiQGl5DJY6kK3drN+Ve0H5tXuSSpRizlj7XTYSSRbqnWVSlW 5KmGz2OfdK6mvSaP7t7OkgrO9B96O87yzkRb83C9TL3zwzWyM4jfj9+NLpAOnoZNtYQ= X-Gm-Gg: AY/fxX7J1e4Ofd/cVv/UMvH/f9TFq+bUxP43982Nz/5fHslf595qn0pYBef7s5RAk+r P9DLvF71eyXZn/gUBg9RQHQsIOlobWUY5ZRr+hjrhGZxsGEQG2NAkIa8vvBgar6SZTkHzWnDBAB /P4ycTsF4N9Bovo7uEdHyOIWd3aRwFdHeLo2rX3ukrjTF8R/gOfwWRdC8WuEip68cZgaiLiZbFm yYGfd7i1fsHDq6wXOaCNS8dt1RMbW3BQNVuDYaDnS13hfU6kTWh9rWQecbs+jE/A2YGH0xg40zn Ir6aqaoeaMeLSpIv0/5epqRXbSpf9v7Z17A8RVClqulvqyKpjry+7MmTQFI6GIdY1QGJtcKvzW8 S1fhnTPnwhhT6FkPVBDlbqwn11+6d4KWxKCA0gkF+eq63QPNqfOMdrgHgYwHm2/Kh+lnuMREoRt MjsWWxKHlVjN+CS4zZ0cBZg5dV X-Received: by 2002:a05:600c:3b90:b0:477:9392:8557 with SMTP id 5b1f17b1804b1-4801e33a93amr121328725e9.18.1768809604358; Mon, 19 Jan 2026 00:00:04 -0800 (PST) Received: from localhost (109-81-91-169.rct.o2.cz. [109.81.91.169]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4356997eb2asm21670271f8f.37.2026.01.19.00.00.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 00:00:03 -0800 (PST) Date: Mon, 19 Jan 2026 09:00:02 +0100 From: Michal Hocko To: Yosry Ahmed Cc: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Johannes Weiner , Qi Zheng , Shakeel Butt , Davidlohr Bueso , linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] mm: Restore per-memcg proactive reclaim with !CONFIG_NUMA Message-ID: References: <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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260116205247.928004-1-yosry.ahmed@linux.dev> On Fri 16-01-26 20:52:47, Yosry Ahmed wrote: > 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 Ouch. Acked-by: Michal Hocko Thanks for catching that up. > --- > 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 > > /* > * 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 gfp_mask, unsigned int order) > return ret; > } > > +#else > + > +static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, > + unsigned long nr_pages, > + struct scan_control *sc) > +{ > + return 0; > +} > + > +#endif > + > enum { > MEMORY_RECLAIM_SWAPPINESS = 0, > MEMORY_RECLAIM_SWAPPINESS_MAX, > @@ -7956,8 +7967,6 @@ int user_proactive_reclaim(char *buf, > return 0; > } > > -#endif > - > /** > * check_move_unevictable_folios - Move evictable folios to appropriate zone > * lru list > -- > 2.52.0.457.g6b5491de43-goog -- Michal Hocko SUSE Labs