mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-30 08:19:09 +00:00
Code Issues Releases Activity

uma: Fix improper uses of UMA_MD_SMALL_ALLOC

Browse Source 
UMA_MD_SMALL_ALLOC was recently replaced by UMA_USE_DMAP, but
da76d349b6 missed some improper uses of the old symbol.
This change makes sure that UMA_USE_DMAP is used properly in
code that selects uma_small_alloc.

Fixes: da76d349b6
Reported by: eduardo, rlibby
Approved by: markj (mentor)
Differential Revision:	https://reviews.freebsd.org/D45368
This commit is contained in:
Bojan Novković 2024-05-26 09:54:45 +02:00
parent 73eb53813f
commit d25ed65043
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/vm/uma_core.c
View File

@ -2523,7 +2523,7 @@ keg_ctor(void *mem, int size, void *udata, int flags)
* If we haven't booted yet we need allocations to go through the * If we haven't booted yet we need allocations to go through the
* startup cache until the vm is ready. * startup cache until the vm is ready.
*/ */
#ifdef UMA_MD_SMALL_ALLOC #ifdef UMA_USE_DMAP
if (keg->uk_ppera == 1) if (keg->uk_ppera == 1)
keg->uk_allocf = uma_small_alloc; keg->uk_allocf = uma_small_alloc;
else else
@ -2536,7 +2536,7 @@ keg_ctor(void *mem, int size, void *udata, int flags)
keg->uk_allocf = contig_alloc; keg->uk_allocf = contig_alloc;
else else
keg->uk_allocf = page_alloc; keg->uk_allocf = page_alloc;
#ifdef UMA_MD_SMALL_ALLOC #ifdef UMA_USE_DMAP
if (keg->uk_ppera == 1) if (keg->uk_ppera == 1)
keg->uk_freef = uma_small_free; keg->uk_freef = uma_small_free;
else else
@ -5221,7 +5221,7 @@ uma_zone_reserve_kva(uma_zone_t zone, int count)
keg->uk_kva = kva; keg->uk_kva = kva;
keg->uk_offset = 0; keg->uk_offset = 0;
zone->uz_max_items = pages * keg->uk_ipers; zone->uz_max_items = pages * keg->uk_ipers;
#ifdef UMA_MD_SMALL_ALLOC #ifdef UMA_USE_DMAP
keg->uk_allocf = (keg->uk_ppera > 1) ? noobj_alloc : uma_small_alloc; keg->uk_allocf = (keg->uk_ppera > 1) ? noobj_alloc : uma_small_alloc;
#else #else
keg->uk_allocf = noobj_alloc; keg->uk_allocf = noobj_alloc;