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

Jump to bottom

Determine any memory/CPU limitations from sysfs cgroup #74237

Merged
merged 5 commits into from
Aug 31, 2022
Merged

Determine any memory/CPU limitations from sysfs cgroup #74237

merged 5 commits into from
Aug 31, 2022

Conversation

nealef
Copy link
Contributor

@nealef nealef commented Aug 19, 2022

Add capability to interrogate cgroup limitations when determining CP and memory limits

This code has been adapted from coreCLR. It has been modified from C++ but uses the same naming conventions in the event of a unified mechanism that can be shared between both runtimes being developed. The code has been tested on Ubuntu 20.04 and CentOS 7 with cgroupv1 and cgroupv2.

This code is required in the event of running runtime in a container as the current limitations being discovered by the mono runtime are purely for the machine and not in a container which may have lower quotas.

  • src/mono/CMakeLists.txt

    • Set the HAVE_CGROUP_SUPPORT for Linux hosts

  • src/mono/cmake/config.h.in

    • Place holder for HAVE_CGROU_SUPPORT definition

  • src/mono/mono/metadata/icall.c

  • src/mono/mono/sgen/sgen-marksweep.c

  • src/mono/mono/sgen/sgen-simple-nursery.c

    • Use mono_cpu_limit() instead of mono_cpu_count()

  • src/mono/mono/utils/CMakeLists.txt

    • Add mono-cgroup.c to the build

  • src/mono/mono/utils/memfuncs.c

    • Call getRestrictedPhysicalMemoryLimit() or getPhyscalMemoryAvail()

  • src/mono/mono/utils/memfuncs.h

    • Add prototypes for the new APIs

  • src/mono/mono/utils/mono-cgroup.c

    • Code adapted from coreCLR to interrogate sysfs to determine any limitations on memory or CPU

  • src/mono/mono/utils/mono-proclib.c

    • Add call to getCpuLimit()

  • src/mono/mono/utils/mono-proclib.h

    • Add prototype for the new API

@nealef
Determine any memory/CPU limitations from sysfs cgroup (#21280)
c2c7ced 
Add capability to interrogate cgroup limitations when determining CP and memory limits

This code has been adapted from coreCLR. It has been modified from C++ but uses the same naming conventions in the event of a unified mechanism that can be shared between both runtimes being developed. The code has been tested on Ubuntu 20.04 and CentOS 7 with cgroupv1 and cgroupv2.

This code is required in the event of running runtime in a container as the current limitations being discovered by the mono runtime are purely for the machine and not in a container which may have lower quotas.

* src/mono/CMakeLists.txt
  - Set the HAVE_CGROUP_SUPPORT for Linux hosts

* src/mono/cmake/config.h.in
  - Place holder for HAVE_CGROU_SUPPORT definition

* src/mono/mono/metadata/icall.c
* src/mono/mono/sgen/sgen-marksweep.c
* src/mono/mono/sgen/sgen-simple-nursery.c
  - Use mono_cpu_limit() instead of mono_cpu_count()

* src/mono/mono/utils/CMakeLists.txt
  - Add mono-cgroup.c to the build

* src/mono/mono/utils/memfuncs.c
  - Call `getRestrictedPhysicalMemoryLimit()` or `getPhyscalMemoryAvail()`

* src/mono/mono/utils/memfuncs.h
  - Add prototypes for the new APIs

* src/mono/mono/utils/mono-cgroup.c
  - Code adapted from coreCLR to interrogate sysfs to determine any limitations on memory or CPU

* src/mono/mono/utils/mono-proclib.c
  - Add call to `getCpuLimit()`

* src/mono/mono/utils/mono-proclib.h
  - Add prototype for the new API
@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Aug 19, 2022
@nealef nealef mentioned this pull request Aug 22, 2022
Open
@nealef nealef marked this pull request as ready for review August 23, 2022 08:56
@naricc
Copy link
Contributor

naricc commented Aug 23, 2022

If this code is adapated from CoreCLR, is there a plan to share the code eventually, or need it all be duplicated?

lambdageek
lambdageek reviewed Aug 24, 2022
View reviewed changes
src/mono/mono/utils/mono-proclib.h Show resolved Hide resolved
src/mono/mono/utils/mono-proclib.c Outdated Show resolved Hide resolved
src/mono/mono/utils/mono-cgroup.c Show resolved Hide resolved
lambdageek
lambdageek reviewed Aug 24, 2022
View reviewed changes
src/mono/mono/utils/mono-proclib.c Outdated Show resolved Hide resolved
src/mono/mono/utils/mono-proclib.c Outdated Show resolved Hide resolved
src/mono/mono/utils/mono-proclib.c Outdated Show resolved Hide resolved
src/mono/mono/utils/mono-proclib.h Outdated Show resolved Hide resolved
src/mono/mono/utils/memfuncs.c Outdated Show resolved Hide resolved
lambdageek
lambdageek approved these changes Aug 25, 2022
View reviewed changes
Copy link
Member

@lambdageek lambdageek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SamMonoRT I think we want to take a backport of this for net7. I don't think this will impact mobile or wasm. (But the "DOTNET_PROCESSOR_COUNT" support might be a nice thing to bring along on those platforms for diagnostic scenarios)

@SamMonoRT
Copy link
Member

@SamMonoRT I think we want to take a backport of this for net7. I don't think this will impact mobile or wasm. (But the "DOTNET_PROCESSOR_COUNT" support might be a nice thing to bring along on those platforms for diagnostic scenarios)

Yes, once all suggestions are addressed and CI lanes look green, will issue a backport command.

@SamMonoRT
Copy link
Member

@nealef - please let us know when all suggested changes are completed.

@nealef
Copy link
Contributor Author

nealef commented Aug 29, 2022

The only one missing is the explicit cast from strtol(). I am having VPN problems today so I haven't been able to push. All other suggestions should have been pushed.

@nealef
* mono-cgroup.c
8942a4c 
  - Adhere to call statement convention
  - Remove unnecessary cast
* mono-proclib.c
  - Explicit cast
@akoeplinger akoeplinger merged commit 5119157 into dotnet:main Aug 31, 2022
@akoeplinger
Copy link
Member

/backport to release/7.0

@github-actions
Copy link
Contributor

Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/2965665895

@github-actions github-actions bot mentioned this pull request Aug 31, 2022
Merged
@nealef nealef deleted the mono_cgroup branch September 1, 2022 06:58
@BrzVlad BrzVlad mentioned this pull request Sep 29, 2022
Merged
@ghost ghost locked as resolved and limited conversation to collaborators Oct 1, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@naricc naricc naricc left review comments

@akoeplinger akoeplinger akoeplinger approved these changes

@lambdageek lambdageek lambdageek approved these changes

@vargaz vargaz Awaiting requested review from vargaz

@BrzVlad BrzVlad Awaiting requested review from BrzVlad BrzVlad is a code owner

@thaystg thaystg Awaiting requested review from thaystg thaystg is a code owner

@marek-safar marek-safar Awaiting requested review from marek-safar

Assignees
No one assigned
Labels
area-VM-meta-mono community-contribution Indicates that the PR has been added by a community member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nealef @naricc @SamMonoRT @akoeplinger @lambdageek @teo-tsirpanis