romenskiy2012/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-04-14 22:51:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix the tcache flush sanity checking around ncached and nstashed.

Browse source 
When there were many items stashed, it's possible that after flushing stashed,
ncached is already lower than the remain, in which case the flush can simply
return at that point.
This commit is contained in:
Qi Wang 2024-04-12 11:08:39 -07:00 • committed by Qi Wang
parent 630434bb0a
commit fa451de17f
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/tcache.c
View file

@ -524,11 +524,25 @@ tcache_bin_flush_impl(tsd_t *tsd, tcache_t *tcache, cache_bin_t *cache_bin,
JEMALLOC_ALWAYS_INLINE void
tcache_bin_flush_bottom(tsd_t *tsd, tcache_t *tcache, cache_bin_t *cache_bin,
szind_t binind, unsigned rem, bool small) {
assert(rem <= cache_bin_ncached_max_get(cache_bin));
assert(!tcache_bin_disabled(binind, cache_bin, tcache->tcache_slow));
cache_bin_sz_t orig_nstashed = cache_bin_nstashed_get_local(cache_bin);
tcache_bin_flush_stashed(tsd, tcache, cache_bin, binind, small);
cache_bin_sz_t ncached = cache_bin_ncached_get_local(cache_bin);
assert((cache_bin_sz_t)rem <= ncached);
assert((cache_bin_sz_t)rem <= ncached + orig_nstashed);
if ((cache_bin_sz_t)rem > ncached) {
/*
* The flush_stashed above could have done enough flushing, if
* there were many items stashed. Validate that: 1) non zero
* stashed, and 2) bin stack has available space now.
*/
assert(orig_nstashed > 0);
assert(ncached + cache_bin_nstashed_get_local(cache_bin)
< cache_bin_ncached_max_get(cache_bin));
/* Still go through the flush logic for stats purpose only. */
rem = ncached;
}
cache_bin_sz_t nflush = ncached - (cache_bin_sz_t)rem;
CACHE_BIN_PTR_ARRAY_DECLARE(ptrs, nflush);
@ -537,8 +551,7 @@ tcache_bin_flush_bottom(tsd_t *tsd, tcache_t *tcache, cache_bin_t *cache_bin,
tcache_bin_flush_impl(tsd, tcache, cache_bin, binind, &ptrs, nflush,
small);
cache_bin_finish_flush(cache_bin, &ptrs,
ncached - (cache_bin_sz_t)rem);
cache_bin_finish_flush(cache_bin, &ptrs, nflush);
}
void