proc: include values in /proc/net/netstat#13338
Open
copybara-service[bot] wants to merge 1 commit into
Open
Conversation
Fixes #13151. `/proc/net/netstat` currently emits only the `TcpExt` field-name row in gVisor. Linux emits netstat rows in name/value pairs, and consumers such as metric parsers expect the value row to have the same number of fields as the header row. Without the value row, parsers report a field-count mismatch. This change keeps the existing `TcpExt` fields and emits a matching `TcpExt` value row populated with zeroes for the stats gVisor does not track yet. That resolves the header/data length mismatch without pretending to implement non-zero counters. I also added a proc unit test for matching name/value field counts and enabled the existing `/proc/net/netstat` syscall format check under gVisor. Validation: - `gofmt -w pkg/sentry/fsimpl/proc/task_net.go pkg/sentry/fsimpl/proc/tasks_sys_test.go` - `git diff --check` - attempted `bazel test //pkg/sentry/fsimpl/proc:proc_test //test/syscalls/linux:proc_net_test` on macOS; local Bazel failed before executing tests due the host toolchain missing C++ standard library headers for external deps. - attempted `SDKROOT=$(xcrun --show-sdk-path) ... bazel test //pkg/sentry/fsimpl/proc:proc_test`; local Bazel then failed before executing tests because `/usr/bin/aarch64-linux-gnu-gcc` is not installed. - attempted `go test ./pkg/sentry/fsimpl/proc`; unsupported for this repo checkout because generated proto packages/build-constrained files are provided through Bazel. FUTURE_COPYBARA_INTEGRATE_REVIEW=#13275 from Haihan-Jiang:codex/gvisor-netstat-values f1d47ac PiperOrigin-RevId: 924992742
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
proc: include values in /proc/net/netstat
Fixes #13151.
/proc/net/netstatcurrently emits only theTcpExtfield-name row in gVisor. Linux emits netstat rows in name/value pairs, and consumers such as metric parsers expect the value row to have the same number of fields as the header row. Without the value row, parsers report a field-count mismatch.This change keeps the existing
TcpExtfields and emits a matchingTcpExtvalue row populated with zeroes for the stats gVisor does not track yet. That resolves the header/data length mismatch without pretending to implement non-zero counters.I also added a proc unit test for matching name/value field counts and enabled the existing
/proc/net/netstatsyscall format check under gVisor.Validation:
gofmt -w pkg/sentry/fsimpl/proc/task_net.go pkg/sentry/fsimpl/proc/tasks_sys_test.gogit diff --checkbazel test //pkg/sentry/fsimpl/proc:proc_test //test/syscalls/linux:proc_net_teston macOS; local Bazel failed before executing tests due the host toolchain missing C++ standard library headers for external deps.SDKROOT=$(xcrun --show-sdk-path) ... bazel test //pkg/sentry/fsimpl/proc:proc_test; local Bazel then failed before executing tests because/usr/bin/aarch64-linux-gnu-gccis not installed.go test ./pkg/sentry/fsimpl/proc; unsupported for this repo checkout because generated proto packages/build-constrained files are provided through Bazel.FUTURE_COPYBARA_INTEGRATE_REVIEW=proc: include values in /proc/net/netstat #13275 from Haihan-Jiang:codex/gvisor-netstat-values f1d47ac