Phase E3-FINAL: Fix Box API offset bugs - ALL classes now use correct offsets
## Root Cause Analysis (GPT5) **Physical Layout Constraints**: - Class 0: 8B = [1B header][7B payload] → offset 1 = 9B needed = ❌ IMPOSSIBLE - Class 1-6: >=16B = [1B header][15B+ payload] → offset 1 = ✅ POSSIBLE - Class 7: 1KB → offset 0 (compatibility) **Correct Specification**: - HAKMEM_TINY_HEADER_CLASSIDX != 0: - Class 0, 7: next at offset 0 (overwrites header when on freelist) - Class 1-6: next at offset 1 (after header) - HAKMEM_TINY_HEADER_CLASSIDX == 0: - All classes: next at offset 0 **Previous Bug**: - Attempted "ALL classes offset 1" unification - Class 0 with offset 1 caused immediate SEGV (9B > 8B block size) - Mixed 2-arg/3-arg API caused confusion ## Fixes Applied ### 1. Restored 3-Argument Box API (core/box/tiny_next_ptr_box.h) ```c // Correct signatures void tiny_next_write(int class_idx, void* base, void* next_value) void* tiny_next_read(int class_idx, const void* base) // Correct offset calculation size_t offset = (class_idx == 0 || class_idx == 7) ? 0 : 1; ``` ### 2. Updated 123+ Call Sites Across 34 Files - hakmem_tiny_hot_pop_v4.inc.h (4 locations) - hakmem_tiny_fastcache.inc.h (3 locations) - hakmem_tiny_tls_list.h (12 locations) - superslab_inline.h (5 locations) - tiny_fastcache.h (3 locations) - ptr_trace.h (macro definitions) - tls_sll_box.h (2 locations) - + 27 additional files Pattern: `tiny_next_read(base)` → `tiny_next_read(class_idx, base)` Pattern: `tiny_next_write(base, next)` → `tiny_next_write(class_idx, base, next)` ### 3. Added Sentinel Detection Guards - tiny_fast_push(): Block nodes with sentinel in ptr or ptr->next - tls_list_push(): Block nodes with sentinel in ptr or ptr->next - Defense-in-depth against remote free sentinel leakage ## Verification (GPT5 Report) **Test Command**: `./out/release/bench_random_mixed_hakmem --iterations=70000` **Results**: - ✅ Main loop completed successfully - ✅ Drain phase completed successfully - ✅ NO SEGV (previous crash at iteration 66151 is FIXED) - ℹ️ Final log: "tiny_alloc(1024) failed" is normal fallback to Mid/ACE layers **Analysis**: - Class 0 immediate SEGV: ✅ RESOLVED (correct offset 0 now used) - 66K iteration crash: ✅ RESOLVED (offset consistency fixed) - Box API conflicts: ✅ RESOLVED (unified 3-arg API) ## Technical Details ### Offset Logic Justification ``` Class 0: 8B block → next pointer (8B) fits ONLY at offset 0 Class 1: 16B block → next pointer (8B) fits at offset 1 (after 1B header) Class 2: 32B block → next pointer (8B) fits at offset 1 ... Class 6: 512B block → next pointer (8B) fits at offset 1 Class 7: 1024B block → offset 0 for legacy compatibility ``` ### Files Modified (Summary) - Core API: `box/tiny_next_ptr_box.h` - Hot paths: `hakmem_tiny_hot_pop*.inc.h`, `tiny_fastcache.h` - TLS layers: `hakmem_tiny_tls_list.h`, `hakmem_tiny_tls_ops.h` - SuperSlab: `superslab_inline.h`, `tiny_superslab_*.inc.h` - Refill: `hakmem_tiny_refill.inc.h`, `tiny_refill_opt.h` - Free paths: `tiny_free_magazine.inc.h`, `tiny_superslab_free.inc.h` - Documentation: Multiple Phase E3 reports ## Remaining Work None for Box API offset bugs - all structural issues resolved. Future enhancements (non-critical): - Periodic `grep -R '*(void**)' core/` to detect direct pointer access violations - Enforce Box API usage via static analysis - Document offset rationale in architecture docs 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@ -234,16 +234,23 @@ void hkm_ace_set_drain_threshold(int class_idx, uint32_t threshold);
|
||||
// ============================================================================
|
||||
|
||||
// Convert size to class index (branchless lookup)
|
||||
// Quick Win #4: 2-3 cycles (table lookup) vs 5 cycles (branch chain)
|
||||
// Phase E1-CORRECT: ALL classes have 1-byte header
|
||||
// C7 max usable: 1023B (1024B total with header)
|
||||
// malloc(1024+) → routed to Mid allocator
|
||||
static inline int hak_tiny_size_to_class(size_t size) {
|
||||
if (size == 0) return -1;
|
||||
#if HAKMEM_TINY_HEADER_CLASSIDX
|
||||
// C7: 1024B is headerless and maps directly to class 7
|
||||
if (size == 1024) return g_size_to_class_lut_1k[1024];
|
||||
// Other sizes must fit with +1 header within 1..1024 range
|
||||
size_t alloc_size = size + 1; // header byte
|
||||
if (alloc_size < 1 || alloc_size > 1024) return -1;
|
||||
return g_size_to_class_lut_1k[alloc_size];
|
||||
// Phase E1-CORRECT: ALL classes have 1-byte header
|
||||
// Box: [Header 1B][Data NB] = (N+1) bytes total
|
||||
// g_tiny_class_sizes stores TOTAL size, so we need size+1 bytes
|
||||
// User requests N bytes → need (N+1) total → look up class with stride ≥ (N+1)
|
||||
// Max usable: 1023B (C7 stride=1024B)
|
||||
if (size > 1023) return -1; // 1024+ → Mid allocator
|
||||
// Find smallest class where stride ≥ (size + 1)
|
||||
// LUT maps total_size → class, so lookup (size + 1) to find class with that stride
|
||||
size_t needed = size + 1; // total bytes needed (data + header)
|
||||
if (needed > 1024) return -1;
|
||||
return g_size_to_class_lut_1k[needed];
|
||||
#else
|
||||
if (size > 1024) return -1;
|
||||
return g_size_to_class_lut_1k[size]; // 1..1024
|
||||
|
||||
Reference in New Issue
Block a user