lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-24 05:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not release the hpa_shard->mtx when inserting newly retrieved page from central before allocating from it

Browse Source
This commit is contained in:
Slobodan Predolac
2025-10-07 16:42:15 -07:00
committed by Guangli Dai
parent f714cd9249
commit 87555dfbb2
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/hpa.c
View File

@@ -840,6 +840,8 @@ hpa_shard_maybe_do_deferred_work(
static edata_t * static edata_t *
hpa_try_alloc_one_no_grow( hpa_try_alloc_one_no_grow(
tsdn_t *tsdn, hpa_shard_t *shard, size_t size, bool *oom) { tsdn_t *tsdn, hpa_shard_t *shard, size_t size, bool *oom) {
malloc_mutex_assert_owner(tsdn, &shard->mtx);
bool err; bool err;
edata_t *edata = edata_cache_fast_get(tsdn, &shard->ecf); edata_t *edata = edata_cache_fast_get(tsdn, &shard->ecf);
if (edata == NULL) { if (edata == NULL) {
@@ -912,10 +914,10 @@ hpa_try_alloc_one_no_grow(
} }
static size_t static size_t
hpa_try_alloc_batch_no_grow(tsdn_t *tsdn, hpa_shard_t *shard, size_t size, hpa_try_alloc_batch_no_grow_locked(tsdn_t *tsdn, hpa_shard_t *shard,
bool *oom, size_t nallocs, edata_list_active_t *results, size_t size, bool *oom, size_t nallocs, edata_list_active_t *results,
bool *deferred_work_generated) { bool *deferred_work_generated) {
malloc_mutex_lock(tsdn, &shard->mtx); malloc_mutex_assert_owner(tsdn, &shard->mtx);
size_t nsuccess = 0; size_t nsuccess = 0;
for (; nsuccess < nallocs; nsuccess++) { for (; nsuccess < nallocs; nsuccess++) {
edata_t *edata = hpa_try_alloc_one_no_grow( edata_t *edata = hpa_try_alloc_one_no_grow(
@@ -928,6 +930,16 @@ hpa_try_alloc_batch_no_grow(tsdn_t *tsdn, hpa_shard_t *shard, size_t size,
hpa_shard_maybe_do_deferred_work(tsdn, shard, /* forced */ false); hpa_shard_maybe_do_deferred_work(tsdn, shard, /* forced */ false);
*deferred_work_generated = hpa_shard_has_deferred_work(tsdn, shard); *deferred_work_generated = hpa_shard_has_deferred_work(tsdn, shard);
return nsuccess;
}
static size_t
hpa_try_alloc_batch_no_grow(tsdn_t *tsdn, hpa_shard_t *shard, size_t size,
bool *oom, size_t nallocs, edata_list_active_t *results,
bool *deferred_work_generated) {
malloc_mutex_lock(tsdn, &shard->mtx);
size_t nsuccess = hpa_try_alloc_batch_no_grow_locked(
tsdn, shard, size, oom, nallocs, results, deferred_work_generated);
malloc_mutex_unlock(tsdn, &shard->mtx); malloc_mutex_unlock(tsdn, &shard->mtx);
return nsuccess; return nsuccess;
} }
@@ -976,17 +988,16 @@ hpa_alloc_batch_psset(tsdn_t *tsdn, hpa_shard_t *shard, size_t size,
} }
/* /*
* We got the pageslab; allocate from it. This does an unlock followed * We got the pageslab; allocate from it. This holds the grow mutex
* by a lock on the same mutex, and holds the grow mutex while doing * while doing deferred work, but this is an uncommon path; the
* deferred work, but this is an uncommon path; the simplicity is worth * simplicity is worth it.
* it.
*/ */
malloc_mutex_lock(tsdn, &shard->mtx); malloc_mutex_lock(tsdn, &shard->mtx);
psset_insert(&shard->psset, ps); psset_insert(&shard->psset, ps);
nsuccess += hpa_try_alloc_batch_no_grow_locked(tsdn, shard, size, &oom,
nallocs - nsuccess, results, deferred_work_generated);
malloc_mutex_unlock(tsdn, &shard->mtx); malloc_mutex_unlock(tsdn, &shard->mtx);
nsuccess += hpa_try_alloc_batch_no_grow(tsdn, shard, size, &oom,
nallocs - nsuccess, results, deferred_work_generated);
/* /*
* Drop grow_mtx before doing deferred work; other threads blocked on it * Drop grow_mtx before doing deferred work; other threads blocked on it
* should be allowed to proceed while we're working. * should be allowed to proceed while we're working.