From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.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 46F453F4DCF for ; Thu, 11 Jun 2026 12:45:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781181911; cv=none; b=oIyUB2XL3IrS/9FgV34Z8xCGoEPm4gkY71eUf9YAV94R3P1mljID4E5QA8uCnog3j5bOdjc2gU9WL/HVjdDIKzI12xj69G0nCt8pWrQJSA3vQUOwCrpUCi9eemlBk+wOhCt3WdLhpj9BAmme1uKhmH54Chp135bFOfrEe1jhqwU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781181911; c=relaxed/simple; bh=HXaSIjgf3IGECE80uum2YUbT/MSnGtCyjeTHIwUKVlY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qWLdWplvrryCfE03LYDNG34lIBzS6wCzRRbhTNZKFz7s2u/X6bGq228X27vRsT5IIoWDB8ToONv58s9kHrzK1tGoRMfooxl1StOpE+eE2fiVxoToi9ztVhS0yQaExT/L4FLmH1QpYgo73f9vlcT7U+YO47H2x1SG9UAVIeJq0l8= 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=KjxVhhhN; arc=none smtp.client-ip=209.85.128.41 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="KjxVhhhN" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490b1aefe1cso7521265e9.2 for ; Thu, 11 Jun 2026 05:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1781181907; x=1781786707; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kyOfgVu5yfwDz8MkBg/Q9OinVX8qNXoGt73ReB+mpZo=; b=KjxVhhhNuq+8aOVV3aoMGUrGxjzTSVhC3iRbHnOKQqGBe/fyBE2Tf8vG3pkqI7huFV ZAhcsXUAR36hzfGIEz6HZ86XKageJMEczN9lI+eFNshzjeFpSaHzOHv16pqslQRu2smw DDOI5xp+zIr8MhVjD3tFV5M0E+9azs8XxRGNE7MHcyqM35tXC78GCNKhwfelW4Popx7g 3pgxcM5Yj3FksCCIb7gIS5mSKevaBIfrJ8xnRcRKozc1H75IgFH8+wxRc27Uwuo2jpMq qgn9kyllppcwwmOqWsT8RhxuH1fEvblpI5+/ZbsirfbqwlHZZkd+mw/IpxHRR9VS6Edf n1BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781181907; x=1781786707; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kyOfgVu5yfwDz8MkBg/Q9OinVX8qNXoGt73ReB+mpZo=; b=fdLP5mP5AwUzfJHS2ZQLeYyHKBJgrhsIQuyZWHFDNbnMDv1deKOOjTgQpXC66f1uOy n46r2bT8fu/1w8V7MJyajCITri6NDZn7h71ngnQ7JbpE3zI4WSBRESzRzszVtLpArtLp x8qcXrL4ugjrKDFEqpzWbM2s6eBEuFkxcS1DIV/yyGDSXl8+tTSzXX4ef66iOdWbPL64 QDZMxCYQwFxJu/uXJOvw8OprSjwJcfDpj0Q6hVJb6Kh0VZi/BneTffn6Xj1tnhIWaI/P jNDibidiUcJcY+jNKwaHt28g97kD/bqarUYOd2Md0oLhN0r2dGTiLQiNeSdDIdUfB1AO XZNg== X-Forwarded-Encrypted: i=1; AFNElJ+I83C5GYFlqlfmpnrWDjUkHfpboEv8WEGJicI8oqr/vVOMdD5HqXPFp+B319pq/MP6e8e2aLVG1b/RwDg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5qg5Bg9obEw2Qm0xGBgopZmYzeyjEzjWdur59tgimiS4t8oeS v3v7shisMvZaIeZrAPpnQrFMTxzHk/+MdB9zcJlv1RiMc35y01Y5vX+MjghJ3Tw2IyE= X-Gm-Gg: Acq92OFx3wogrQhVbf/v/ZVD+4WG3mCZ3XFe8CB3yiM/Gk01IdQE7Wes4CUFrKbQJlO y8BKUoHt4e//CO3JWl0j5v+tODXbrqATaiYrJWo05xzHJa4xA0eFGyk8k1qGoWq9p8YLztGh/7B Xsw4AxIFutppLZVSSdweJWg0177cwZ0xyIPOnXfuLaMhiGh4q0iCfmLN+VDb9tG3CGqHl69QFQg PPKxsZaQStRZ1JAWHH7hVcAsWizLwXZwrOoIuKNy9uTVh9aJ5TWOh+8NjpeBQt7FsB+0jsjxu7R uyIsei0lSYFIbtXe1zpbsKKRTJbhe7loy5azXMs6BxxCTvLHAGE7Cdn6CZhazCc28FP4Ldoyuo4 vGxKiqJxCvLzY93G/UehFi+KDbwPBqRTknoW8RvUj/7zqSl1Qz5PcdAQy+TALp5G50oMzHDOKD4 K3/8zDLxnpzSZ07glwU493ZBBbvDVwqr3HYbvr33DXmU3DDrwYrykhfOM8F9tfNJ5zrvPAM/e5b okGUxSM+iCwSiH55ysYZJV2P7Lj X-Received: by 2002:a05:600c:8b31:b0:48d:1021:e5d1 with SMTP id 5b1f17b1804b1-490e562484fmr14944255e9.3.1781181907493; Thu, 11 Jun 2026 05:45:07 -0700 (PDT) Received: from localhost (dynamic-2a00-1028-83b8-1e7a-3010-3bd6-8521-caf1.ipv6.o2.cz. [2a00:1028:83b8:1e7a:3010:3bd6:8521:caf1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490e44ba907sm50385245e9.1.2026.06.11.05.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 05:45:07 -0700 (PDT) From: Petr Tesarik To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , linux-mm@kvack.org Cc: Brendan Jackman , Johannes Weiner , Zi Yan , linux-kernel@vger.kernel.org, Petr Tesarik Subject: [PATCH 1/1] mm: remove NODE_RECLAIM_xxx macros Date: Thu, 11 Jun 2026 14:45:01 +0200 Message-ID: <20260611124501.1465806-1-ptesarik@suse.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Change node_reclaim() to return a bool indicating whether any pages have been reclaimed, because that's the only information needed by the only caller, get_page_from_freelist(). Originally, I wanted to convert the preprocessor macros to an enum, but I couldn't find any explicit use of NODE_RECLAIM_SOME and NODE_RECLAIM_SUCCESS. That's because they are typecast from a bool. This seemed a bit fragile, so I dug a bit deeper and came up with this proposed cleanup. Signed-off-by: Petr Tesarik --- mm/internal.h | 12 ++++-------- mm/page_alloc.c | 19 ++++--------------- mm/vmscan.c | 18 +++++++++--------- 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 181e79f1d6a20..6e09157a97692 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1373,23 +1373,19 @@ static inline void mminit_verify_zonelist(void) } #endif /* CONFIG_DEBUG_MEMORY_INIT */ -#define NODE_RECLAIM_NOSCAN -2 -#define NODE_RECLAIM_FULL -1 -#define NODE_RECLAIM_SOME 0 -#define NODE_RECLAIM_SUCCESS 1 - #ifdef CONFIG_NUMA extern int node_reclaim_mode; -extern int node_reclaim(struct pglist_data *, gfp_t, unsigned int); +extern bool node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, + unsigned int order); extern int find_next_best_node(int node, nodemask_t *used_node_mask); #else #define node_reclaim_mode 0 -static inline int node_reclaim(struct pglist_data *pgdat, gfp_t mask, +static inline bool node_reclaim(struct pglist_data *pgdat, gfp_t mask, unsigned int order) { - return NODE_RECLAIM_NOSCAN; + return false; } static inline int find_next_best_node(int node, nodemask_t *used_node_mask) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f7db8f049bd23..9db7eaa7091c9 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3899,8 +3899,6 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, if (!zone_watermark_fast(zone, order, mark, ac->highest_zoneidx, alloc_flags, gfp_mask)) { - int ret; - if (cond_accept_memory(zone, order, alloc_flags)) goto try_this_zone; @@ -3921,22 +3919,13 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, !zone_allows_reclaim(zonelist_zone(ac->preferred_zoneref), zone)) continue; - ret = node_reclaim(zone->zone_pgdat, gfp_mask, order); - switch (ret) { - case NODE_RECLAIM_NOSCAN: - /* did not scan */ - continue; - case NODE_RECLAIM_FULL: - /* scanned but unreclaimable */ + if (!node_reclaim(zone->zone_pgdat, gfp_mask, order)) continue; - default: - /* did we reclaim enough */ - if (zone_watermark_ok(zone, order, mark, - ac->highest_zoneidx, alloc_flags)) - goto try_this_zone; + /* did we reclaim enough */ + if (!zone_watermark_ok(zone, order, mark, + ac->highest_zoneidx, alloc_flags)) continue; - } } try_this_zone: diff --git a/mm/vmscan.c b/mm/vmscan.c index 3f3ff25e561ac..64f6b649eeac1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -7786,9 +7786,9 @@ static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, return sc->nr_reclaimed; } -int node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, unsigned int order) +bool node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, unsigned int order) { - int ret; + unsigned long nr_reclaimed; /* Minimum pages needed in order to stay on node */ const unsigned long nr_pages = 1 << order; struct scan_control sc = { @@ -7815,13 +7815,13 @@ int node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, unsigned int order) if (node_pagecache_reclaimable(pgdat) <= pgdat->min_unmapped_pages && node_page_state_pages(pgdat, NR_SLAB_RECLAIMABLE_B) <= pgdat->min_slab_pages) - return NODE_RECLAIM_FULL; + return false; /* * Do not scan if the allocation should not be delayed. */ if (!gfpflags_allow_blocking(gfp_mask) || (current->flags & PF_MEMALLOC)) - return NODE_RECLAIM_NOSCAN; + return false; /* * Only run node reclaim on the local node or on nodes that do not @@ -7830,20 +7830,20 @@ int node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, unsigned int order) * as wide as possible. */ if (node_state(pgdat->node_id, N_CPU) && pgdat->node_id != numa_node_id()) - return NODE_RECLAIM_NOSCAN; + return false; if (test_and_set_bit_lock(PGDAT_RECLAIM_LOCKED, &pgdat->flags)) - return NODE_RECLAIM_NOSCAN; + return false; - ret = __node_reclaim(pgdat, gfp_mask, nr_pages, &sc) >= nr_pages; + nr_reclaimed = __node_reclaim(pgdat, gfp_mask, nr_pages, &sc); clear_bit_unlock(PGDAT_RECLAIM_LOCKED, &pgdat->flags); - if (ret) + if (nr_reclaimed >= nr_pages) count_vm_event(PGSCAN_ZONE_RECLAIM_SUCCESS); else count_vm_event(PGSCAN_ZONE_RECLAIM_FAILED); - return ret; + return true; } #else -- 2.54.0