selftests/bpf: Move stacktrace_map_raw_tp test to stacktrace_map object

Signed-off-by: Jiri Olsa <[email protected]>

Author: olsajiri

tools/testing/selftests/bpf/prog_tests/stacktrace_map.c

@@ -2,7 +2,7 @@
 #include <test_progs.h>
 #include "stacktrace_map.skel.h"
 
-void test_stacktrace_map(void)
+static void test_stacktrace_map_tp(bool raw_tp)
 {
 	struct stacktrace_map *skel;
 	int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd;
@@ -19,8 +19,13 @@ void test_stacktrace_map(void)
 	stackmap_fd = bpf_map__fd(skel->maps.stackmap);
 	stack_amap_fd = bpf_map__fd(skel->maps.stack_amap);
 
-	err = stacktrace_map__attach(skel);
-	if (!ASSERT_OK(err, "skel_attach"))
+	if (raw_tp) {
+		skel->links.tp = bpf_program__attach_raw_tracepoint(skel->progs.raw_tp, "sched_switch");
+	} else {
+		skel->links.tp = bpf_program__attach_tracepoint(skel->progs.tp, "sched", "sched_switch");
+	}
+
+	if (!ASSERT_OK_PTR(skel->links.tp, "attach"))
 		goto out;
 	/* give some time for bpf program run */
 	sleep(1);
@@ -60,3 +65,11 @@ void test_stacktrace_map(void)
 out:
 	stacktrace_map__destroy(skel);
 }
+
+void test_stacktrace_map(void)
+{
+	if (test__start_subtest("tp"))
+		test_stacktrace_map_tp(false);
+	if (test__start_subtest("raw_tp"))
+		test_stacktrace_map_tp(true);
+}

tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c

@@ -51,27 +51,44 @@ struct sched_switch_args {
 };
 
 __u32 stack_id;
-SEC("tracepoint/sched/sched_switch")
-int oncpu(struct sched_switch_args *ctx)
+static inline void test_stackmap(void *ctx, int skip)
 {
 	__u32 max_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
 	__u32 key = 0, val = 0, *value_p;
 	void *stack_p;
 
 	value_p = bpf_map_lookup_elem(&control_map, &key);
 	if (value_p && *value_p)
-		return 0; /* skip if non-zero *value_p */
+		return; /* skip if non-zero *value_p */
 
 	/* The size of stackmap and stackid_hmap should be the same */
-	key = bpf_get_stackid(ctx, &stackmap, 0);
+	key = bpf_get_stackid(ctx, &stackmap, (u64) skip);
 	if ((int)key >= 0) {
 		stack_id = key;
 		bpf_map_update_elem(&stackid_hmap, &key, &val, 0);
 		stack_p = bpf_map_lookup_elem(&stack_amap, &key);
 		if (stack_p)
-			bpf_get_stack(ctx, stack_p, max_len, 0);
+			bpf_get_stack(ctx, stack_p, max_len, (u64) skip);
 	}
+}
+
+SEC("tracepoint/sched/sched_switch")
+int tp(struct sched_switch_args *ctx)
+{
+	test_stackmap(ctx, 0);
+	return 0;
+}
 
+#if defined(__TARGET_ARCH_x86)
+#define TRACING_SKIP 1
+#else
+#define TRACING_SKIP 2
+#endif
+
+SEC("raw_tp/sched/sched_switch")
+int raw_tp(struct sched_switch_args *ctx)
+{
+	test_stackmap(ctx, TRACING_SKIP);
 	return 0;
 }