Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 7.58.x] [NTWK-557] Fix NPM sendpage probes in openSUSE 15rc6 #29733

Merged
merged 1 commit into from
Oct 3, 2024
Merged

[Backport 7.58.x] [NTWK-557] Fix NPM sendpage probes in openSUSE 15rc6 #29733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions pkg/network/tracer/connection/kprobe/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,25 @@ import (
"github.com/DataDog/datadog-agent/pkg/network/config"
"github.com/DataDog/datadog-agent/pkg/network/ebpf/probes"
"github.com/DataDog/datadog-agent/pkg/util/kernel"
"github.com/DataDog/datadog-agent/pkg/util/log"
)

// After kernel 6.5.0, tcp_sendpage and udp_sendpage are removed.
// We used to only check for kv < 6.5.0 here - however, OpenSUSE 15.6 backported
// this change into 6.4.0 to pick up a CVE so the version number is not reliable.
// Instead, we directly check if the function exists.
func hasTCPSendPage(kv kernel.Version) bool {
missing, err := ebpf.VerifyKernelFuncs("tcp_sendpage")
if err == nil {
return len(missing) == 0
}

log.Debugf("unable to determine whether tcp_sendpage exists, using kernel version instead: %s", err)

kv650 := kernel.VersionCode(6, 5, 0)
return kv < kv650
}

func enableProbe(enabled map[probes.ProbeFuncName]struct{}, name probes.ProbeFuncName) {
enabled[name] = struct{}{}
}
Expand All @@ -30,12 +47,14 @@ func enabledProbes(c *config.Config, runtimeTracer, coreTracer bool) (map[probes
kv4180 := kernel.VersionCode(4, 18, 0)
kv5180 := kernel.VersionCode(5, 18, 0)
kv5190 := kernel.VersionCode(5, 19, 0)
kv650 := kernel.VersionCode(6, 5, 0)

kv, err := kernel.HostVersion()
if err != nil {
return nil, err
}

hasSendPage := hasTCPSendPage(kv)

if c.CollectTCPv4Conns || c.CollectTCPv6Conns {
if ClassificationSupported(c) {
enableProbe(enabled, probes.ProtocolClassifierEntrySocketFilter)
Expand All @@ -47,7 +66,7 @@ func enabledProbes(c *config.Config, runtimeTracer, coreTracer bool) (map[probes
}
enableProbe(enabled, selectVersionBasedProbe(runtimeTracer, kv, probes.TCPSendMsg, probes.TCPSendMsgPre410, kv410))
enableProbe(enabled, probes.TCPSendMsgReturn)
if kv < kv650 {
if hasSendPage {
enableProbe(enabled, probes.TCPSendPage)
enableProbe(enabled, probes.TCPSendPageReturn)
}
Expand Down Expand Up @@ -81,7 +100,7 @@ func enabledProbes(c *config.Config, runtimeTracer, coreTracer bool) (map[probes
enableProbe(enabled, probes.IPMakeSkbReturn)
enableProbe(enabled, probes.InetBind)
enableProbe(enabled, probes.InetBindRet)
if kv < kv650 {
if hasSendPage {
enableProbe(enabled, probes.UDPSendPage)
enableProbe(enabled, probes.UDPSendPageReturn)
}
Expand Down Expand Up @@ -114,7 +133,7 @@ func enabledProbes(c *config.Config, runtimeTracer, coreTracer bool) (map[probes
enableProbe(enabled, probes.IP6MakeSkbReturn)
enableProbe(enabled, probes.Inet6Bind)
enableProbe(enabled, probes.Inet6BindRet)
if kv < kv650 {
if hasSendPage {
enableProbe(enabled, probes.UDPSendPage)
enableProbe(enabled, probes.UDPSendPageReturn)
}
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/fix-opensuse-15rc6-sendpage-11ba41034deaa721.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

---
fixes:
- |
Fixed issue with openSUSE 15 RC 6 where the eBPF tracer wouldn't start due to a failed validation of the ``tcp_sendpage`` probe.
Loading