From 7b516613aa064c85007c525e6aab5cce440ca10d Mon Sep 17 00:00:00 2001 From: "Jonathan T. Looney" Date: Tue, 10 Nov 2020 18:12:09 +0000 Subject: [PATCH] When destroying a UMA zone which has a reserve (set with uma_zone_reserve()), messages like the following appear on the console: "Freed UMA keg (Test zone) was not empty (0 items). Lost 528 pages of memory." When keg_drain_domain() is draining the zone, it tries to keep the number of items specified in the reservation. However, when we are destroying the UMA zone, we do not need to keep those items. Therefore, when destroying a non-secondary and non-cache zone, we should reset the keg reservation to 0 prior to draining the zone. Reviewed by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D27129 --- sys/vm/uma_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 3e97650760b2..081f57fcb5cd 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -2791,6 +2791,10 @@ zone_dtor(void *arg, int size, void *udata) rw_wlock(&uma_rwlock); LIST_REMOVE(zone, uz_link); rw_wunlock(&uma_rwlock); + if ((zone->uz_flags & (UMA_ZONE_SECONDARY | UMA_ZFLAG_CACHE)) == 0) { + keg = zone->uz_keg; + keg->uk_reserve = 0; + } zone_reclaim(zone, M_WAITOK, true); /*