From 68aaf4e299184f5b293a8889df24cc63a53b753f Mon Sep 17 00:00:00 2001 From: codex Date: Tue, 17 Nov 2026 05:23:25 +0800 Subject: [PATCH] fix(agent): gate conntrack dumps by current entries --- agent/networkobserve/collector.go | 2 +- agent/networkobserve/netlink_linux.go | 34 +++++++++++----------- agent/networkobserve/netlink_linux_test.go | 24 +++++++++++++-- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/agent/networkobserve/collector.go b/agent/networkobserve/collector.go index a870d564..6ec6ec17 100644 --- a/agent/networkobserve/collector.go +++ b/agent/networkobserve/collector.go @@ -17,7 +17,7 @@ import ( const ( HardMaxObservedVMs = 4_096 // ti-mo/conntrack and mdlayher/netlink each retain a full dump before this - // package converts it. Keep the kernel-table ceiling materially below the + // package converts it. Keep the current-entry ceiling materially below the // contract's per-window aggregation ceiling so a query has a bounded peak. HardMaxKernelFlows = 262_144 DefaultRingCapacity = 16_384 diff --git a/agent/networkobserve/netlink_linux.go b/agent/networkobserve/netlink_linux.go index b4bf834f..cd1b847b 100644 --- a/agent/networkobserve/netlink_linux.go +++ b/agent/networkobserve/netlink_linux.go @@ -17,7 +17,7 @@ import ( ) const conntrackAccountingPath = "/proc/sys/net/netfilter/nf_conntrack_acct" -const conntrackMaxPath = "/proc/sys/net/netfilter/nf_conntrack_max" +const conntrackCountPath = "/proc/sys/net/netfilter/nf_conntrack_count" const defaultConntrackDumpTimeout = 10 * time.Second type conntrackDumper interface { @@ -39,14 +39,14 @@ func (dump *activeConntrackDump) Close() error { // NetlinkSource is intentionally read-only. The interface exposed here has no // Flush, Delete, Update, Create or socket-option mutation method. type NetlinkSource struct { - mu sync.Mutex - dial func() (conntrackDumper, error) - tableLimit func() (uint64, error) - dumpTimeout time.Duration - closed bool - nextDumpID uint64 - active map[uint64]*activeConntrackDump - inflight sync.WaitGroup + mu sync.Mutex + dial func() (conntrackDumper, error) + currentEntries func() (uint64, error) + dumpTimeout time.Duration + closed bool + nextDumpID uint64 + active map[uint64]*activeConntrackDump + inflight sync.WaitGroup } func OpenNetlinkSource() (*NetlinkSource, error) { @@ -56,13 +56,13 @@ func OpenNetlinkSource() (*NetlinkSource, error) { return nil, classifyNetlinkError(err) } return connection, nil - }, readConntrackTableLimit, defaultConntrackDumpTimeout), nil + }, readConntrackTableCount, defaultConntrackDumpTimeout), nil } -func newNetlinkSource(dial func() (conntrackDumper, error), tableLimit func() (uint64, error), +func newNetlinkSource(dial func() (conntrackDumper, error), currentEntries func() (uint64, error), dumpTimeout time.Duration) *NetlinkSource { return &NetlinkSource{ - dial: dial, tableLimit: tableLimit, dumpTimeout: dumpTimeout, + dial: dial, currentEntries: currentEntries, dumpTimeout: dumpTimeout, active: make(map[uint64]*activeConntrackDump), } } @@ -82,11 +82,11 @@ func (source *NetlinkSource) Snapshot(ctx context.Context) (KernelSnapshot, erro if err := ctx.Err(); err != nil { return KernelSnapshot{}, err } - if source.tableLimit == nil { + if source.currentEntries == nil { return KernelSnapshot{}, ErrConntrackUnavailable } - tableLimit, err := source.tableLimit() - if err != nil || tableLimit == 0 || tableLimit > HardMaxKernelFlows { + currentEntries, err := source.currentEntries() + if err != nil || currentEntries > HardMaxKernelFlows { return KernelSnapshot{}, ErrConntrackUnavailable } if source.dial == nil { @@ -185,8 +185,8 @@ func (source *NetlinkSource) release(dumpID uint64, active *activeConntrackDump) source.inflight.Done() } -func readConntrackTableLimit() (uint64, error) { - value, err := os.ReadFile(conntrackMaxPath) +func readConntrackTableCount() (uint64, error) { + value, err := os.ReadFile(conntrackCountPath) if err != nil { return 0, err } diff --git a/agent/networkobserve/netlink_linux_test.go b/agent/networkobserve/netlink_linux_test.go index 0be08ade..836cf587 100644 --- a/agent/networkobserve/netlink_linux_test.go +++ b/agent/networkobserve/netlink_linux_test.go @@ -42,9 +42,15 @@ func (dumper *fakeConntrackDumper) calls() (int, int) { return dumper.dumpCalls, dumper.closeCalls } -func sourceForDumper(dumper conntrackDumper, tableLimit uint64) *NetlinkSource { +func sourceForDumper(dumper conntrackDumper, currentEntries uint64) *NetlinkSource { return newNetlinkSource(func() (conntrackDumper, error) { return dumper, nil }, - func() (uint64, error) { return tableLimit, nil }, time.Second) + func() (uint64, error) { return currentEntries, nil }, time.Second) +} + +func TestNetlinkSourceSafetyInputIsCurrentConntrackCount(t *testing.T) { + if conntrackCountPath != "/proc/sys/net/netfilter/nf_conntrack_count" { + t.Fatalf("conntrack safety input = %q", conntrackCountPath) + } } func TestNetlinkSourceConvertsOriginalTupleReadOnly(t *testing.T) { @@ -75,7 +81,19 @@ func TestNetlinkSourceConvertsOriginalTupleReadOnly(t *testing.T) { } } -func TestNetlinkSourceRefusesUnboundedKernelTableBeforeDump(t *testing.T) { +func TestNetlinkSourceAllowsEmptyCurrentTable(t *testing.T) { + dumper := &fakeConntrackDumper{} + source := sourceForDumper(dumper, 0) + if _, err := source.Snapshot(context.Background()); err != nil { + t.Fatal(err) + } + dumpCalls, _ := dumper.calls() + if dumpCalls != 1 { + t.Fatalf("Dump calls = %d", dumpCalls) + } +} + +func TestNetlinkSourceRefusesCurrentTableAboveBudgetBeforeDump(t *testing.T) { dumper := &fakeConntrackDumper{} source := sourceForDumper(dumper, HardMaxKernelFlows+1) if _, err := source.Snapshot(context.Background()); !errors.Is(err, ErrConntrackUnavailable) {