Fix the bug in dalloc promoted allocations.

An allocation small enough will be promoted so that it does not
share an extent with others.  However, when dalloc, such allocations
may not be dalloc as a promoted one if nbins < SC_NBINS.  This
commit fixes the bug.
This commit is contained in:
guangli-dai 2023-10-16 15:31:13 -07:00 committed by Qi Wang
parent 630f7de952
commit 867eedfc58

View File

@ -301,23 +301,24 @@ JEMALLOC_ALWAYS_INLINE void
arena_dalloc_large(tsdn_t *tsdn, void *ptr, tcache_t *tcache, szind_t szind, arena_dalloc_large(tsdn_t *tsdn, void *ptr, tcache_t *tcache, szind_t szind,
bool slow_path) { bool slow_path) {
assert (!tsdn_null(tsdn) && tcache != NULL); assert (!tsdn_null(tsdn) && tcache != NULL);
if (szind < TCACHE_NBINS_MAX && bool is_sample_promoted = config_prof && szind < SC_NBINS;
!tcache_bin_disabled(szind, &tcache->bins[szind], if (unlikely(is_sample_promoted)) {
tcache->tcache_slow)) { arena_dalloc_promoted(tsdn, ptr, tcache, slow_path);
if (config_prof && unlikely(szind < SC_NBINS)) { } else {
arena_dalloc_promoted(tsdn, ptr, tcache, slow_path); if (szind < tcache_nbins_get(tcache->tcache_slow) &&
} else { !tcache_bin_disabled(szind, &tcache->bins[szind],
tcache->tcache_slow)) {
tcache_dalloc_large(tsdn_tsd(tsdn), tcache, ptr, szind, tcache_dalloc_large(tsdn_tsd(tsdn), tcache, ptr, szind,
slow_path); slow_path);
} else {
edata_t *edata = emap_edata_lookup(tsdn,
&arena_emap_global, ptr);
if (large_dalloc_safety_checks(edata, ptr, szind)) {
/* See the comment in isfree. */
return;
}
large_dalloc(tsdn, edata);
} }
} else {
edata_t *edata = emap_edata_lookup(tsdn, &arena_emap_global,
ptr);
if (large_dalloc_safety_checks(edata, ptr, szind)) {
/* See the comment in isfree. */
return;
}
large_dalloc(tsdn, edata);
} }
} }