summaryrefslogtreecommitdiff
path: root/src/cli
diff options
context:
space:
mode:
Diffstat (limited to 'src/cli')
-rw-r--r--src/cli/perf.zig53
-rw-r--r--src/cli/probe.zig31
2 files changed, 49 insertions, 35 deletions
diff --git a/src/cli/perf.zig b/src/cli/perf.zig
index 58f7d77..ea211fe 100644
--- a/src/cli/perf.zig
+++ b/src/cli/perf.zig
@@ -115,7 +115,7 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
const argv = try util.targetArgv(arena, args[i..]);
// Held at its first instruction until the events are on it.
var proc = try zt.ptrace.Process.spawn(path, argv, init.minimal.environ.block.slice.ptr);
- errdefer proc.kill();
+ errdefer proc.close();
var rec = try zt.Recorder.create(init.gpa, init.io, out);
if (max_bytes) |bytes| rec.max_bytes = bytes;
// What changes the state a moment holds (registers, memory) ends one.
@@ -127,19 +127,26 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
};
defer session.close();
+ // Symbols: the program's own from the start, a library's once the
+ // loader has mapped it, which is at the program's entry point.
+ var symbols: zt.Symbols = .{ .gpa = init.gpa, .io = init.io };
+ defer symbols.deinit();
+ symbols.free(try symbols.refresh(proc.pid));
var at_entry = false;
for (specs.items) |spec| {
- const sym: zt.perf.Symbol = if (std.fmt.parseInt(u64, spec.what, 0)) |addr| .{ .addr = addr, .size = 8 } else |_| found: {
- if (try zt.perf.lookup(init.gpa, proc.pid, spec.what)) |sym| break :found sym;
- // A library's symbol: there once the loader has mapped it.
- if (!at_entry) try runToEntry(&proc);
- at_entry = true;
- break :found try zt.perf.lookup(init.gpa, proc.pid, spec.what) orelse fail("{s}: no such symbol in what the program has mapped\n", .{spec.what});
+ const addr, const size = if (std.fmt.parseInt(u64, spec.what, 0)) |addr| .{ addr, 8 } else |_| found: {
+ if (symbols.find(spec.what) == null and !at_entry) {
+ try runTo(&proc, symbols.entryPoint() orelse fail("{s}: no symbols to be had from the program\n", .{spec.what}));
+ at_entry = true;
+ symbols.free(try symbols.refresh(proc.pid));
+ }
+ const sym = symbols.find(spec.what) orelse fail("{s}: no such symbol in what the program has mapped\n", .{spec.what});
+ break :found .{ sym.addr, sym.size };
};
- const len = spec.len orelse if (std.mem.indexOfScalar(u64, &.{ 1, 2, 4 }, sym.size)) |_| @as(u8, @intCast(sym.size)) else 8;
- session.watch(.{ .addr = sym.addr, .len = len, .mode = spec.mode, .name = spec.what }) catch |err| switch (err) {
+ const len = spec.len orelse if (std.mem.indexOfScalar(u64, &.{ 1, 2, 4 }, size)) |_| @as(u8, @intCast(size)) else 8;
+ session.watch(.{ .addr = addr, .len = len, .mode = spec.mode, .name = spec.what }) catch |err| switch (err) {
error.NoFreeBreakpoint => fail("{s}: no debug register left, there are four\n", .{spec.what}),
- error.PerfNoSuchEvent => fail("{s}: a watchpoint covers 1, 2, 4 or 8 bytes at an address aligned to that, not {d} at {x}\n", .{ spec.what, len, sym.addr }),
+ error.PerfNoSuchEvent => fail("{s}: a watchpoint covers 1, 2, 4 or 8 bytes at an address aligned to that, not {d} at {x}\n", .{ spec.what, len, addr }),
else => |e| return e,
};
}
@@ -150,7 +157,7 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
error.RecordingFull => null,
else => |e| return e,
};
- if (exit_code == null) proc.kill();
+ if (exit_code == null) proc.close();
const ns = zt.event.now() - start;
try finish(init, &rec, out, exit_code, session.lost, ns, options.counters, session.counts);
}
@@ -202,30 +209,18 @@ pub fn finish(init: std.process.Init, rec: *zt.Recorder, out: []const u8, exit_c
});
}
-/// Runs the held target up to its own entry point, where the dynamic
-/// loader is done and its libraries are mapped.
-fn runToEntry(proc: *zt.ptrace.Process) !void {
- var path_buf: [64]u8 = undefined;
- const fd = linux.open(try std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/auxv", .{proc.pid}, 0), .{}, 0);
- if (linux.errno(fd) != .SUCCESS) return error.NoSuchProcess;
- defer _ = linux.close(@intCast(fd));
- var auxv: [64][2]u64 = undefined;
- const n = linux.read(@intCast(fd), @ptrCast(&auxv), @sizeOf(@TypeOf(auxv)));
- if (linux.errno(n) != .SUCCESS) return error.NoSuchProcess;
- const entry = for (auxv[0 .. n / 16]) |pair| {
- if (pair[0] == std.elf.AT.ENTRY) break pair[1];
- } else return error.NoEntryPoint;
-
+/// Runs the held target up to `addr`, through a breakpoint there.
+fn runTo(proc: *zt.ptrace.Process, addr: u64) !void {
var saved: [1]u8 = undefined;
- if (proc.read(entry, &saved) != 1) return error.BadAddress;
- try proc.write(entry, &.{0xcc});
+ if (proc.read(addr, &saved) != 1) return error.BadAddress;
+ try proc.write(addr, &.{0xcc});
while (true) switch (try proc.cont()) {
.trap => break,
.exited, .killed => fail("the program ended before its entry point\n", .{}),
else => {},
};
- try proc.write(entry, &saved);
+ try proc.write(addr, &saved);
var regs = try proc.regs();
- regs.rip = entry;
+ regs.rip = addr;
try proc.setRegs(&regs);
}
diff --git a/src/cli/probe.zig b/src/cli/probe.zig
index 539af5c..311f2c0 100644
--- a/src/cli/probe.zig
+++ b/src/cli/probe.zig
@@ -106,7 +106,7 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
std.debug.print("{t} {s}: {s} +{x}", .{ p.kind, p.name, p.target, p.offset });
if (p.usdt) |u| std.debug.print(", semaphore at +{x}, arguments {s}", .{ if (u.semaphore == 0) 0 else p.elf.?.offset(u.semaphore) orelse 0, u.args });
std.debug.print("\n", .{});
- const id = zt.perf.stringId(p.name);
+ const id = zt.event.stringId(p.name);
list("its program: a probe", if (p.usdt) |u| bpf.usdtProgram(maps, 0, id, u.args) catch fail("{s}: an argument of this probe ({s}) is in a form not understood yet\n", .{ p.name, u.args }) else bpf.probe(maps, 0, id, null, p.kind != .kprobe));
}
std.debug.print("{s}\n", .{if (missing) |m| m else "nothing is missing to attach them"});
@@ -116,7 +116,7 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
const argv = try util.targetArgv(arena, args[i..]);
var proc = try zt.ptrace.Process.spawn(path, argv, init.minimal.environ.block.slice.ptr);
- errdefer proc.kill();
+ errdefer proc.close();
var rec = try zt.Recorder.create(init.gpa, init.io, out);
if (max_bytes) |bytes| rec.max_bytes = bytes;
// Two sources, the programs' ring and perf's: one sequence in the recording.
@@ -126,10 +126,27 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
defer tracer.close();
if (syscalls) tracer.syscalls() catch |err| refused(err, &tracer);
if (sched) tracer.sched(btf) catch |err| refused(err, &tracer);
+ var symbols: zt.Symbols = .{ .gpa = init.gpa, .io = init.io };
+ defer symbols.deinit();
+ symbols.free(try symbols.refresh(proc.pid));
for (places.items) |p| {
- const id = zt.perf.stringId(p.name);
+ const id = zt.event.stringId(p.name);
try sorted.sink().emit(.{ .ts = zt.event.now(), .kind = .string, .a = .{ id, 0, 0, 0, 0, 0 } }, p.name);
- (if (p.usdt) |u| tracer.usdtProbe(p.elf.?, p.target, u, id) else switch (p.kind) {
+ var static = p.usdt;
+ // A semaphore of the program itself is ours to raise: it is mapped,
+ // and held. The kernel's way, a counter at an offset of the file,
+ // lands on the wrong address when the linker has that page of the
+ // file mapped writable twice, as lld does; it is left what is not
+ // mapped yet, a library's.
+ if (static) |*u| if (u.semaphore != 0 and p.own and symbols.modules.items.len > 0) {
+ const at = u.semaphore +% symbols.modules.items[0].bias;
+ var count: [2]u8 = undefined;
+ if (proc.read(at, &count) != 2) fail("{s}: its semaphore is not in the program's memory\n", .{p.name});
+ std.mem.writeInt(u16, &count, std.mem.readInt(u16, &count, .little) +% 1, .little);
+ try proc.write(at, &count);
+ u.semaphore = 0;
+ };
+ (if (static) |u| tracer.usdtProbe(p.elf.?, p.target, u, id) else switch (p.kind) {
.kprobe => tracer.kprobe(p.target, id),
else => tracer.uprobe(p.target, p.offset, id),
}) catch |err| switch (err) {
@@ -148,7 +165,7 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
error.RecordingFull => null,
else => |e| return e,
};
- if (exit_code == null) proc.kill();
+ if (exit_code == null) proc.close();
try perf.finish(init, &rec, out, exit_code, tracer.lost() + session.lost, zt.event.now() - start, &.{}, &.{});
}
@@ -184,6 +201,8 @@ const Place = struct {
name: []const u8,
target: [:0]const u8,
offset: u64 = 0,
+ /// In the program itself, not a library of it.
+ own: bool = false,
elf: ?zt.usdt.Elf = null,
usdt: ?zt.usdt.Probe = null,
};
@@ -204,7 +223,7 @@ fn place(arena: std.mem.Allocator, p: Probe, program: [:0]const u8) !Place {
for (try zt.usdt.probes(arena, elf, 0)) |found| {
const colon = std.mem.indexOfScalar(u8, name, ':') orelse fail("--usdt wants [FILE:]PROVIDER:NAME\n", .{});
if (!std.mem.eql(u8, found.provider, name[0..colon]) or !std.mem.eql(u8, found.name, name[colon + 1 ..])) continue;
- return .{ .kind = .usdt, .name = name, .target = file, .offset = elf.offset(found.pc) orelse continue, .elf = elf, .usdt = found };
+ return .{ .kind = .usdt, .name = name, .target = file, .offset = elf.offset(found.pc) orelse continue, .own = !named, .elf = elf, .usdt = found };
}
fail("{s}: no static probe {s} (readelf -n lists them)\n", .{ file, name });
}