mm/mmzone: read each zoneref slot once when filtering by nodemask

__next_zones_zonelist() tests a slot's zone for NULL, then reads the
slot again to look up the zone's node. Offlining a zone's last block
rebuilds the zonelists in place, so the second read can return the
terminator:

  CPU 0                             CPU 1
  __next_zones_zonelist(nodemask)
    zonelist_zone(slot 1) = NORMAL
                                    offline_pages()
                                      build_all_zonelists()
                                        [MOVABLE, NORMAL, NULL]
                                        -> [NORMAL, NULL]
    zref_in_nodemask(slot 1)
      zone_to_nid(NULL)

Current GCC and clang merge the two reads, but nothing requires it.
With mm/mmzone.o built with -fno-inline -fno-ipa-sra, holding a
nodemask allocation between the reads while the node's last movable
block goes offline oopses every time:

  BUG: kernel NULL pointer dereference, address: 0000000000000060
  RIP: 0010:zone_to_nid+0x0/0x10
  Call Trace:
   zref_in_nodemask+0x9/0x20
   __next_zones_zonelist+0x23/0x70
   prepare_alloc_pages.constprop.0+0x16c/0x190
   __alloc_frozen_pages_noprof+0xaf/0x330

Read the slot once and test that zone. A NULL zone still ends the walk.
To achieve that, rename zref_in_nodemask() to zone_in_nodemask() and
pass a zone instead of zoneref pointer.

Fixes: 11cd8638c3 ("mm, page_alloc: remove stop_machine from build_all_zonelists")
Cc: [email protected]
Signed-off-by: Gregory Price (Meta) <[email protected]>
Reviewed-by: Vlastimil Babka (SUSE) <[email protected]>
Link: https://patch.msgid.link/[email protected]
Reviewed-by: Zi Yan <[email protected]>
Signed-off-by: Vlastimil Babka (SUSE) <[email protected]>
This commit is contained in:
Gregory Price (Meta)
2026-11-05 10:58:52 +01:00
committed by Vlastimil Babka (SUSE)
parent b3e3a760eb
commit e55119ab61
+6 -5
View File
@@ -43,13 +43,14 @@ struct zone *next_zone(struct zone *zone)
return zone;
}
static inline int zref_in_nodemask(struct zoneref *zref,
const nodemask_t *nodes)
/* A NULL zone terminates the zonelist, so it ends the search. */
static inline bool zone_in_nodemask(const struct zone *zone,
const nodemask_t *nodes)
{
#ifdef CONFIG_NUMA
return node_isset(zonelist_node_idx(zref), *nodes);
return !zone || node_isset(zone_to_nid(zone), *nodes);
#else
return 1;
return true;
#endif /* CONFIG_NUMA */
}
@@ -67,7 +68,7 @@ struct zoneref *__next_zones_zonelist(struct zoneref *z,
z++;
else
while (zonelist_zone_idx(z) > highest_zoneidx ||
(zonelist_zone(z) && !zref_in_nodemask(z, nodes)))
!zone_in_nodemask(zonelist_zone(z), nodes))
z++;
return z;