romenskiy2012/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-05-15 09:26:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Do not dehugify when purging"

Browse source 
This reverts commit 16c5abd1cd.
This commit is contained in:
Slobodan Predolac 2025-09-29 09:41:51 -07:00
parent b76a7306a8
commit 2bbcb10d10
6 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/hpa.c
View file

@ -433,11 +433,18 @@ hpa_purge_actual_unlocked(
hpa_range_accum_init(&accum, vec, len);
for (size_t i = 0; i < batch_sz; ++i) {
hpdata_t *to_purge = batch[i].hp;
/* Actually do the purging, now that the lock is dropped. */
if (batch[i].dehugify) {
shard->central->hooks.dehugify(
hpdata_addr_get(to_purge), HUGEPAGE);
}
void *purge_addr;
size_t purge_size;
size_t total_purged_on_one_hp = 0;
while (hpdata_purge_next(
batch[i].hp, &batch[i].state, &purge_addr, &purge_size)) {
to_purge, &batch[i].state, &purge_addr, &purge_size)) {
total_purged_on_one_hp += purge_size;
assert(total_purged_on_one_hp <= HUGEPAGE);
hpa_range_accum_add(

12
src/hpa_hooks.c
View file

@ -8,13 +8,14 @@ static void *hpa_hooks_map(size_t size);
static void hpa_hooks_unmap(void *ptr, size_t size);
static void hpa_hooks_purge(void *ptr, size_t size);
static bool hpa_hooks_hugify(void *ptr, size_t size, bool sync);
static void hpa_hooks_dehugify(void *ptr, size_t size);
static void hpa_hooks_curtime(nstime_t *r_nstime, bool first_reading);
static uint64_t hpa_hooks_ms_since(nstime_t *past_nstime);
static bool hpa_hooks_vectorized_purge(void *vec, size_t vlen, size_t nbytes);
const hpa_hooks_t hpa_hooks_default = {&hpa_hooks_map, &hpa_hooks_unmap,
&hpa_hooks_purge, &hpa_hooks_hugify, &hpa_hooks_curtime,
&hpa_hooks_ms_since, &hpa_hooks_vectorized_purge};
&hpa_hooks_purge, &hpa_hooks_hugify, &hpa_hooks_dehugify,
&hpa_hooks_curtime, &hpa_hooks_ms_since, &hpa_hooks_vectorized_purge};
static void *
hpa_hooks_map(size_t size) {
@ -60,6 +61,13 @@ hpa_hooks_hugify(void *ptr, size_t size, bool sync) {
return err;
}
static void
hpa_hooks_dehugify(void *ptr, size_t size) {
bool err = pages_nohuge(ptr, size);
JE_USDT(hpa_dehugify, 3, size, ptr, err);
(void)err;
}
static void
hpa_hooks_curtime(nstime_t *r_nstime, bool first_reading) {
if (first_reading) {