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

Fix large alloc nrequests under-counting on cache misses

Browse Source
This commit is contained in:
Slobodan Predolac
2026-03-27 13:30:58 -07:00
parent a47fa33b5a
commit 3cc56d325c
2 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/jemalloc/internal/tcache_inlines.h
View File

@@ -163,11 +163,11 @@ tcache_alloc_large(tsd_t *tsd, arena_t *arena, tcache_t *tcache, size_t size,
assert(usize <= tcache_max_get(tcache->tcache_slow)); assert(usize <= tcache_max_get(tcache->tcache_slow));
memset(ret, 0, usize); memset(ret, 0, usize);
} }
}
if (config_stats) { if (config_stats) {
bin->tstats.nrequests++; bin->tstats.nrequests++;
} }
}
return ret; return ret;
} }

47
test/unit/tcache_max.c
View File

@@ -206,6 +206,50 @@ TEST_BEGIN(test_tcache_max) {
} }
TEST_END TEST_END
TEST_BEGIN(test_large_tcache_nrequests_on_miss) {
test_skip_if(!config_stats);
test_skip_if(!opt_tcache);
test_skip_if(opt_prof);
test_skip_if(san_uaf_detection_enabled());
size_t large;
size_t sz = sizeof(large);
expect_d_eq(
mallctl("arenas.lextent.0.size", (void *)&large, &sz, NULL, 0), 0,
"Unexpected mallctl() failure");
expect_d_eq(mallctl("thread.tcache.max", NULL, NULL, (void *)&large,
sizeof(large)),
0, "Unexpected mallctl() failure");
expect_d_eq(mallctl("thread.tcache.flush", NULL, NULL, NULL, 0), 0,
"Unexpected tcache flush failure");
tsd_t *tsd = tsd_fetch();
expect_ptr_not_null(tsd, "Unexpected tsd_fetch() failure");
tcache_t *tcache = tcache_get(tsd);
expect_ptr_not_null(tcache, "Expected auto tcache");
szind_t binind = sz_size2index(large);
expect_true(binind >= SC_NBINS, "Expected large size class");
cache_bin_t *bin = &tcache->bins[binind];
bin->tstats.nrequests = 0;
void *p = mallocx(large, 0);
expect_ptr_not_null(p, "Unexpected mallocx() failure");
expect_u64_eq(bin->tstats.nrequests, 1,
"Large tcache miss should count as one request");
dallocx(p, 0);
p = mallocx(large, 0);
expect_ptr_not_null(p, "Unexpected mallocx() failure");
expect_u64_eq(bin->tstats.nrequests, 2,
"Large tcache hit should increment request count again");
dallocx(p, 0);
expect_d_eq(mallctl("thread.tcache.flush", NULL, NULL, NULL, 0), 0,
"Unexpected tcache flush failure");
}
TEST_END
static size_t static size_t
tcache_max2nbins(size_t tcache_max) { tcache_max2nbins(size_t tcache_max) {
return sz_size2index(tcache_max) + 1; return sz_size2index(tcache_max) + 1;
@@ -358,5 +402,6 @@ TEST_END
int int
main(void) { main(void) {
return test(test_tcache_max, test_thread_tcache_max); return test(test_tcache_max, test_large_tcache_nrequests_on_miss,
test_thread_tcache_max);
} }