From f96d4157a7b34575141a910bbac76da17211c0c7 Mon Sep 17 00:00:00 2001 From: Jeff Roberson Date: Sat, 1 Feb 2020 23:46:30 +0000 Subject: [PATCH] Fix a bug in r356776 where the page allocator was not properly restored to the percpu page allocator after it had been temporarily overridden by startup_alloc. Reported by: pho, bdragon --- sys/vm/uma_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 28b959d66b4..eb2c31ab52a 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -2101,7 +2101,9 @@ zone_kva_available(uma_zone_t zone, void *unused) if ((zone->uz_flags & UMA_ZFLAG_CACHE) != 0) return; KEG_GET(zone, keg); - if (keg->uk_allocf == startup_alloc) + if (keg->uk_flags & UMA_ZONE_PCPU) + keg->uk_allocf = pcpu_page_alloc; + else if (keg->uk_allocf == startup_alloc) keg->uk_allocf = page_alloc; }