Skip to contentSkip to conversation

mm/vmscan: fix uninitialized variable in demote_folio_list()

PATCH In review Bing Jiao 2 participants 5 messages Jan 9 – Jan 10

Subsystems (3)
lore
Share & tools
lore

Bing Jiao

author
#0 lore raw

PATCH 1/1 mm/vmscan: fix uninitialized variable in demote_folio_list()

Commit d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()") refactored the selection logic for demotion target nodes. However, it removed the initial assignment of 'target_nid' while leaving a premature check for 'NUMA_NO_NODE' in place.

Since 'target_nid' is now assigned further down in the function based on preferred and allowed node masks, the initial check at line 1046 is redundant.

Remove the redundant check to resolve the compiler warning.

Fixes d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()")
---
 mm/vmscan.c | 4 ----
 1 file changed, 4 deletions(-)
mm/vmscan.c +0 -4
index 213ee75b3306..590ab3ec1998 100644
@@ -1044,10 +1044,6 @@ static unsigned int demote_folio_list(struct list_head *demote_folios,
 	if (list_empty(demote_folios))
 		return 0;
 
-	if (target_nid == NUMA_NO_NODE)
-		/* No lower-tier nodes or nodes were hot-unplugged. */
-		return 0;
-
 	node_get_allowed_targets(pgdat, &allowed_mask);
 	mem_cgroup_node_filter_allowed(memcg, &allowed_mask);
 	if (nodes_empty(allowed_mask))

--
2.52.0.457.g6b5491de43-goog

author
#1 lore raw

PATCH 1/1 mm/vmscan: fix uninitialized variable in demote_folio_list()

Commit d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()") refactored the selection logic for demotion target nodes. However, it removed the initial assignment of 'target_nid' while leaving a premature check for 'NUMA_NO_NODE' in place.

Since 'target_nid' is now assigned further down in the function based on preferred and allowed node masks, the initial check at line 1046 is redundant.

Remove the redundant check to resolve the compiler warning.

Fixes d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()")
---
 mm/vmscan.c | 4 ----
 1 file changed, 4 deletions(-)
mm/vmscan.c +0 -4
index 213ee75b3306..590ab3ec1998 100644
@@ -1044,10 +1044,6 @@ static unsigned int demote_folio_list(struct list_head *demote_folios,
 	if (list_empty(demote_folios))
 		return 0;
 
-	if (target_nid == NUMA_NO_NODE)
-		/* No lower-tier nodes or nodes were hot-unplugged. */
-		return 0;
-
 	node_get_allowed_targets(pgdat, &allowed_mask);
 	mem_cgroup_node_filter_allowed(memcg, &allowed_mask);
 	if (nodes_empty(allowed_mask))

--
2.52.0.457.g6b5491de43-goog

author
#2 lore raw
Quoted 25 lines · Bing Jiao

Commit d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()") refactored the selection logic for demotion target nodes. However, it removed the initial assignment of 'target_nid' while leaving a premature check for 'NUMA_NO_NODE' in place.

Since 'target_nid' is now assigned further down in the function based on preferred and allowed node masks, the initial check at line 1046 is redundant.

Remove the redundant check to resolve the compiler warning.

Fixes d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()")
---
 mm/vmscan.c | 4 ----
 1 file changed, 4 deletions(-)
mm/vmscan.c +0 -0
index 213ee75b3306..590ab3ec1998 100644
@@ -1044,10 +1044,6 @@ static unsigned int demote_folio_list(struct list_head *demote_folios,
 	if (list_empty(demote_folios))

mm/vmscan.c static unsigned int demote_folio_list(struct list_head *demote_folios,

Quoted 10 lines
mm/vmscan.c +0 -5
 		return 0;
 
-	if (target_nid == NUMA_NO_NODE)
-		/* No lower-tier nodes or nodes were hot-unplugged. */
-		return 0;
-
 	node_get_allowed_targets(pgdat, &allowed_mask);
 	mem_cgroup_node_filter_allowed(memcg, &allowed_mask);
 	if (nodes_empty(allowed_mask))
--

Hi Andrew,

Sorry for bother you again in my patch series.

The fix is a simple removal of a redundant, premature check that was using 'target_nid' before its new initialization point, which is reported by the kernel test.

I am not sure whether it is a good idead to send a standalone patch to fix it. Maybe it is likely easier to process.
However, if you would like replace the series Commit d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()") entirely to keep the versioning consistent, I can send an v8 version.

Thanks for your time on this patch series.

Best regards,
Bing Jiao

Reviewed-by on v1 1/1
#3 lore raw
In reply to Bing Jiao
Quoted 9 lines · On Fri, 9 Jan 2026 05:59:37 +0000 Bing Jiao <[email protected]> wrote:

Commit d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()") refactored the selection logic for demotion target nodes. However, it removed the initial assignment of 'target_nid' while leaving a premature check for 'NUMA_NO_NODE' in place.

Since 'target_nid' is now assigned further down in the function based on preferred and allowed node masks, the initial check at line 1046 is redundant.

Quoted 5 lines

Remove the redundant check to resolve the compiler warning.

Fixes d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()")

Seems the broken commit is on mm-new, and therefore no need to Cc stable@. I think explicitly clarifying that would be nice. Also, as this fixup may need to be squashed into the broken commit before it is pulled into the mainline, sending this kind of fixup as a reply to the patch mail [1] of the commit would also be nice, and usual in mm.

[1] https://lkml.kernel.org/r/[email protected]

Quoted 1 line

Thanks,
SJ

[...]

author
#4 lore raw
Quoted 27 lines · SeongJae Park
Quoted 9 lines · On Fri, 9 Jan 2026 05:59:37 +0000 Bing Jiao <[email protected]> wrote:

Commit d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()") refactored the selection logic for demotion target nodes. However, it removed the initial assignment of 'target_nid' while leaving a premature check for 'NUMA_NO_NODE' in place.

Since 'target_nid' is now assigned further down in the function based on preferred and allowed node masks, the initial check at line 1046 is redundant.

Quoted 5 lines

Remove the redundant check to resolve the compiler warning.

Fixes d92027a5f30a6c ("mm/vmscan: select the closest preferred node in demote_folio_list()")

Seems the broken commit is on mm-new, and therefore no need to Cc stable@. I think explicitly clarifying that would be nice. Also, as this fixup may need to be squashed into the broken commit before it is pulled into the mainline, sending this kind of fixup as a reply to the patch mail [1] of the commit would also be nice, and usual in mm.

[1] https://lkml.kernel.org/r/[email protected]

Quoted 1 line
Quoted 7 lines

Thanks,
SJ

[...]

Hi SeongJae,

Thank you for the review and suggestions! The patch has sent to the patch mail you mentioned.

Have a great weekend!

Best regards,
Bing