Sync cgroup v2 in libraries with coreclr - #34665

Tagging @eiriktsarpalis as an area owner

cc @tmds

@stephentoub CI is green now, can you please review this again?

@omajid What are you doing to test this? I'll give it a try also.

@omajid What are you doing to test this? I'll give it a try also.

Not much: relying on unit tests to make sure the file parsing and the path computations are still correct. The output from DescriptionNameTests verifes that the cgroup version is identified correctly.

I also want to try the corresponding runtime change. Any suggestions for that?

I also want to try the corresponding runtime change. Any suggestions for that?

Heh, I stole your idea for a runtime test :)

My runtime test is the one at #34287. Copying it here for easy of use:

#include "cgroup.cpp"
int main(int, char *[])
{
    InitializeCGroup();
    printf("initialized cgroup\n");

    size_t physical_memory_limit = GetRestrictedPhysicalMemoryLimit();
    printf("GetResitrictedPhysicalMemoryLimit: %lu\n", physical_memory_limit);

    size_t used_memory = 0;
    bool okay_memory_used = GetPhysicalMemoryUsed(&used_memory);
    printf("GetPhysicalMemoryUsed: %d %lu\n", okay_memory_used, used_memory);

    uint32_t cpu_limit = 0;
    bool okay_cpu_limit = GetCpuLimit(&cpu_limit);
    printf("GetCpuLimit: %d %u\n", okay_cpu_limit, cpu_limit);

    CleanupCGroup();
    printf("cleaned up cgroups\n");
    return 0;
}

You need to change the path to point to the non-pal version of cgroup.cpp in the runtime. I build this into a cg executible. Then put it in a container:

FROM fedora:31
RUN dnf install gdb -y
ADD * / 
#CMD gdb /cg
CMD /cg 

Then the container should work on all Fedora versions and report the correct values:

podman build -t cg .
podman run --cap-add=SYS_PTRACE --cpus=3 --memory=400M -it cg

On Fedora 31, cgroupv2 is used. You can switch to cgroupv1 using:

sudo dnf install -y grubby && \
sudo grubby \
  --update-kernel=ALL \
  --args=”systemd.unified_cgroup_hierarchy=0"

Then rebooting.

To test what your system is using, run:

cat /proc/self/mountinfo | grep cg

If your system has cgroupv1 by default, the output will include cgroup and cgroup2. If your system has cgroupv2 by default, the output will just include cgroup2

Alternatively, stat -f -c '%T' /sys/fs/cgroup will tell you tmpfs (cgroupv1) or cgroup2fs (cgroupv2).

Heh, I stole your idea for a runtime test :)

It has a permissive license 😄 Thanks for the steps!

Generally speaking, the cgroup code in coreclr/corefx now supports a number of configurations, and I don't know how to cover all of them.

I'll try out a couple of things.