diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-10 12:23:33 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-10 12:23:41 -0300 |
| commit | 8008a2655c0f0c9b9890fb4866f774c9b50e170c (patch) | |
| tree | ec54af73611e686751dd74dd3f4a585198a91de5 /src/trace/perf.zig | |
| parent | 2e01933dc5c0c1903c1b7f86e453829fee9a541b (diff) | |
| download | computeranim-8008a2655c0f0c9b9890fb4866f774c9b50e170c.tar.gz computeranim-8008a2655c0f0c9b9890fb4866f774c9b50e170c.zip | |
kernel: on today's main
Symbols come from Symbols (perf.lookup is gone), string ids from
event.stringId, and ptrace.Process is used as it is now. A USDT
semaphore of the program itself is raised by the tracer: the kernel's
counter landed on the wrong word of a small lld-linked target, whose
page of the file is mapped writable twice. test-kernel also runs the
library tests of perf, usdt and bpf.
Co-Authored-By: Claude Fable 5.2 <[email protected]>
Diffstat (limited to 'src/trace/perf.zig')
| -rw-r--r-- | src/trace/perf.zig | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/src/trace/perf.zig b/src/trace/perf.zig index 36eaaf8..962996a 100644 --- a/src/trace/perf.zig +++ b/src/trace/perf.zig @@ -21,7 +21,6 @@ const std = @import("std"); const linux = std.os.linux; const event = @import("event.zig"); const ptrace = @import("ptrace.zig"); -const usdt = @import("usdt.zig"); const Event = event.Event; const Regs = event.Regs; const PERF = linux.PERF; @@ -31,12 +30,6 @@ pub const reading: u16 = 1; /// `aux` of a `fault` that needed I/O. pub const fault_major: u16 = 1; -/// The id a `string` event gives `text`: its hash, so that backends agree -/// without a registry. -pub fn stringId(text: []const u8) u64 { - return std.hash.Wyhash.hash(0, text); -} - /// What can be counted. Context switches and migrations are missing: their /// software events fire in kernel mode, which paranoid 2 excludes, so they /// always read 0 (`Options.switches` gives the switches as events instead). @@ -236,7 +229,7 @@ pub const Session = struct { var attr: linux.perf_event_attr = .{ .type = .BREAKPOINT, .sample_period_or_freq = 1, .bp_type = @backingInt(w.mode), .config1 = w.addr, .config2 = if (w.mode == .exec) 8 else w.len }; // Where it executes is known; what it was called with is not. if (w.mode == .exec) attr.sample_type = PERF.SAMPLE.REGS_USER; - try s.add(attr, .{ .watch = .{ .len = w.len, .mode = w.mode, .name = stringId(w.name) } }); + try s.add(attr, .{ .watch = .{ .len = w.len, .mode = w.mode, .name = event.stringId(w.name) } }); if (w.mode == .exec) try s.name(w.name); } @@ -298,7 +291,7 @@ pub const Session = struct { } fn name(s: *Session, text: []const u8) !void { - try s.sink.emit(.{ .ts = event.now(), .tid = @intCast(s.pid), .kind = .string, .a = .{ stringId(text), 0, 0, 0, 0, 0 } }, text); + try s.sink.emit(.{ .ts = event.now(), .tid = @intCast(s.pid), .kind = .string, .a = .{ event.stringId(text), 0, 0, 0, 0, 0 } }, text); } /// The mappings the target has now, from /proc: the kernel only reports @@ -323,7 +316,7 @@ pub const Session = struct { if (linux.read(fd, @ptrCast(&v), 24) != 24) continue; // A counter that had to share its hardware counted part of the time: scale it. count.* = if (v[2] != 0 and v[2] < v[1]) @intCast(@as(u128, v[0]) * v[1] / v[2]) else v[0]; - try s.sink.emit(.{ .ts = ts, .tid = @intCast(s.pid), .kind = .sample, .aux = reading, .a = .{ 0, stringId(@tagName(c)), count.*, 0, 0, 0 } }, ""); + try s.sink.emit(.{ .ts = ts, .tid = @intCast(s.pid), .kind = .sample, .aux = reading, .a = .{ 0, event.stringId(@tagName(c)), count.*, 0, 0, 0 } }, ""); } } @@ -417,7 +410,7 @@ pub const Session = struct { // The counter overflowed on the way into the kernel: not a place in the program. if (pc >> 63 != 0) return; ev.kind = .sample; - ev.a = .{ pc, stringId("cycles"), word(body, 48), addr, 0, 0 }; + ev.a = .{ pc, event.stringId("cycles"), word(body, 48), addr, 0, 0 }; var chain: []const u8 = ""; if (s.options.callchain) { // The first entry says "user space from here", not a pc. @@ -439,7 +432,7 @@ pub const Session = struct { .write => { // The value now: the target has run on since it wrote. var bytes: [8]u8 = undefined; - const n = (ptrace.Process{ .pid = s.pid }).read(addr, bytes[0..w.len]); + const n = (ptrace.Process{ .pid = s.pid, .tid = s.pid }).read(addr, bytes[0..w.len]); ev.kind = .mem_write; ev.a = .{ addr, w.len, pc, 0, 0, 0 }; try s.sink.emit(ev, bytes[0..n]); @@ -573,28 +566,6 @@ pub fn release(p: ptrace.Process) void { _ = linux.ptrace(linux.PTRACE.DETACH, p.pid, 0, 0, 0); } -pub const Symbol = struct { addr: u64, size: u64 }; - -/// Where `pid` has the symbol `name` now, looking through every ELF file -/// it has mapped, in address order. Shared libraries are there once the -/// dynamic loader has run, not at the first instruction. -pub fn lookup(gpa: std.mem.Allocator, pid: linux.pid_t, name: []const u8) !?Symbol { - const text = try readMaps(gpa, pid); - defer gpa.free(text); - var lines = std.mem.tokenizeScalar(u8, text, '\n'); - while (lines.next()) |line| { - const m = parseMap(line) orelse continue; - if (m.offset != 0 or m.path.len == 0 or m.path[0] != '/') continue; - const path = try gpa.dupeSentinel(u8, m.path, 0); - defer gpa.free(path); - const elf = usdt.Elf.open(path) catch continue; - defer elf.close(); - const sym = elf.symbol(name) orelse continue; - return .{ .addr = sym.value +% elf.bias(m.start), .size = sym.size }; - } - return null; -} - /// /proc/PID/maps, whole. Free with `gpa`. pub fn readMaps(gpa: std.mem.Allocator, pid: linux.pid_t) ![]u8 { var path_buf: [64]u8 = undefined; |
