Merge pull request #2507 from kinvolk/alban/perf-map-fixes

ebpf connection tracker: perf map fixes
weaveworks · May 16, 2017 · 5079c11 · 5079c11
2 parents 61007dc + 9079677
commit 5079c11
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 43 deletions.
diff --git a/probe/endpoint/ebpf.go b/probe/endpoint/ebpf.go
@@ -82,7 +82,7 @@ func newEbpfTracker() (eventTracker, error) {
 		return nil, fmt.Errorf("kernel not supported: %v", err)
 	}
 
-	t, err := tracer.NewTracer(tcpEventCbV4, tcpEventCbV6)
+	t, err := tracer.NewTracer(tcpEventCbV4, tcpEventCbV6, lostCb)
 	if err != nil {
 		return nil, err
 	}
@@ -119,6 +119,12 @@ func tcpEventCbV6(e tracer.TcpV6) {
 	// TODO: IPv6 not supported in Scope
 }
 
+func lostCb(count uint64) {
+	log.Errorf("tcp tracer lost %d events. Stopping the eBPF tracker", count)
+	ebpfTracker.dead = true
+	ebpfTracker.stop()
+}
+
 func (t *EbpfTracker) handleConnection(ev tracer.EventType, tuple fourTuple, pid int, networkNamespace string) {
 	t.Lock()
 	defer t.Unlock()

diff --git a/vendor/github.com/iovisor/gobpf/elf/elf.go b/vendor/github.com/iovisor/gobpf/elf/elf.go
diff --git a/vendor/github.com/iovisor/gobpf/elf/elf_unsupported.go b/vendor/github.com/iovisor/gobpf/elf/elf_unsupported.go
diff --git a/vendor/github.com/iovisor/gobpf/elf/perf.go b/vendor/github.com/iovisor/gobpf/elf/perf.go
diff --git a/vendor/github.com/iovisor/gobpf/elf/table.go b/vendor/github.com/iovisor/gobpf/elf/table.go
diff --git a/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/tracer.go b/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/tracer.go
diff --git a/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/tracer_unsupported.go b/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/tracer_unsupported.go
diff --git a/vendor/github.com/weaveworks/tcptracer-bpf/tests/tracer.go b/vendor/github.com/weaveworks/tcptracer-bpf/tests/tracer.go