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

Fix bug introduced at r252226, when udata argument passed to bucket_alloc()

Browse Source 
was used without making sure first that it was really passed for us.

On some of my systems this bug made user argument passed by ZFS code to
uma_zalloc_arg() unexpectedly block UMA per-CPU caches for those zones.
This commit is contained in:
Alexander Motin 2013-11-27 19:55:42 +00:00
parent 2471928bf8
commit e8a720fe60
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/vm/uma_core.c
View File

@ -369,12 +369,13 @@ bucket_alloc(uma_zone_t zone, void *udata, int flags)
* buckets via the allocation path or bucket allocations in the
* free path.
*/
if ((uintptr_t)udata & UMA_ZFLAG_BUCKET)
return (NULL);
if ((zone->uz_flags & UMA_ZFLAG_BUCKET) == 0)
udata = (void *)(uintptr_t)zone->uz_flags;
else
else {
if ((uintptr_t)udata & UMA_ZFLAG_BUCKET)
return (NULL);
udata = (void *)((uintptr_t)udata | UMA_ZFLAG_BUCKET);
}
if ((uintptr_t)udata & UMA_ZFLAG_CACHEONLY)
flags |= M_NOVM;
ubz = bucket_zone_lookup(zone->uz_count);