2025-11-05 12:31:14 +09:00
|
|
|
// tiny_refill_opt.h - Inline helpers to batch and splice refill chains
|
|
|
|
|
// Box: Refill Boundary optimization helpers (kept header-only)
|
|
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdatomic.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
#ifndef HAKMEM_TINY_REFILL_OPT
|
|
|
|
|
#define HAKMEM_TINY_REFILL_OPT 1
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// Local chain structure (head/tail pointers)
|
|
|
|
|
typedef struct TinyRefillChain {
|
|
|
|
|
void* head;
|
|
|
|
|
void* tail;
|
|
|
|
|
uint32_t count;
|
|
|
|
|
} TinyRefillChain;
|
|
|
|
|
|
|
|
|
|
static inline void trc_init(TinyRefillChain* c) {
|
|
|
|
|
c->head = NULL; c->tail = NULL; c->count = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void refill_opt_dbg(const char* stage, int class_idx, uint32_t n) {
|
|
|
|
|
#if HAKMEM_TINY_REFILL_OPT
|
|
|
|
|
static int en = -1;
|
|
|
|
|
static _Atomic int printed = 0;
|
|
|
|
|
if (__builtin_expect(en == -1, 0)) {
|
|
|
|
|
const char* e = getenv("HAKMEM_TINY_REFILL_OPT_DEBUG");
|
|
|
|
|
en = (e && *e && *e != '0') ? 1 : 0;
|
|
|
|
|
}
|
|
|
|
|
if (!en) return;
|
|
|
|
|
int exp = 0;
|
|
|
|
|
if (atomic_compare_exchange_strong(&printed, &exp, 1)) {
|
|
|
|
|
fprintf(stderr, "[REFILL_OPT] stage=%s cls=%d n=%u\n", stage ? stage : "(null)", class_idx, (unsigned)n);
|
|
|
|
|
fflush(stderr);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
(void)stage; (void)class_idx; (void)n;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2025-11-10 18:04:08 +09:00
|
|
|
// Phase 7 header-aware push_front: link using base+1 for C0-C6 (C7 not used here)
|
|
|
|
|
static inline void trc_push_front(TinyRefillChain* c, void* node, int class_idx) {
|
|
|
|
|
#if HAKMEM_TINY_HEADER_CLASSIDX
|
|
|
|
|
const size_t next_offset = (class_idx == 7) ? 0 : 1;
|
|
|
|
|
#else
|
|
|
|
|
const size_t next_offset = 0;
|
|
|
|
|
#endif
|
2025-11-05 12:31:14 +09:00
|
|
|
if (c->head == NULL) {
|
2025-11-10 18:04:08 +09:00
|
|
|
c->head = node; c->tail = node; *(void**)((uint8_t*)node + next_offset) = NULL; c->count = 1;
|
2025-11-05 12:31:14 +09:00
|
|
|
} else {
|
2025-11-10 18:04:08 +09:00
|
|
|
*(void**)((uint8_t*)node + next_offset) = c->head; c->head = node; c->count++;
|
2025-11-05 12:31:14 +09:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-11-08 01:18:37 +09:00
|
|
|
// Forward declaration of guard function
|
|
|
|
|
static inline int trc_refill_guard_enabled(void);
|
|
|
|
|
|
2025-11-10 16:48:20 +09:00
|
|
|
// Forward declare Box TLS-SLL API
|
|
|
|
|
#include "box/tls_sll_box.h"
|
|
|
|
|
|
|
|
|
|
// Splice local chain into TLS SLL using Box TLS-SLL API (C7-safe)
|
2025-11-05 12:31:14 +09:00
|
|
|
static inline void trc_splice_to_sll(int class_idx, TinyRefillChain* c,
|
|
|
|
|
void** sll_head, uint32_t* sll_count) {
|
|
|
|
|
if (!c || c->head == NULL) return;
|
2025-11-08 01:18:37 +09:00
|
|
|
|
2025-11-09 22:12:34 +09:00
|
|
|
// CORRUPTION DEBUG: Log chain splice (alignment check removed - false positive)
|
|
|
|
|
// NOTE: Blocks are stride-aligned from slab base, not absolutely aligned
|
|
|
|
|
// A slab at 0x1000 with 513B blocks is valid: 0x1000, 0x1201, 0x1402, etc.
|
2025-11-08 01:18:37 +09:00
|
|
|
if (__builtin_expect(trc_refill_guard_enabled(), 0)) {
|
|
|
|
|
fprintf(stderr, "[SPLICE_TO_SLL] cls=%d head=%p tail=%p count=%u\n",
|
|
|
|
|
class_idx, c->head, c->tail, c->count);
|
|
|
|
|
}
|
|
|
|
|
|
2025-11-10 16:48:20 +09:00
|
|
|
// CRITICAL: Use Box TLS-SLL API for splice (C7-safe, no race)
|
|
|
|
|
// Note: tls_sll_splice() requires capacity parameter (use large value for refill)
|
|
|
|
|
uint32_t moved = tls_sll_splice(class_idx, c->head, c->count, 4096);
|
|
|
|
|
|
|
|
|
|
// Update sll_count if provided (Box API already updated g_tls_sll_count internally)
|
|
|
|
|
// Note: sll_count parameter is typically &g_tls_sll_count[class_idx], already updated
|
|
|
|
|
(void)sll_count; // Suppress unused warning
|
|
|
|
|
(void)sll_head; // Suppress unused warning
|
|
|
|
|
|
|
|
|
|
// If splice was partial, warn (should not happen in refill path)
|
|
|
|
|
if (__builtin_expect(moved < c->count, 0)) {
|
|
|
|
|
fprintf(stderr, "[SPLICE_WARNING] Only moved %u/%u blocks (SLL capacity limit)\n",
|
|
|
|
|
moved, c->count);
|
2025-11-05 12:31:14 +09:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-11-07 20:31:01 +09:00
|
|
|
static inline int trc_refill_guard_enabled(void) {
|
2025-11-09 22:12:34 +09:00
|
|
|
// FIX: Allow runtime override even in release builds for debugging
|
2025-11-07 20:31:01 +09:00
|
|
|
static int g_trc_guard = -1;
|
|
|
|
|
if (__builtin_expect(g_trc_guard == -1, 0)) {
|
|
|
|
|
const char* env = getenv("HAKMEM_TINY_REFILL_FAILFAST");
|
2025-11-09 22:12:34 +09:00
|
|
|
#if HAKMEM_BUILD_RELEASE
|
|
|
|
|
// Release: Default OFF, but allow explicit enable
|
|
|
|
|
g_trc_guard = (env && *env && *env != '0') ? 1 : 0;
|
|
|
|
|
#else
|
|
|
|
|
// Debug: Default ON, but allow explicit disable
|
2025-11-07 20:31:01 +09:00
|
|
|
g_trc_guard = (env && *env) ? ((*env != '0') ? 1 : 0) : 1;
|
2025-11-09 22:12:34 +09:00
|
|
|
#endif
|
2025-11-11 01:47:06 +09:00
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
2025-11-09 22:12:34 +09:00
|
|
|
fprintf(stderr, "[TRC_GUARD] failfast=%d env=%s mode=%s\n",
|
|
|
|
|
g_trc_guard, env ? env : "(null)",
|
|
|
|
|
HAKMEM_BUILD_RELEASE ? "release" : "debug");
|
2025-11-07 20:31:01 +09:00
|
|
|
fflush(stderr);
|
2025-11-11 01:47:06 +09:00
|
|
|
#endif
|
2025-11-07 20:31:01 +09:00
|
|
|
}
|
|
|
|
|
return g_trc_guard;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int trc_ptr_is_valid(uintptr_t base, uintptr_t limit, size_t blk, const void* node) {
|
|
|
|
|
if (!node || limit <= base) return 1;
|
|
|
|
|
uintptr_t addr = (uintptr_t)node;
|
|
|
|
|
if (addr < base || addr >= limit) return 0;
|
|
|
|
|
if (blk == 0) return 1;
|
|
|
|
|
return ((addr - base) % blk) == 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void trc_failfast_abort(const char* stage,
|
|
|
|
|
int class_idx,
|
|
|
|
|
uintptr_t base,
|
|
|
|
|
uintptr_t limit,
|
|
|
|
|
const void* node) {
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"[TRC_FAILFAST] stage=%s cls=%d node=%p base=%p limit=%p\n",
|
|
|
|
|
stage ? stage : "(null)",
|
|
|
|
|
class_idx,
|
|
|
|
|
node,
|
|
|
|
|
(void*)base,
|
|
|
|
|
(void*)limit);
|
|
|
|
|
fflush(stderr);
|
|
|
|
|
abort();
|
|
|
|
|
}
|
|
|
|
|
|
2025-11-05 12:31:14 +09:00
|
|
|
// Pop up to 'want' nodes from freelist into local chain
|
|
|
|
|
static inline uint32_t trc_pop_from_freelist(struct TinySlabMeta* meta,
|
2025-11-07 20:31:01 +09:00
|
|
|
int class_idx,
|
|
|
|
|
uintptr_t ss_base,
|
|
|
|
|
uintptr_t ss_limit,
|
|
|
|
|
size_t block_size,
|
2025-11-05 12:31:14 +09:00
|
|
|
uint32_t want,
|
|
|
|
|
TinyRefillChain* out) {
|
|
|
|
|
if (!out || want == 0) return 0;
|
|
|
|
|
trc_init(out);
|
|
|
|
|
uint32_t taken = 0;
|
|
|
|
|
while (taken < want && meta->freelist) {
|
|
|
|
|
void* p = meta->freelist;
|
2025-11-07 20:31:01 +09:00
|
|
|
if (__builtin_expect(trc_refill_guard_enabled() &&
|
|
|
|
|
!trc_ptr_is_valid(ss_base, ss_limit, block_size, p),
|
|
|
|
|
0)) {
|
2025-11-08 01:18:37 +09:00
|
|
|
fprintf(stderr, "[FREELIST_CORRUPT] Reading freelist head: p=%p (ss_base=%p ss_limit=%p blk=%zu)\n",
|
|
|
|
|
p, (void*)ss_base, (void*)ss_limit, block_size);
|
|
|
|
|
fprintf(stderr, "[FREELIST_CORRUPT] Head pointer is corrupted (invalid range/alignment)\n");
|
2025-11-07 20:31:01 +09:00
|
|
|
trc_failfast_abort("freelist_head", class_idx, ss_base, ss_limit, p);
|
|
|
|
|
}
|
|
|
|
|
void* next = *(void**)p;
|
|
|
|
|
if (__builtin_expect(trc_refill_guard_enabled() &&
|
|
|
|
|
!trc_ptr_is_valid(ss_base, ss_limit, block_size, next),
|
|
|
|
|
0)) {
|
2025-11-08 01:18:37 +09:00
|
|
|
fprintf(stderr, "[FREELIST_CORRUPT] Reading freelist node: p=%p next=%p (ss_base=%p ss_limit=%p blk=%zu)\n",
|
|
|
|
|
p, next, (void*)ss_base, (void*)ss_limit, block_size);
|
|
|
|
|
fprintf(stderr, "[FREELIST_CORRUPT] Next pointer is corrupted (cls=%d taken=%u/%u)\n",
|
|
|
|
|
class_idx, taken, want);
|
|
|
|
|
// Log offset details
|
|
|
|
|
if (next != NULL) {
|
|
|
|
|
uintptr_t offset = (uintptr_t)next - ss_base;
|
|
|
|
|
size_t expected_align = offset % block_size;
|
|
|
|
|
fprintf(stderr, "[FREELIST_CORRUPT] Corrupted offset=%zu (0x%zx) expected_align=%zu\n",
|
|
|
|
|
offset, offset, expected_align);
|
|
|
|
|
}
|
2025-11-07 20:31:01 +09:00
|
|
|
trc_failfast_abort("freelist_next", class_idx, ss_base, ss_limit, next);
|
|
|
|
|
}
|
|
|
|
|
meta->freelist = next;
|
2025-11-10 18:04:08 +09:00
|
|
|
trc_push_front(out, p, class_idx);
|
2025-11-05 12:31:14 +09:00
|
|
|
taken++;
|
|
|
|
|
}
|
|
|
|
|
// DEBUG REMOVED: refill_opt_dbg causes -26% regression (atomic CAS overhead)
|
|
|
|
|
return taken;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Carve a contiguous batch of size 'batch' from linear area, return as chain
|
2025-11-10 18:04:08 +09:00
|
|
|
// Phase 7 header-aware carve: link chain using header-safe next location
|
|
|
|
|
// class_idx is required to decide headerless (C7) vs headered (C0-C6)
|
2025-11-05 12:31:14 +09:00
|
|
|
static inline uint32_t trc_linear_carve(uint8_t* base, size_t bs,
|
|
|
|
|
struct TinySlabMeta* meta,
|
|
|
|
|
uint32_t batch,
|
2025-11-10 18:04:08 +09:00
|
|
|
int class_idx,
|
2025-11-05 12:31:14 +09:00
|
|
|
TinyRefillChain* out) {
|
|
|
|
|
if (!out || batch == 0) return 0;
|
|
|
|
|
trc_init(out);
|
2025-11-08 01:18:37 +09:00
|
|
|
|
|
|
|
|
// FIX: Use carved (monotonic) instead of used (decrements on free)
|
|
|
|
|
// CORRUPTION DEBUG: Validate capacity before carving
|
|
|
|
|
if (__builtin_expect(trc_refill_guard_enabled(), 0)) {
|
|
|
|
|
if (meta->carved + batch > meta->capacity) {
|
|
|
|
|
fprintf(stderr, "[LINEAR_CARVE_CORRUPT] Carving beyond capacity!\n");
|
|
|
|
|
fprintf(stderr, "[LINEAR_CARVE_CORRUPT] carved=%u batch=%u capacity=%u (would be %u)\n",
|
|
|
|
|
meta->carved, batch, meta->capacity, meta->carved + batch);
|
|
|
|
|
fprintf(stderr, "[LINEAR_CARVE_CORRUPT] base=%p bs=%zu\n", (void*)base, bs);
|
|
|
|
|
abort();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FIX: Use carved counter (monotonic) instead of used (which decrements on free)
|
2025-11-09 22:12:34 +09:00
|
|
|
// Caller passes bs as the effective stride already (includes header when enabled)
|
2025-11-09 18:55:50 +09:00
|
|
|
size_t stride = bs;
|
|
|
|
|
uint8_t* cursor = base + ((size_t)meta->carved * stride);
|
2025-11-05 12:31:14 +09:00
|
|
|
void* head = (void*)cursor;
|
2025-11-08 01:18:37 +09:00
|
|
|
|
|
|
|
|
// CORRUPTION DEBUG: Log carve operation
|
|
|
|
|
if (__builtin_expect(trc_refill_guard_enabled(), 0)) {
|
|
|
|
|
fprintf(stderr, "[LINEAR_CARVE] base=%p carved=%u batch=%u cursor=%p\n",
|
|
|
|
|
(void*)base, meta->carved, batch, (void*)cursor);
|
|
|
|
|
}
|
|
|
|
|
|
2025-11-10 18:04:08 +09:00
|
|
|
// CRITICAL FIX (Phase 7): header-aware next pointer placement
|
|
|
|
|
// For header classes (C0-C6), the first byte at base is the 1-byte header.
|
|
|
|
|
// Store the SLL next pointer at base+1 to avoid clobbering the header.
|
|
|
|
|
// For C7 (headerless), store at base.
|
|
|
|
|
#if HAKMEM_TINY_HEADER_CLASSIDX
|
|
|
|
|
const size_t next_offset = (class_idx == 7) ? 0 : 1;
|
|
|
|
|
#else
|
|
|
|
|
const size_t next_offset = 0;
|
|
|
|
|
#endif
|
2025-11-05 12:31:14 +09:00
|
|
|
for (uint32_t i = 1; i < batch; i++) {
|
2025-11-09 18:55:50 +09:00
|
|
|
uint8_t* next = cursor + stride;
|
2025-11-10 18:04:08 +09:00
|
|
|
*(void**)(cursor + next_offset) = (void*)next;
|
2025-11-05 12:31:14 +09:00
|
|
|
cursor = next;
|
|
|
|
|
}
|
|
|
|
|
void* tail = (void*)cursor;
|
2025-11-10 23:41:53 +09:00
|
|
|
// Debug: validate first link
|
|
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
|
|
|
if (batch >= 2) {
|
|
|
|
|
void* first_next = *(void**)((uint8_t*)head + next_offset);
|
|
|
|
|
fprintf(stderr, "[LINEAR_LINK] cls=%d head=%p off=%zu next=%p tail=%p\n",
|
|
|
|
|
class_idx, head, (size_t)next_offset, first_next, tail);
|
|
|
|
|
} else {
|
|
|
|
|
fprintf(stderr, "[LINEAR_LINK] cls=%d head=%p off=%zu next=%p tail=%p\n",
|
|
|
|
|
class_idx, head, (size_t)next_offset, (void*)0, tail);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2025-11-08 01:18:37 +09:00
|
|
|
// FIX: Update both carved (monotonic) and used (active count)
|
|
|
|
|
meta->carved += batch;
|
2025-11-05 12:31:14 +09:00
|
|
|
meta->used += batch;
|
|
|
|
|
out->head = head;
|
|
|
|
|
out->tail = tail;
|
|
|
|
|
out->count = batch;
|
|
|
|
|
// DEBUG REMOVED: refill_opt_dbg causes -26% regression (atomic CAS overhead)
|
|
|
|
|
return batch;
|
|
|
|
|
}
|