shim: add support for containerd v2 metrics #11473
Open
Conversation
This file contains 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
|
Testing this change on AWS AL2022 vs AL2023:
Commands used for testing: CPU: The difference between runC and gVisor might be a separate issue. |
|
Thanks for the PR! |
milantracy
reviewed
Feb 14, 2025
|
thanks for the patch! LGTM |
Champ-Goblem
force-pushed
the
shim-add-cgroup-v2-metrics-support
branch
from
ec422c0 to
b3701c8
Compare
milantracy
pushed a commit
to milantracy/gvisor
that referenced
this pull request
Feb 19, 2025
DO NOT SUBMIT Signed-off-by: Champ-Goblem <[email protected]>
milantracy
reviewed
Feb 19, 2025
milantracy
reviewed
Feb 19, 2025
| @@ -31,6 +31,7 @@ go_library( | |||
| "@com_github_containerd_cgroups//:go_default_library", | |||
| "@com_github_containerd_cgroups//stats/v1:go_default_library", | |||
| "@com_github_containerd_cgroups//v2:go_default_library", | |||
| "@com_github_containerd_cgroups//v2/stats:go_default_library", | |||
There was a problem hiding this comment.
our internal pipeline is missing the rule to translate the package, it blocks the submission.
i will fix that in our pipeline
Add support for v2 containerd metrics in the shim, v2 metrics are only used when runsc is run with --system-cgroup=true. Containerd requires v2 metrics when the host is run with CGroupsV2. This issue was noticed when attempting to gather metrics on AL2023 which defaults to CGroupsV2. Fixes: google#11472 Signed-off-by: Champ-Goblem <[email protected]>
Champ-Goblem
force-pushed
the
shim-add-cgroup-v2-metrics-support
branch
from
b3701c8 to
b602afb
Compare
copybara-service bot
pushed a commit
that referenced
this pull request
Feb 21, 2025
Add support for v2 containerd metrics in the shim, v2 metrics are only used when runsc is run with --system-cgroup=true. Containerd requires v2 metrics when the host is run with CGroupsV2. This issue was noticed when attempting to gather metrics on AL2023 which defaults to CGroupsV2. Fixes: #11472 FUTURE_COPYBARA_INTEGRATE_REVIEW=#11473 from Champ-Goblem:shim-add-cgroup-v2-metrics-support b602afb PiperOrigin-RevId: 729301568
copybara-service bot
pushed a commit
that referenced
this pull request
Feb 21, 2025
Add support for v2 containerd metrics in the shim, v2 metrics are only used when runsc is run with --system-cgroup=true. Containerd requires v2 metrics when the host is run with CGroupsV2. This issue was noticed when attempting to gather metrics on AL2023 which defaults to CGroupsV2. Fixes: #11472 FUTURE_COPYBARA_INTEGRATE_REVIEW=#11473 from Champ-Goblem:shim-add-cgroup-v2-metrics-support b602afb PiperOrigin-RevId: 729301568
copybara-service bot
pushed a commit
that referenced
this pull request
Feb 21, 2025
Add support for v2 containerd metrics in the shim, v2 metrics are only used when runsc is run with --system-cgroup=true. Containerd requires v2 metrics when the host is run with CGroupsV2. This issue was noticed when attempting to gather metrics on AL2023 which defaults to CGroupsV2. Fixes: #11472 FUTURE_COPYBARA_INTEGRATE_REVIEW=#11473 from Champ-Goblem:shim-add-cgroup-v2-metrics-support b602afb PiperOrigin-RevId: 729301568
copybara-service bot
pushed a commit
that referenced
this pull request
Feb 21, 2025
By default, private anonymous memory mappings in Linux use transparent hugepages when available (/sys/kernel/mm/transparent_hugepage/enabled=always); when hugepages are not available (typically due to fragmentation), such mappings fall back to small pages instead (/sys/kernel/mm/transparent_hugepage/defrag=madvise). See Linux's Documentation/admin-guide/mm/transhuge.rst. In gVisor, application private anonymous memory cannot generally be backed by host private anonymous memory, since in many platforms, applications and the sentry (which also needs to map application memory) run in different host processes. Instead, application private anonymous memory is backed by a host memfd, managed by pgalloc.MemoryFile. By default, Linux memfds never use transparent hugepages (/sys/kernel/mm/transparent_hugepage/shmem_enabled=never); thus runsc/hostsettings sets shmem_enabled=madvise, allowing pgalloc to request transparent hugepages using madvise(MADV_HUGEPAGE). However, since the default value of /sys/kernel/mm/transparent_hugepage/defrag is madvise, MADV_HUGEPAGE has the unintended side effect of enabling direct compaction: when hugepages are not available, the host kernel will attempt to form free hugepages by defragmenting small pages. This can be very expensive, which is why (as described above) Linux doesn't do it by default. Thus: - When MADV_HUGEPAGE is required for application THP, only enable it if /sys/kernel/mm/transparent_hugepage/defrag specifies an operating mode that does not result in more direct compaction than a normal private anonymous mapping would. - Adjust /sys/kernel/mm/transparent_hugepage/defrag accordingly in runsc/hostsettings. FUTURE_COPYBARA_INTEGRATE_REVIEW=#11473 from Champ-Goblem:shim-add-cgroup-v2-metrics-support b602afb PiperOrigin-RevId: 728838338
copybara-service bot
pushed a commit
that referenced
this pull request
Feb 21, 2025
By default, private anonymous memory mappings in Linux use transparent hugepages when available (/sys/kernel/mm/transparent_hugepage/enabled=always); when hugepages are not available (typically due to fragmentation), such mappings fall back to small pages instead (/sys/kernel/mm/transparent_hugepage/defrag=madvise). See Linux's Documentation/admin-guide/mm/transhuge.rst. In gVisor, application private anonymous memory cannot generally be backed by host private anonymous memory, since in many platforms, applications and the sentry (which also needs to map application memory) run in different host processes. Instead, application private anonymous memory is backed by a host memfd, managed by pgalloc.MemoryFile. By default, Linux memfds never use transparent hugepages (/sys/kernel/mm/transparent_hugepage/shmem_enabled=never); thus runsc/hostsettings sets shmem_enabled=madvise, allowing pgalloc to request transparent hugepages using madvise(MADV_HUGEPAGE). However, since the default value of /sys/kernel/mm/transparent_hugepage/defrag is madvise, MADV_HUGEPAGE has the unintended side effect of enabling direct compaction: when hugepages are not available, the host kernel will attempt to form free hugepages by defragmenting small pages. This can be very expensive, which is why (as described above) Linux doesn't do it by default. Thus: - When MADV_HUGEPAGE is required for application THP, only enable it if /sys/kernel/mm/transparent_hugepage/defrag specifies an operating mode that does not result in more direct compaction than a normal private anonymous mapping would. - Adjust /sys/kernel/mm/transparent_hugepage/defrag accordingly in runsc/hostsettings. FUTURE_COPYBARA_INTEGRATE_REVIEW=#11473 from Champ-Goblem:shim-add-cgroup-v2-metrics-support b602afb PiperOrigin-RevId: 728838338
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add support for v2 containerd metrics in the shim, v2 metrics are only used when runsc is run with --system-cgroup=true. Containerd requires v2 metrics when the host is run with CGroupsV2. This issue was noticed when attempting to gather metrics on AL2023 which defaults to CGroupsV2.
Fixes: #11472