project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new_addr validation in extent_recycle().

Browse Source
This commit is contained in:
Jason Evans 2016-09-23 12:11:01 -07:00
parent f6d01ff4b7
commit fd96974040
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/extent.c
View File

@ -400,6 +400,25 @@ extent_recycle(tsdn_t *tsdn, arena_t *arena, extent_hooks_t **r_extent_hooks,
assert(new_addr == NULL || !slab); assert(new_addr == NULL || !slab);
assert(pad == 0 || !slab); assert(pad == 0 || !slab);
if (config_debug && new_addr != NULL) {
extent_t *prev;
/*
* Non-NULL new_addr has two use cases:
*
* 1) Recycle a known-extant extent, e.g. during purging.
* 2) Perform in-place expanding reallocation.
*
* Regardless of use case, new_addr must either refer to a
* non-existing extent, or to the base of an extant extent,
* since only active slabs support interior lookups (which of
* course cannot be recycled).
*/
assert(PAGE_ADDR2BASE(new_addr) == new_addr);
prev = extent_lookup(tsdn, (void *)((uintptr_t)new_addr - PAGE),
false);
assert(prev == NULL || extent_past_get(prev) == new_addr);
}
size = usize + pad; size = usize + pad;
alloc_size = s2u(size + PAGE_CEILING(alignment) - PAGE); alloc_size = s2u(size + PAGE_CEILING(alignment) - PAGE);
@ -417,17 +436,20 @@ extent_recycle(tsdn_t *tsdn, arena_t *arena, extent_hooks_t **r_extent_hooks,
if (elm != NULL) { if (elm != NULL) {
extent = rtree_elm_read_acquired(tsdn, &extents_rtree, extent = rtree_elm_read_acquired(tsdn, &extents_rtree,
elm); elm);
if (extent != NULL && (extent_arena_get(extent) != arena if (extent != NULL) {
|| extent_active_get(extent) || assert(extent_base_get(extent) == new_addr);
extent_retained_get(extent) == cache)) if (extent_arena_get(extent) != arena ||
extent_size_get(extent) < size ||
extent_active_get(extent) ||
extent_retained_get(extent) == cache)
extent = NULL; extent = NULL;
}
rtree_elm_release(tsdn, &extents_rtree, elm); rtree_elm_release(tsdn, &extents_rtree, elm);
} else } else
extent = NULL; extent = NULL;
} else } else
extent = extent_first_best_fit(arena, extent_heaps, alloc_size); extent = extent_first_best_fit(arena, extent_heaps, alloc_size);
if (extent == NULL || (new_addr != NULL && extent_size_get(extent) < if (extent == NULL) {
size)) {
if (!locked) if (!locked)
malloc_mutex_unlock(tsdn, &arena->extents_mtx); malloc_mutex_unlock(tsdn, &arena->extents_mtx);
return (NULL); return (NULL);