jmb
/
hardened_malloc
mirror of https://github.com/GrapheneOS/hardened_malloc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

factor out slab memory_set_name into label_slab

pull/87/head
Daniel Micay 2019-04-07 18:02:56 -04:00
parent ef90f404a6
commit a4cff7a960
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
h_malloc.c
View File

@ -125,7 +125,8 @@ static const u16 size_class_slots[] = {
static const char *const size_class_labels[] = { static const char *const size_class_labels[] = {
/* 0 */ "malloc 0", /* 0 */ "malloc 0",
/* 16 */ "malloc 16", "malloc 32", "malloc 48", "malloc 64", "malloc 80", "malloc 96", "malloc 112", "malloc 128", /* 16 */ "malloc 16", "malloc 32", "malloc 48", "malloc 64",
/* 16 */ "malloc 80", "malloc 96", "malloc 112", "malloc 128",
/* 32 */ "malloc 160", "malloc 192", "malloc 224", "malloc 256", /* 32 */ "malloc 160", "malloc 192", "malloc 224", "malloc 256",
/* 64 */ "malloc 320", "malloc 384", "malloc 448", "malloc 512", /* 64 */ "malloc 320", "malloc 384", "malloc 448", "malloc 512",
/* 128 */ "malloc 640", "malloc 768", "malloc 896", "malloc 1024", /* 128 */ "malloc 640", "malloc 768", "malloc 896", "malloc 1024",
@ -135,6 +136,10 @@ static const char *const size_class_labels[] = {
/* 2048 */ "malloc 10240", "malloc 12288", "malloc 14336", "malloc 16384" /* 2048 */ "malloc 10240", "malloc 12288", "malloc 14336", "malloc 16384"
}; };
static void label_slab(void *slab, size_t slab_size, unsigned class) {
memory_set_name(slab, slab_size, size_class_labels[class]);
}
#define N_SIZE_CLASSES (sizeof(size_classes) / sizeof(size_classes[0])) #define N_SIZE_CLASSES (sizeof(size_classes) / sizeof(size_classes[0]))
struct size_info { struct size_info {
@ -714,7 +719,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
if (c->empty_slabs_total + slab_size > max_empty_slabs_total) { if (c->empty_slabs_total + slab_size > max_empty_slabs_total) {
if (!memory_map_fixed(slab, slab_size)) { if (!memory_map_fixed(slab, slab_size)) {
memory_set_name(slab, slab_size, size_class_labels[class]); label_slab(slab, slab_size, class);
#if CONFIG_STATS #if CONFIG_STATS
c->slab_allocated -= slab_size; c->slab_allocated -= slab_size;
#endif #endif
@ -1081,7 +1086,7 @@ COLD static void init_slow_path(void) {
size_t bound = (REAL_CLASS_REGION_SIZE - CLASS_REGION_SIZE) / PAGE_SIZE - 1; size_t bound = (REAL_CLASS_REGION_SIZE - CLASS_REGION_SIZE) / PAGE_SIZE - 1;
size_t gap = (get_random_u64_uniform(rng, bound) + 1) * PAGE_SIZE; size_t gap = (get_random_u64_uniform(rng, bound) + 1) * PAGE_SIZE;
c->class_region_start = (char *)slab_region_start + ARENA_SIZE * arena + REAL_CLASS_REGION_SIZE * class + gap; c->class_region_start = (char *)slab_region_start + ARENA_SIZE * arena + REAL_CLASS_REGION_SIZE * class + gap;
memory_set_name(c->class_region_start, CLASS_REGION_SIZE, size_class_labels[class]); label_slab(c->class_region_start, CLASS_REGION_SIZE, class);
size_t size = size_classes[class]; size_t size = size_classes[class];
if (size == 0) { if (size == 0) {
@ -1622,7 +1627,7 @@ EXPORT int h_malloc_trim(UNUSED size_t pad) {
if (memory_map_fixed(slab, slab_size)) { if (memory_map_fixed(slab, slab_size)) {
break; break;
} }
memory_set_name(slab, slab_size, size_class_labels[class]); label_slab(slab, slab_size, class);
#if CONFIG_STATS #if CONFIG_STATS
c->slab_allocated -= slab_size; c->slab_allocated -= slab_size;
#endif #endif