**問題:**
- Larson 4T で 100% SEGV (1T は 2.09M ops/s で完走)
- System/mimalloc は 4T で 33.52M ops/s 正常動作
- SS OFF + Remote OFF でも 4T で SEGV
**根本原因: (Task agent ultrathink 調査結果)**
```
CRASH: mov (%r15),%r13
R15 = 0x6261 ← ASCII "ba" (ゴミ値、未初期化TLS)
```
Worker スレッドの TLS 変数が未初期化:
- `__thread void* g_tls_sll_head[TINY_NUM_CLASSES];` ← 初期化なし
- pthread_create() で生成されたスレッドでゼロ初期化されない
- NULL チェックが通過 (0x6261 != NULL) → dereference → SEGV
**修正内容:**
全 TLS 配列に明示的初期化子 `= {0}` を追加:
1. **core/hakmem_tiny.c:**
- `g_tls_sll_head[TINY_NUM_CLASSES] = {0}`
- `g_tls_sll_count[TINY_NUM_CLASSES] = {0}`
- `g_tls_live_ss[TINY_NUM_CLASSES] = {0}`
- `g_tls_bcur[TINY_NUM_CLASSES] = {0}`
- `g_tls_bend[TINY_NUM_CLASSES] = {0}`
2. **core/tiny_fastcache.c:**
- `g_tiny_fast_cache[TINY_FAST_CLASS_COUNT] = {0}`
- `g_tiny_fast_count[TINY_FAST_CLASS_COUNT] = {0}`
- `g_tiny_fast_free_head[TINY_FAST_CLASS_COUNT] = {0}`
- `g_tiny_fast_free_count[TINY_FAST_CLASS_COUNT] = {0}`
3. **core/hakmem_tiny_magazine.c:**
- `g_tls_mags[TINY_NUM_CLASSES] = {0}`
4. **core/tiny_sticky.c:**
- `g_tls_sticky_ss[TINY_NUM_CLASSES][TINY_STICKY_RING] = {0}`
- `g_tls_sticky_idx[TINY_NUM_CLASSES][TINY_STICKY_RING] = {0}`
- `g_tls_sticky_pos[TINY_NUM_CLASSES] = {0}`
**効果:**
```
Before: 1T: 2.09M ✅ | 4T: SEGV 💀
After: 1T: 2.41M ✅ | 4T: 4.19M ✅ (+15% 1T, SEGV解消)
```
**テスト:**
```bash
# 1 thread: 完走
./larson_hakmem 2 8 128 1024 1 12345 1
→ Throughput = 2,407,597 ops/s ✅
# 4 threads: 完走(以前は SEGV)
./larson_hakmem 2 8 128 1024 1 12345 4
→ Throughput = 4,192,155 ops/s ✅
```
**調査協力:** Task agent (ultrathink mode) による完璧な根本原因特定
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
151 lines
5.4 KiB
C
151 lines
5.4 KiB
C
#include "hakmem_tiny_magazine.h"
|
||
#include "hakmem_tiny_config.h" // Centralized configuration
|
||
#include "hakmem_tiny.h" // For TINY_NUM_CLASSES
|
||
#include "hakmem_tiny_superslab.h"
|
||
#include "hakmem_super_registry.h" // Phase 1: For hak_super_lookup()
|
||
#include "tiny_remote.h"
|
||
#include "hakmem_prof.h"
|
||
#include "hakmem_internal.h"
|
||
#include <pthread.h>
|
||
|
||
static inline uint32_t tiny_self_u32_guard(void) {
|
||
return (uint32_t)(uintptr_t)pthread_self();
|
||
}
|
||
|
||
static inline void superslab_dec_active_safe(SuperSlab* ss) {
|
||
if (!ss) return;
|
||
uint32_t old = atomic_load_explicit(&ss->total_active_blocks, memory_order_relaxed);
|
||
while (old != 0u) {
|
||
if (atomic_compare_exchange_weak_explicit(&ss->total_active_blocks,
|
||
&old,
|
||
old - 1u,
|
||
memory_order_relaxed,
|
||
memory_order_relaxed)) {
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
__thread TinyTLSMag g_tls_mags[TINY_NUM_CLASSES] = {0};
|
||
|
||
// Global cap limiter (can be reduced via env HAKMEM_TINY_MAG_CAP)
|
||
int g_mag_cap_limit = TINY_TLS_MAG_CAP;
|
||
|
||
// Normal-path per-class overrides (env tunables)
|
||
int g_mag_cap_override[TINY_NUM_CLASSES] = {0}; // HAKMEM_TINY_MAG_CAP_C{0..7}
|
||
|
||
__thread int g_tls_small_mags_inited = 0;
|
||
|
||
// tiny_default_cap() and tiny_cap_max_for_class() now defined as inline functions
|
||
// in hakmem_tiny_config.h for centralized configuration
|
||
|
||
int tiny_effective_cap(int class_idx) {
|
||
// Env override takes precedence per class
|
||
int ov = g_mag_cap_override[class_idx];
|
||
if (ov > 0) return ov;
|
||
return tiny_default_cap(class_idx); // Use centralized config function
|
||
}
|
||
|
||
void tiny_small_mags_init_once(void) {
|
||
if (__builtin_expect(g_tls_small_mags_inited, 1)) return;
|
||
for (int k = 0; k <= 3; k++) {
|
||
TinyTLSMag* m = &g_tls_mags[k];
|
||
if (m->cap == 0) {
|
||
int base = tiny_effective_cap(k);
|
||
int cap = (base < TINY_TLS_MAG_CAP) ? base : TINY_TLS_MAG_CAP;
|
||
if (g_mag_cap_limit < cap) cap = g_mag_cap_limit;
|
||
m->cap = cap;
|
||
m->top = 0;
|
||
}
|
||
}
|
||
g_tls_small_mags_inited = 1;
|
||
}
|
||
|
||
void tiny_mag_init_if_needed(int class_idx) {
|
||
TinyTLSMag* mag = &g_tls_mags[class_idx];
|
||
if (mag->cap == 0) {
|
||
int base = tiny_effective_cap(class_idx);
|
||
int cap = (base < TINY_TLS_MAG_CAP) ? base : TINY_TLS_MAG_CAP;
|
||
if (g_mag_cap_limit < cap) cap = g_mag_cap_limit;
|
||
mag->cap = cap;
|
||
mag->top = 0;
|
||
}
|
||
}
|
||
|
||
// ============================================================================
|
||
// ACE Learning Layer: Runtime TLS Capacity Adjustment
|
||
// ============================================================================
|
||
|
||
void hkm_ace_set_tls_capacity(int class_idx, uint32_t capacity) {
|
||
// Validate inputs
|
||
if (class_idx < 0 || class_idx >= TINY_NUM_CLASSES) {
|
||
return;
|
||
}
|
||
if (capacity < 16 || capacity > (uint32_t)tiny_cap_max_for_class(class_idx)) {
|
||
return;
|
||
}
|
||
|
||
// Set override (will be used by new thread-local magazines on next init)
|
||
// Note: Lazy sync implementation is in hakmem_tiny_magazine.h (inlined)
|
||
g_mag_cap_override[class_idx] = (int)capacity;
|
||
}
|
||
|
||
// ============================================================================
|
||
// Phase 7.7: Magazine Flush API
|
||
// ============================================================================
|
||
|
||
// Flush Magazine cache for a specific size class
|
||
// Forces all cached blocks to be returned to freelists, enabling empty
|
||
// SuperSlab detection and deallocation
|
||
void hak_tiny_magazine_flush(int class_idx) {
|
||
if (class_idx < 0 || class_idx >= TINY_NUM_CLASSES) return;
|
||
|
||
// Initialize if needed
|
||
tiny_mag_init_if_needed(class_idx);
|
||
|
||
TinyTLSMag* mag = &g_tls_mags[class_idx];
|
||
if (mag->top == 0) return; // Nothing to flush
|
||
|
||
// Lock and flush entire Magazine to freelist
|
||
pthread_mutex_t* lock = &g_tiny_class_locks[class_idx].m;
|
||
struct timespec tss; int ss_time = hkm_prof_begin(&tss);
|
||
pthread_mutex_lock(lock);
|
||
|
||
// Flush ALL blocks (not just half like normal spill)
|
||
int flush_count = mag->top;
|
||
uint32_t self_tid = tiny_self_u32_guard();
|
||
for (int i = 0; i < flush_count; i++) {
|
||
TinyMagItem it = mag->items[--mag->top];
|
||
|
||
// Return to SuperSlab freelist
|
||
SuperSlab* owner_ss = hak_super_lookup(it.ptr);
|
||
if (owner_ss && owner_ss->magic == SUPERSLAB_MAGIC) {
|
||
int slab_idx = slab_index_for(owner_ss, it.ptr);
|
||
TinySlabMeta* meta = &owner_ss->slabs[slab_idx];
|
||
if (!tiny_remote_guard_allow_local_push(owner_ss, slab_idx, meta, it.ptr, "mag_flush", self_tid)) {
|
||
(void)ss_remote_push(owner_ss, slab_idx, it.ptr);
|
||
if (meta->used > 0) meta->used--;
|
||
continue;
|
||
}
|
||
*(void**)it.ptr = meta->freelist;
|
||
meta->freelist = it.ptr;
|
||
meta->used--;
|
||
// Active was decremented at free time
|
||
|
||
// 空検出・解放はフラッシュ系APIへ委譲(ホットパス除外)
|
||
}
|
||
}
|
||
|
||
pthread_mutex_unlock(lock);
|
||
hkm_prof_end(ss_time, HKP_TINY_SPILL, &tss);
|
||
}
|
||
|
||
// Flush all Magazine caches
|
||
// Call this when memory needs to be released (e.g., before measuring RSS)
|
||
void hak_tiny_magazine_flush_all(void) {
|
||
for (int i = 0; i < TINY_NUM_CLASSES; i++) {
|
||
hak_tiny_magazine_flush(i);
|
||
}
|
||
hak_tiny_trim();
|
||
}
|