d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In sysctl_vm_zone, do not calculate per-cpu cache stats on

Browse Source 
UMA_ZFLAG_INTERNAL zones at all.  Apparently, Wilko's alpha
was crashing while entering multi-user because, I think, we
were calculating the garbage cachefree for pcpu caches that
essentially don't exist for at least the 'zones' zone and it so
happened that we were reading from an unmapped location.

Confirmed to fix crash: wilko
Helped debug: wilko, gallatin
This commit is contained in:
Bosko Milekic 2003-08-20 18:22:06 +00:00
parent b8ecbcd287
commit 1c35e213f1
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/vm/uma_core.c
View File

@ -2167,30 +2167,27 @@ sysctl_vm_zone(SYSCTL_HANDLER_ARGS)
LIST_FOREACH(z, &uma_zones, uz_link) {
if (cnt == 0) /* list may have changed size */
break;
for (cpu = 0; cpu < maxcpu; cpu++) {
if (CPU_ABSENT(cpu))
continue;
CPU_LOCK(cpu);
if (!(z->uz_flags & UMA_ZFLAG_INTERNAL)) {
for (cpu = 0; cpu < maxcpu; cpu++) {
if (CPU_ABSENT(cpu))
continue;
CPU_LOCK(cpu);
}
}
ZONE_LOCK(z);
cachefree = 0;
for (cpu = 0; cpu < maxcpu; cpu++) {
if (CPU_ABSENT(cpu))
continue;
cache = &z->uz_cpu[cpu];
if (cache->uc_allocbucket != NULL)
cachefree += cache->uc_allocbucket->ub_ptr + 1;
if (cache->uc_freebucket != NULL)
cachefree += cache->uc_freebucket->ub_ptr + 1;
CPU_UNLOCK(cpu);
if (!(z->uz_flags & UMA_ZFLAG_INTERNAL)) {
for (cpu = 0; cpu < maxcpu; cpu++) {
if (CPU_ABSENT(cpu))
continue;
cache = &z->uz_cpu[cpu];
if (cache->uc_allocbucket != NULL)
cachefree += cache->uc_allocbucket->ub_ptr + 1;
if (cache->uc_freebucket != NULL)
cachefree += cache->uc_freebucket->ub_ptr + 1;
CPU_UNLOCK(cpu);
}
}
/*
* The "UMA Zones" zone (master zone) does not have pcpu
* caches allocated for it, so the above computation is entirely
* bogus. Re-set cachefree to 0 in that case.
*/
if (z == zones)
cachefree = 0;
LIST_FOREACH(bucket, &z->uz_full_bucket, ub_link) {
cachefree += bucket->ub_ptr + 1;
}