libbpf-tools: Allow offcputime to run on kernels without BPF trampoline

Another compatibility game, allow offcputime to run on kernels without BPF trampoline using raw tracepoint. Signed-off-by: Hengqi Chen <[email protected]>
iovisor · Nov 9, 2024 · d9eec93 · d9eec93
1 parent 91de381
commit d9eec93
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/libbpf-tools/offcputime.bpf.c b/libbpf-tools/offcputime.bpf.c
@@ -58,53 +58,50 @@ struct {
 
 static bool allow_record(struct task_struct *t)
 {
-	u32 tgid = t->tgid;
-	u32 pid = t->pid;
+	u32 tgid = BPF_CORE_READ(t, tgid);
+	u32 pid = BPF_CORE_READ(t, pid);
 
 	if (filter_by_tgid && !bpf_map_lookup_elem(&tgids, &tgid))
 		return false;
 	if (filter_by_pid && !bpf_map_lookup_elem(&pids, &pid))
 		return false;
-	if (user_threads_only && t->flags & PF_KTHREAD)
+	if (user_threads_only && (BPF_CORE_READ(t, flags) & PF_KTHREAD))
 		return false;
-	else if (kernel_threads_only && !(t->flags & PF_KTHREAD))
+	else if (kernel_threads_only && !(BPF_CORE_READ(t, flags) & PF_KTHREAD))
 		return false;
 	if (state != -1 && get_task_state(t) != state)
 		return false;
 	return true;
 }
 
-SEC("tp_btf/sched_switch")
-int BPF_PROG(sched_switch, bool preempt, struct task_struct *prev, struct task_struct *next)
+static int handle_sched_switch(void *ctx, bool preempt, struct task_struct *prev, struct task_struct *next)
 {
 	struct internal_key *i_keyp, i_key;
 	struct val_t *valp, val;
 	s64 delta;
 	u32 pid;
 
 	if (allow_record(prev)) {
-		pid = prev->pid;
+		pid = BPF_CORE_READ(prev, pid);
 		/* To distinguish idle threads of different cores */
 		if (!pid)
 			pid = bpf_get_smp_processor_id();
 		i_key.key.pid = pid;
-		i_key.key.tgid = prev->tgid;
+		i_key.key.tgid = BPF_CORE_READ(prev, tgid);
 		i_key.start_ts = bpf_ktime_get_ns();
 
-		if (prev->flags & PF_KTHREAD)
+		if (BPF_CORE_READ(prev, flags) & PF_KTHREAD)
 			i_key.key.user_stack_id = -1;
 		else
-			i_key.key.user_stack_id =
-				bpf_get_stackid(ctx, &stackmap,
-						BPF_F_USER_STACK);
+			i_key.key.user_stack_id = bpf_get_stackid(ctx, &stackmap, BPF_F_USER_STACK);
 		i_key.key.kern_stack_id = bpf_get_stackid(ctx, &stackmap, 0);
 		bpf_map_update_elem(&start, &pid, &i_key, 0);
-		bpf_probe_read_kernel_str(&val.comm, sizeof(prev->comm), prev->comm);
+		bpf_probe_read_kernel_str(&val.comm, sizeof(prev->comm), BPF_CORE_READ(prev, comm));
 		val.delta = 0;
 		bpf_map_update_elem(&info, &i_key.key, &val, BPF_NOEXIST);
 	}
 
-	pid = next->pid;
+	pid = BPF_CORE_READ(next, pid);
 	i_keyp = bpf_map_lookup_elem(&start, &pid);
 	if (!i_keyp)
 		return 0;
@@ -124,4 +121,16 @@ int BPF_PROG(sched_switch, bool preempt, struct task_struct *prev, struct task_s
 	return 0;
 }
 
+SEC("tp_btf/sched_switch")
+int BPF_PROG(sched_switch, bool preempt, struct task_struct *prev, struct task_struct *next)
+{
+	return handle_sched_switch(ctx, preempt, prev, next);
+}
+
+SEC("raw_tp/sched_switch")
+int BPF_PROG(sched_switch_raw, bool preempt, struct task_struct *prev, struct task_struct *next)
+{
+	return handle_sched_switch(ctx, preempt, prev, next);
+}
+
 char LICENSE[] SEC("license") = "GPL";
diff --git a/libbpf-tools/offcputime.c b/libbpf-tools/offcputime.c
@@ -376,6 +376,11 @@ int main(int argc, char **argv)
 				env.perf_max_stack_depth * sizeof(unsigned long));
 	bpf_map__set_max_entries(obj->maps.stackmap, env.stack_storage_size);
 
+	if (!probe_tp_btf("sched_switch"))
+		bpf_program__set_autoload(obj->progs.sched_switch, false);
+	else
+		bpf_program__set_autoload(obj->progs.sched_switch_raw, false);
+
 	err = offcputime_bpf__load(obj);
 	if (err) {
 		fprintf(stderr, "failed to load BPF programs\n");