uma_zalloc_domain: call uma_zalloc_debug in multi-domain path
It was only called in the non-NUMA and single-domain paths. Some of its assertions were duplicated in uma_zalloc_domain, but some things were missed, especially memguard. Reviewed by: markj, rstone MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D34472
This commit is contained in:
parent
aca2a7faca
commit
490b09f240
@ -3816,12 +3816,6 @@ uma_zalloc_domain(uma_zone_t zone, void *udata, int domain, int flags)
|
|||||||
CTR4(KTR_UMA, "uma_zalloc_domain zone %s(%p) domain %d flags %d",
|
CTR4(KTR_UMA, "uma_zalloc_domain zone %s(%p) domain %d flags %d",
|
||||||
zone->uz_name, zone, domain, flags);
|
zone->uz_name, zone, domain, flags);
|
||||||
|
|
||||||
if (flags & M_WAITOK) {
|
|
||||||
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
|
|
||||||
"uma_zalloc_domain: zone \"%s\"", zone->uz_name);
|
|
||||||
}
|
|
||||||
KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(),
|
|
||||||
("uma_zalloc_domain: called with spinlock or critical section held"));
|
|
||||||
KASSERT((zone->uz_flags & UMA_ZONE_SMR) == 0,
|
KASSERT((zone->uz_flags & UMA_ZONE_SMR) == 0,
|
||||||
("uma_zalloc_domain: called with SMR zone."));
|
("uma_zalloc_domain: called with SMR zone."));
|
||||||
#ifdef NUMA
|
#ifdef NUMA
|
||||||
@ -3831,6 +3825,11 @@ uma_zalloc_domain(uma_zone_t zone, void *udata, int domain, int flags)
|
|||||||
if (vm_ndomains == 1)
|
if (vm_ndomains == 1)
|
||||||
return (uma_zalloc_arg(zone, udata, flags));
|
return (uma_zalloc_arg(zone, udata, flags));
|
||||||
|
|
||||||
|
#ifdef UMA_ZALLOC_DEBUG
|
||||||
|
if (uma_zalloc_debug(zone, &item, udata, flags) == EJUSTRETURN)
|
||||||
|
return (item);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Try to allocate from the bucket cache before falling back to the keg.
|
* Try to allocate from the bucket cache before falling back to the keg.
|
||||||
* We could try harder and attempt to allocate from per-CPU caches or
|
* We could try harder and attempt to allocate from per-CPU caches or
|
||||||
|
Loading…
Reference in New Issue
Block a user