On 4/7/21 10:24 PM, Mel Gorman wrote:
> @@ -6691,7 +6697,7 @@ static __meminit void zone_pcp_init(struct zone *zone)
> * relies on the ability of the linker to provide the
> * offset of a (static) per cpu variable into the per cpu area.
> */
> - zone->pageset = &boot_pageset;
> + zone->per_cpu_pageset = &boot_pageset;
I don't see any &boot_zonestats assignment here in zone_pcp_init() or its
caller(s), which seems strange, as zone_pcp_reset() does it.
> zone->pageset_high = BOOT_PAGESET_HIGH;
> zone->pageset_batch = BOOT_PAGESET_BATCH;
>
> @@ -8954,17 +8960,19 @@ void zone_pcp_reset(struct zone *zone)
> {
> unsigned long flags;
> int cpu;
> - struct per_cpu_pageset *pset;
> + struct per_cpu_zonestat *pzstats;
>
> /* avoid races with drain_pages() */
> local_irq_save(flags);
> - if (zone->pageset != &boot_pageset) {
> + if (zone->per_cpu_pageset != &boot_pageset) {
> for_each_online_cpu(cpu) {
> - pset = per_cpu_ptr(zone->pageset, cpu);
> - drain_zonestat(zone, pset);
> + pzstats = per_cpu_ptr(zone->per_cpu_zonestats, cpu);
> + drain_zonestat(zone, pzstats);
> }
> - free_percpu(zone->pageset);
> - zone->pageset = &boot_pageset;
> + free_percpu(zone->per_cpu_pageset);
> + free_percpu(zone->per_cpu_zonestats);
> + zone->per_cpu_pageset = &boot_pageset;
> + zone->per_cpu_zonestats = &boot_zonestats;
^ here
> }
> local_irq_restore(flags);
> }
