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

Fix the alloc_ctx check in free_fastpath.

Browse Source 
The sanity check requires a functional TSD, which free_fastpath only guarantees
after the threshold branch.  Move the check function to afterwards.
This commit is contained in:
Qi Wang 2020-10-12 16:11:51 -07:00 committed by Qi Wang
parent b971f7c4dd
commit a9aa6f6d0f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jemalloc.c
View File

@ -2972,11 +2972,6 @@ bool free_fastpath(void *ptr, size_t size, bool size_hint) {
/* This is a dead store, except when opt size checking is on. */ /* This is a dead store, except when opt size checking is on. */
alloc_ctx.slab = (alloc_ctx.szind < SC_NBINS); alloc_ctx.slab = (alloc_ctx.szind < SC_NBINS);
} }
bool fail = maybe_check_alloc_ctx(tsd, ptr, &alloc_ctx);
if (fail) {
/* See the comment in isfree. */
return true;
}
uint64_t deallocated, threshold; uint64_t deallocated, threshold;
te_free_fastpath_ctx(tsd, &deallocated, &threshold, size_hint); te_free_fastpath_ctx(tsd, &deallocated, &threshold, size_hint);
@ -2985,12 +2980,21 @@ bool free_fastpath(void *ptr, size_t size, bool size_hint) {
uint64_t deallocated_after = deallocated + usize; uint64_t deallocated_after = deallocated + usize;
/* /*
* Check for events and tsd non-nominal (fast_threshold will be set to * Check for events and tsd non-nominal (fast_threshold will be set to
* 0) in a single branch. * 0) in a single branch. Note that this handles the uninitialized case
* as well (TSD init will be triggered on the non-fastpath). Therefore
* anything depends on a functional TSD (e.g. the alloc_ctx sanity check
* below) needs to be after this branch.
*/ */
if (unlikely(deallocated_after >= threshold)) { if (unlikely(deallocated_after >= threshold)) {
return false; return false;
} }
bool fail = maybe_check_alloc_ctx(tsd, ptr, &alloc_ctx);
if (fail) {
/* See the comment in isfree. */
return true;
}
tcache_t *tcache = tcache_get_from_ind(tsd, TCACHE_IND_AUTOMATIC, tcache_t *tcache = tcache_get_from_ind(tsd, TCACHE_IND_AUTOMATIC,
/* slow */ false, /* is_alloc */ false); /* slow */ false, /* is_alloc */ false);
cache_bin_t *bin = &tcache->bins[alloc_ctx.szind]; cache_bin_t *bin = &tcache->bins[alloc_ctx.szind];