## 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>
83 lines
2.6 KiB
C
83 lines
2.6 KiB
C
// tiny_nextptr.h - Authoritative next-pointer offset/load/store for tiny boxes
|
|
//
|
|
// Finalized Phase E1-CORRECT spec (物理制約込み):
|
|
//
|
|
// HAKMEM_TINY_HEADER_CLASSIDX != 0 のとき:
|
|
//
|
|
// Class 0:
|
|
// [1B header][7B payload] (total 8B)
|
|
// → offset 1 に 8B ポインタは入らないため不可能
|
|
// → freelist中は header を潰して next を base+0 に格納
|
|
// → next_off = 0
|
|
//
|
|
// Class 1〜6:
|
|
// [1B header][payload >= 8B]
|
|
// → headerは保持し、next は header直後 base+1 に格納
|
|
// → next_off = 1
|
|
//
|
|
// Class 7:
|
|
// 大きなクラス、互換性と実装方針により next は base+0 扱い
|
|
// → next_off = 0
|
|
//
|
|
// HAKMEM_TINY_HEADER_CLASSIDX == 0 のとき:
|
|
//
|
|
// 全クラス headerなし → next_off = 0
|
|
//
|
|
// このヘッダは上記仕様を唯一の真実として提供する。
|
|
// すべての tiny freelist / TLS / fast-cache / refill / SLL で
|
|
// tiny_next_off/tiny_next_load/tiny_next_store を経由すること。
|
|
// 直接の *(void**) アクセスやローカルな offset 分岐は使用禁止。
|
|
|
|
#ifndef TINY_NEXTPTR_H
|
|
#define TINY_NEXTPTR_H
|
|
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include "hakmem_build_flags.h"
|
|
|
|
// Compute freelist next-pointer offset within a block for the given class.
|
|
static inline __attribute__((always_inline)) size_t tiny_next_off(int class_idx) {
|
|
#if HAKMEM_TINY_HEADER_CLASSIDX
|
|
// Phase E1-CORRECT finalized rule:
|
|
// Class 0,7 → offset 0
|
|
// Class 1-6 → offset 1
|
|
return (class_idx == 0 || class_idx == 7) ? 0u : 1u;
|
|
#else
|
|
(void)class_idx;
|
|
return 0u;
|
|
#endif
|
|
}
|
|
|
|
// Safe load of next pointer from a block base.
|
|
static inline __attribute__((always_inline)) void* tiny_next_load(const void* base, int class_idx) {
|
|
size_t off = tiny_next_off(class_idx);
|
|
|
|
if (off == 0) {
|
|
// Aligned access at base (header無し or C0/C7 freelist時)
|
|
return *(void* const*)base;
|
|
}
|
|
|
|
// off != 0: use memcpy to avoid UB on architectures that forbid unaligned loads.
|
|
void* next = NULL;
|
|
const uint8_t* p = (const uint8_t*)base + off;
|
|
memcpy(&next, p, sizeof(void*));
|
|
return next;
|
|
}
|
|
|
|
// Safe store of next pointer into a block base.
|
|
static inline __attribute__((always_inline)) void tiny_next_store(void* base, int class_idx, void* next) {
|
|
size_t off = tiny_next_off(class_idx);
|
|
|
|
if (off == 0) {
|
|
// Aligned access at base.
|
|
*(void**)base = next;
|
|
return;
|
|
}
|
|
|
|
// off != 0: use memcpy for portability / UB-avoidance.
|
|
uint8_t* p = (uint8_t*)base + off;
|
|
memcpy(p, &next, sizeof(void*));
|
|
}
|
|
|
|
#endif // TINY_NEXTPTR_H
|