mirror of
https://github.com/lightpanda-io/browser.git
synced 2026-06-11 09:35:59 -04:00
Cherry-picked from https://github.com/lightpanda-io/browser/pull/2623 since the main issue in that PR was directly solved by https://github.com/lightpanda-io/browser/pull/2625 but the ArenaPool change is still worth keeping. The change is: that we check for a double-release BEFORE resetting the arena, which would cause the invalid flow to appear in a harder-to-debug spot.
379 lines
12 KiB
Zig
379 lines
12 KiB
Zig
// Copyright (C) 2023-2026 Lightpanda (Selecy SAS)
|
|
//
|
|
// Francis Bouvier <francis@lightpanda.io>
|
|
// Pierre Tachoire <pierre@lightpanda.io>
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as
|
|
// published by the Free Software Foundation, either version 3 of the
|
|
// License, or (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
const std = @import("std");
|
|
const lp = @import("lightpanda");
|
|
const builtin = @import("builtin");
|
|
|
|
const log = lp.log;
|
|
const Allocator = std.mem.Allocator;
|
|
const ArenaAllocator = std.heap.ArenaAllocator;
|
|
|
|
const ArenaPool = @This();
|
|
|
|
const IS_DEBUG = builtin.mode == .Debug;
|
|
|
|
// In Debug, disable pooling to better catch UAF.
|
|
const SAFETY = IS_DEBUG == true and builtin.is_test == false;
|
|
|
|
pub const BucketSize = enum { tiny, small, medium, large };
|
|
|
|
const Bucket = struct {
|
|
free_list: ?*Entry = null,
|
|
free_list_len: u16 = 0,
|
|
free_list_max: u16,
|
|
retain_bytes: usize,
|
|
};
|
|
|
|
const Entry = struct {
|
|
next: ?*Entry,
|
|
arena: ArenaAllocator,
|
|
bucket: *Bucket,
|
|
debug: if (IS_DEBUG) []const u8 else void = if (IS_DEBUG) "" else {},
|
|
};
|
|
|
|
pub const Config = struct {
|
|
tiny: Config.Bucket = .{ .max = 512, .retain = 1024 },
|
|
small: Config.Bucket = .{ .max = 128, .retain = 4 * 1024 },
|
|
medium: Config.Bucket = .{ .max = 64, .retain = 16 * 1024 },
|
|
large: Config.Bucket = .{ .max = 32, .retain = 128 * 1024 },
|
|
|
|
const Bucket = struct {
|
|
max: u16,
|
|
retain: usize,
|
|
};
|
|
};
|
|
|
|
tiny: Bucket,
|
|
small: Bucket,
|
|
medium: Bucket,
|
|
large: Bucket,
|
|
allocator: Allocator,
|
|
mutex: std.Thread.Mutex = .{},
|
|
entry_pool: std.heap.MemoryPool(Entry),
|
|
|
|
_leak_track: if (IS_DEBUG) std.StringHashMapUnmanaged(isize) else void = if (IS_DEBUG) .empty else {},
|
|
|
|
pub fn init(allocator: Allocator, config: Config) ArenaPool {
|
|
return .{
|
|
.allocator = allocator,
|
|
.entry_pool = .init(allocator),
|
|
.tiny = .{ .free_list_max = config.tiny.max, .retain_bytes = config.tiny.retain },
|
|
.small = .{ .free_list_max = config.small.max, .retain_bytes = config.small.retain },
|
|
.medium = .{ .free_list_max = config.medium.max, .retain_bytes = config.medium.retain },
|
|
.large = .{ .free_list_max = config.large.max, .retain_bytes = config.large.retain },
|
|
};
|
|
}
|
|
|
|
pub fn deinit(self: *ArenaPool) void {
|
|
if (IS_DEBUG) {
|
|
var has_leaks = false;
|
|
var it = self._leak_track.iterator();
|
|
while (it.next()) |kv| {
|
|
if (kv.value_ptr.* != 0) {
|
|
log.err(.bug, "ArenaPool leak", .{ .name = kv.key_ptr.*, .count = kv.value_ptr.* });
|
|
has_leaks = true;
|
|
}
|
|
}
|
|
if (has_leaks) {
|
|
@panic("ArenaPool: leaked arenas detected");
|
|
}
|
|
self._leak_track.deinit(self.allocator);
|
|
}
|
|
|
|
// Free all arenas in all buckets
|
|
inline for (&[_]*Bucket{ &self.tiny, &self.small, &self.medium, &self.large }) |bucket| {
|
|
var entry = bucket.free_list;
|
|
while (entry) |e| {
|
|
entry = e.next;
|
|
e.arena.deinit();
|
|
}
|
|
}
|
|
self.entry_pool.deinit();
|
|
}
|
|
|
|
// Acquire an arena from the pool.
|
|
// - Pass a BucketSize (.tiny, .small, .medium, .large) for explicit bucket selection
|
|
// - Pass a usize for automatic bucket selection based on expected size
|
|
pub fn acquire(self: *ArenaPool, size_or_bucket: anytype, debug: []const u8) !Allocator {
|
|
const bucket = blk: {
|
|
const T = @TypeOf(size_or_bucket);
|
|
if (T == BucketSize or T == @TypeOf(.enum_literal)) {
|
|
break :blk switch (@as(BucketSize, size_or_bucket)) {
|
|
.tiny => &self.tiny,
|
|
.small => &self.small,
|
|
.medium => &self.medium,
|
|
.large => &self.large,
|
|
};
|
|
}
|
|
if (T == usize or T == comptime_int) {
|
|
if (size_or_bucket <= self.tiny.retain_bytes) break :blk &self.tiny;
|
|
if (size_or_bucket <= self.small.retain_bytes) break :blk &self.small;
|
|
if (size_or_bucket <= self.medium.retain_bytes) break :blk &self.medium;
|
|
break :blk &self.large;
|
|
}
|
|
@compileError("acquire expects BucketSize or usize, got " ++ @typeName(T));
|
|
};
|
|
|
|
self.mutex.lock();
|
|
defer self.mutex.unlock();
|
|
|
|
if (bucket.free_list) |entry| {
|
|
bucket.free_list = entry.next;
|
|
bucket.free_list_len -= 1;
|
|
if (IS_DEBUG) {
|
|
entry.debug = debug;
|
|
const gop = try self._leak_track.getOrPut(self.allocator, debug);
|
|
if (!gop.found_existing) {
|
|
gop.value_ptr.* = 0;
|
|
}
|
|
gop.value_ptr.* += 1;
|
|
}
|
|
return entry.arena.allocator();
|
|
}
|
|
|
|
const entry = try self.entry_pool.create();
|
|
entry.* = .{
|
|
.next = null,
|
|
.bucket = bucket,
|
|
.debug = if (IS_DEBUG) debug else {},
|
|
.arena = ArenaAllocator.init(self.allocator),
|
|
};
|
|
|
|
if (IS_DEBUG) {
|
|
const gop = try self._leak_track.getOrPut(self.allocator, debug);
|
|
if (!gop.found_existing) {
|
|
gop.value_ptr.* = 0;
|
|
}
|
|
gop.value_ptr.* += 1;
|
|
}
|
|
return entry.arena.allocator();
|
|
}
|
|
|
|
// Universal release - determines bucket from the Entry automatically
|
|
pub fn release(self: *ArenaPool, allocator: Allocator) void {
|
|
const arena: *ArenaAllocator = @ptrCast(@alignCast(allocator.ptr));
|
|
const entry: *Entry = @fieldParentPtr("arena", arena);
|
|
const bucket = entry.bucket;
|
|
|
|
if (IS_DEBUG) {
|
|
self.mutex.lock();
|
|
defer self.mutex.unlock();
|
|
if (self._leak_track.getPtr(entry.debug)) |count| {
|
|
count.* -= 1;
|
|
if (count.* < 0) {
|
|
log.err(.bug, "ArenaPool double-free", .{ .name = entry.debug });
|
|
@panic("ArenaPool: double-free detected");
|
|
}
|
|
} else {
|
|
log.err(.bug, "ArenaPool release unknown", .{ .name = entry.debug });
|
|
@panic("ArenaPool: release of untracked arena");
|
|
}
|
|
}
|
|
|
|
_ = arena.reset(.{ .retain_with_limit = bucket.retain_bytes });
|
|
|
|
self.mutex.lock();
|
|
defer self.mutex.unlock();
|
|
|
|
if ((comptime SAFETY) or bucket.free_list_len >= bucket.free_list_max) {
|
|
// In Debug, we never pool. It can mask UAF bugs.
|
|
arena.deinit();
|
|
self.entry_pool.destroy(entry);
|
|
return;
|
|
}
|
|
|
|
entry.next = bucket.free_list;
|
|
bucket.free_list = entry;
|
|
bucket.free_list_len += 1;
|
|
}
|
|
|
|
pub fn reset(_: *const ArenaPool, allocator: Allocator, retain: usize) void {
|
|
const arena: *ArenaAllocator = @ptrCast(@alignCast(allocator.ptr));
|
|
// In Debug, free_all, it's less likely to hide things
|
|
_ = arena.reset(if (comptime SAFETY) .free_all else .{ .retain_with_limit = retain });
|
|
}
|
|
|
|
pub fn resetRetain(_: *const ArenaPool, allocator: Allocator) void {
|
|
const arena: *ArenaAllocator = @ptrCast(@alignCast(allocator.ptr));
|
|
// In Debug, free_all, it's less likely to hide things
|
|
_ = arena.reset(if (comptime SAFETY) .free_all else .retain_capacity);
|
|
}
|
|
|
|
const testing = std.testing;
|
|
test "ArenaPool: basic acquire and release" {
|
|
var pool = ArenaPool.init(testing.allocator, .{});
|
|
defer pool.deinit();
|
|
|
|
const tiny = try pool.acquire(.tiny, "test-tiny");
|
|
const medium = try pool.acquire(.medium, "test-medium");
|
|
const large = try pool.acquire(.large, "test-large");
|
|
|
|
// All three must be distinct arenas
|
|
try testing.expect(tiny.ptr != medium.ptr);
|
|
try testing.expect(medium.ptr != large.ptr);
|
|
|
|
_ = try tiny.alloc(u8, 64);
|
|
_ = try medium.alloc(u8, 1024);
|
|
_ = try large.alloc(u8, 4096);
|
|
|
|
// Universal release works for all buckets
|
|
pool.release(tiny);
|
|
pool.release(medium);
|
|
pool.release(large);
|
|
|
|
try testing.expectEqual(1, pool.tiny.free_list_len);
|
|
try testing.expectEqual(1, pool.medium.free_list_len);
|
|
try testing.expectEqual(1, pool.large.free_list_len);
|
|
}
|
|
|
|
test "ArenaPool: reuse from correct bucket" {
|
|
var pool = ArenaPool.init(testing.allocator, .{});
|
|
defer pool.deinit();
|
|
|
|
const tiny1 = try pool.acquire(.tiny, "test");
|
|
pool.release(tiny1);
|
|
try testing.expectEqual(1, pool.tiny.free_list_len);
|
|
|
|
// Next acquire with .tiny should reuse from tiny bucket
|
|
const tiny2 = try pool.acquire(.tiny, "test");
|
|
try testing.expectEqual(0, pool.tiny.free_list_len);
|
|
try testing.expectEqual(tiny1.ptr, tiny2.ptr);
|
|
|
|
// acquire with .medium should NOT get the tiny arena
|
|
const medium = try pool.acquire(.medium, "test-medium");
|
|
try testing.expect(medium.ptr != tiny2.ptr);
|
|
|
|
pool.release(tiny2);
|
|
pool.release(medium);
|
|
}
|
|
|
|
test "ArenaPool: respects per-bucket max limits" {
|
|
var pool = ArenaPool.init(testing.allocator, .{
|
|
.tiny = .{ .max = 1, .retain = 1024 },
|
|
.medium = .{ .max = 2, .retain = 1024 },
|
|
.large = .{ .max = 1, .retain = 1024 },
|
|
});
|
|
defer pool.deinit();
|
|
|
|
// Acquire 3 tiny arenas
|
|
const t1 = try pool.acquire(.tiny, "t1");
|
|
const t2 = try pool.acquire(.tiny, "t2");
|
|
const t3 = try pool.acquire(.tiny, "t3");
|
|
|
|
// Release all 3, but only 1 should be kept (tiny_max = 1)
|
|
pool.release(t1);
|
|
try testing.expectEqual(1, pool.tiny.free_list_len);
|
|
pool.release(t2);
|
|
try testing.expectEqual(1, pool.tiny.free_list_len); // still 1, t2 discarded
|
|
pool.release(t3);
|
|
try testing.expectEqual(1, pool.tiny.free_list_len); // still 1, t3 discarded
|
|
|
|
// Acquire 3 medium arenas
|
|
const m1 = try pool.acquire(.medium, "m1");
|
|
const m2 = try pool.acquire(.medium, "m2");
|
|
const m3 = try pool.acquire(.medium, "m3");
|
|
|
|
// Release all 3, but only 2 should be kept (medium_max = 2)
|
|
pool.release(m1);
|
|
pool.release(m2);
|
|
pool.release(m3);
|
|
try testing.expectEqual(2, pool.medium.free_list_len);
|
|
}
|
|
|
|
test "ArenaPool: reset clears memory without releasing" {
|
|
var pool = ArenaPool.init(testing.allocator, .{});
|
|
defer pool.deinit();
|
|
|
|
const alloc = try pool.acquire(.medium, "test");
|
|
|
|
const buf = try alloc.alloc(u8, 128);
|
|
@memset(buf, 0xFF);
|
|
|
|
// reset() frees arena memory but keeps the allocator in-flight.
|
|
pool.reset(alloc, 0);
|
|
|
|
// The free list must stay empty; the allocator was not released.
|
|
try testing.expectEqual(0, pool.medium.free_list_len);
|
|
|
|
// Allocating again through the same arena must still work.
|
|
const buf2 = try alloc.alloc(u8, 64);
|
|
@memset(buf2, 0x00);
|
|
try testing.expectEqual(@as(u8, 0x00), buf2[0]);
|
|
|
|
pool.release(alloc);
|
|
}
|
|
|
|
test "ArenaPool: deinit with entries in free list" {
|
|
// Verifies that deinit properly cleans up free-listed arenas (no leaks
|
|
// detected by the test allocator).
|
|
var pool = ArenaPool.init(testing.allocator, .{});
|
|
|
|
const a1 = try pool.acquire(.tiny, "test1");
|
|
const a2 = try pool.acquire(.medium, "test2");
|
|
_ = try a1.alloc(u8, 256);
|
|
_ = try a2.alloc(u8, 512);
|
|
pool.release(a1);
|
|
pool.release(a2);
|
|
try testing.expectEqual(1, pool.tiny.free_list_len);
|
|
try testing.expectEqual(1, pool.medium.free_list_len);
|
|
|
|
pool.deinit();
|
|
}
|
|
|
|
test "ArenaPool: small bucket" {
|
|
var pool = ArenaPool.init(testing.allocator, .{
|
|
.small = .{ .max = 2, .retain = 4 * 1024 },
|
|
});
|
|
defer pool.deinit();
|
|
|
|
const s1 = try pool.acquire(.small, "s1");
|
|
const s2 = try pool.acquire(.small, "s2");
|
|
const s3 = try pool.acquire(.small, "s3");
|
|
|
|
pool.release(s1);
|
|
pool.release(s2);
|
|
pool.release(s3);
|
|
|
|
try testing.expectEqual(2, pool.small.free_list_len);
|
|
}
|
|
|
|
test "ArenaPool: size-based acquire" {
|
|
var pool = ArenaPool.init(testing.allocator, .{});
|
|
defer pool.deinit();
|
|
|
|
// <= 1KB -> tiny
|
|
const a = try pool.acquire(500, "fits-tiny");
|
|
// <= 4KB -> small
|
|
const b = try pool.acquire(2000, "fits-small");
|
|
// <= 16KB -> medium
|
|
const c = try pool.acquire(8000, "fits-medium");
|
|
// > 16KB -> large
|
|
const d = try pool.acquire(20000, "fits-large");
|
|
|
|
pool.release(a);
|
|
pool.release(b);
|
|
pool.release(c);
|
|
pool.release(d);
|
|
|
|
try testing.expectEqual(1, pool.tiny.free_list_len);
|
|
try testing.expectEqual(1, pool.small.free_list_len);
|
|
try testing.expectEqual(1, pool.medium.free_list_len);
|
|
try testing.expectEqual(1, pool.large.free_list_len);
|
|
}
|