Skip to content

Commit 9e95911

Browse files
authored
fix(bpf): Revert "optimize(bpf): Skip attaching {tcp,udp}_send* hooks when cgroup hooks are attached" (#204)
1 parent 9476d37 commit 9e95911

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

bpf/bpf.go

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -206,24 +206,18 @@ func (b *BPF) AttachKprobes() error {
206206
return fmt.Errorf(": %w", err)
207207
}
208208

209-
if b.skipAttachCgroup {
210-
err = b.attachFentryOrKprobe("tcp_sendmsg",
211-
b.objs.FentryTcpSendmsg, b.objs.KprobeTcpSendmsg)
212-
if err != nil {
213-
return fmt.Errorf(": %w", err)
214-
}
215-
216-
err = b.attachFentryOrKprobe("udp_send_skb", b.objs.FentryUdpSendSkb, b.objs.KprobeUdpSendSkb)
217-
if err != nil {
218-
log.Infof("%+v", err)
219-
if isProbeNotSupportErr(err) {
220-
err = b.attachFentryOrKprobe("udp_sendmsg", b.objs.FentryUdpSendmsg, b.objs.KprobeUdpSendmsg)
221-
if err != nil {
222-
return fmt.Errorf(": %w", err)
223-
}
224-
} else {
209+
if err := b.attachFentryOrKprobe("tcp_sendmsg", b.objs.FentryTcpSendmsg, b.objs.KprobeTcpSendmsg); err != nil {
210+
return fmt.Errorf(": %w", err)
211+
}
212+
if err := b.attachFentryOrKprobe("udp_send_skb", b.objs.FentryUdpSendSkb, b.objs.KprobeUdpSendSkb); err != nil {
213+
log.Infof("%+v", err)
214+
if isProbeNotSupportErr(err) {
215+
err = b.attachFentryOrKprobe("udp_sendmsg", b.objs.FentryUdpSendmsg, b.objs.KprobeUdpSendmsg)
216+
if err != nil {
225217
return fmt.Errorf(": %w", err)
226218
}
219+
} else {
220+
return fmt.Errorf(": %w", err)
227221
}
228222
}
229223

0 commit comments

Comments
 (0)