mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
atomic_set_8 isn't MI. Instead, follow Jake's suggestions about
ZONE_LOCK.
This commit is contained in:
parent
34fa8213c3
commit
81f71edaec
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=106773
|
@ -1348,7 +1348,9 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
|
|||
("uma_zalloc: Bucket pointer mangled."));
|
||||
cache->uc_allocs++;
|
||||
#ifdef INVARIANTS
|
||||
ZONE_LOCK(zone);
|
||||
uma_dbg_alloc(zone, NULL, item);
|
||||
ZONE_UNLOCK(zone);
|
||||
#endif
|
||||
CPU_UNLOCK(zone, cpu);
|
||||
if (zone->uz_ctor)
|
||||
|
@ -1698,10 +1700,12 @@ uma_zfree_arg(uma_zone_t zone, void *item, void *udata)
|
|||
("uma_zfree: Freeing to non free bucket index."));
|
||||
bucket->ub_bucket[bucket->ub_ptr] = item;
|
||||
#ifdef INVARIANTS
|
||||
ZONE_LOCK(zone);
|
||||
if (zone->uz_flags & UMA_ZFLAG_MALLOC)
|
||||
uma_dbg_free(zone, udata, item);
|
||||
else
|
||||
uma_dbg_free(zone, NULL, item);
|
||||
ZONE_UNLOCK(zone);
|
||||
#endif
|
||||
CPU_UNLOCK(zone, cpu);
|
||||
return;
|
||||
|
|
|
@ -199,9 +199,7 @@ uma_dbg_getslab(uma_zone_t zone, void *item)
|
|||
if (zone->uz_flags & UMA_ZFLAG_MALLOC) {
|
||||
slab = vtoslab((vm_offset_t)mem);
|
||||
} else if (zone->uz_flags & UMA_ZFLAG_HASH) {
|
||||
ZONE_LOCK(zone);
|
||||
slab = hash_sfind(&zone->uz_hash, mem);
|
||||
ZONE_UNLOCK(zone);
|
||||
} else {
|
||||
mem += zone->uz_pgoff;
|
||||
slab = (uma_slab_t)mem;
|
||||
|
@ -230,7 +228,7 @@ uma_dbg_alloc(uma_zone_t zone, uma_slab_t slab, void *item)
|
|||
freei = ((unsigned long)item - (unsigned long)slab->us_data)
|
||||
/ zone->uz_rsize;
|
||||
|
||||
atomic_set_8(&slab->us_freelist[freei], 255);
|
||||
slab->us_freelist[freei] = 255;
|
||||
|
||||
return;
|
||||
}
|
||||
|
@ -279,5 +277,5 @@ uma_dbg_free(uma_zone_t zone, uma_slab_t slab, void *item)
|
|||
* Until then the count of valid slabs will make sure we don't
|
||||
* accidentally follow this and assume it's a valid index.
|
||||
*/
|
||||
atomic_set_8(&slab->us_freelist[freei], 0);
|
||||
slab->us_freelist[freei] = 0;
|
||||
}
|
||||
|
|
|
@ -225,7 +225,7 @@ _vm_object_allocate(objtype_t type, vm_pindex_t size, vm_object_t object)
|
|||
object->hash_rand = exp - 129;
|
||||
} while (!atomic_cmpset_int(&object_hash_rand, exp, object->hash_rand));
|
||||
|
||||
object->generation++; /* atomicity needed? XXX */
|
||||
atomic_add_int(&object->generation, 1);
|
||||
|
||||
mtx_lock(&vm_object_list_mtx);
|
||||
TAILQ_INSERT_TAIL(&vm_object_list, object, object_list);
|
||||
|
|
Loading…
Reference in a new issue