From 4e55600f8b8735364a1386faf81ee76e29ae4c7d Mon Sep 17 00:00:00 2001 From: Nicholas Berlin Date: Tue, 8 Jul 2025 11:29:20 -0400 Subject: [PATCH] Do not load or test DNS probes --- non-GPL/Events/Lib/EbpfEvents.c | 4 ++++ testing/testrunner/ebpf_test.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/non-GPL/Events/Lib/EbpfEvents.c b/non-GPL/Events/Lib/EbpfEvents.c index 2a9f6db4..2b6a79b4 100644 --- a/non-GPL/Events/Lib/EbpfEvents.c +++ b/non-GPL/Events/Lib/EbpfEvents.c @@ -417,6 +417,7 @@ static int probe_set_autoload(struct btf *btf, struct EventProbe_bpf *obj, uint6 return err; } +#if 0 // Do not load DNS probes static int probe_attach_cgroup(struct EventProbe_bpf *obj) { int cgroup_fd; @@ -446,6 +447,7 @@ static int probe_attach_cgroup(struct EventProbe_bpf *obj) return 0; } +#endif static bool system_has_bpf_tramp(void) { @@ -790,11 +792,13 @@ int ebpf_event_ctx__new(struct ebpf_event_ctx **ctx, ebpf_event_handler_fn cb, u goto out_destroy_probe; } +#if 0 // Do not load DNS probes err = probe_attach_cgroup(probe); if (err != 0) { verbose("probe_attach_cgroup: %d\n", err); goto out_destroy_probe; } +#endif if (!ctx) goto out_destroy_probe; diff --git a/testing/testrunner/ebpf_test.go b/testing/testrunner/ebpf_test.go index 18619126..3cf88362 100644 --- a/testing/testrunner/ebpf_test.go +++ b/testing/testrunner/ebpf_test.go @@ -773,7 +773,7 @@ func TestEbpf(t *testing.T) { {"Tcpv4ConnectionAttempt", Tcpv4ConnectionAttempt, []string{"--net-conn-attempt"}, false}, {"Tcpv4ConnectionAccept", Tcpv4ConnectionAccept, []string{"--net-conn-accept"}, false}, {"Tcpv4ConnectionClose", Tcpv4ConnectionClose, []string{"--net-conn-close"}, false}, - {"DNSMonitor", DNSMonitor, []string{"--net-conn-dns-pkt"}, false}, + //{"DNSMonitor", DNSMonitor, []string{"--net-conn-dns-pkt"}, false}, {"Ptrace", Ptrace, []string{"--process-ptrace"}, false}, {"Shmget", Shmget, []string{"--process-shmget"}, false}, {"MemfdCreate", MemfdCreate, []string{"--process-memfd-create", "--process-exec"}, false},