Skip to content

proc_fuse: fix proc_stat_read reporting host cpu count under cgroup v2 #687

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

proc_fuse: fix proc_stat_read reporting host cpu count under cgroup v2 #687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/proc_fuse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,8 @@ static int proc_stat_read(char *buf, size_t size, off_t offset,
char *cache = d->buf + CPUALL_MAX_SIZE;
size_t cache_size = d->buflen - CPUALL_MAX_SIZE;
int cg_cpu_usage_size = 0;
bool use_view;
int max_cpus = 0;

if (offset) {
size_t left;
Expand Down Expand Up @@ -1139,6 +1141,13 @@ static int proc_stat_read(char *buf, size_t size, off_t offset,
lxcfs_v("proc_stat_read failed to read from cpuacct, falling back to the host's /proc/stat");
}

if (cgroup_ops->can_use_cpuview(cgroup_ops) && opts && opts->use_cfs)
use_view = true;
else
use_view = false;
if (use_view)
max_cpus = max_cpu_count(cg, cpu_cg);

while (getline(&line, &linelen, f) != -1) {
ssize_t l;
char cpu_char[10]; /* That's a lot of cores */
Expand Down Expand Up @@ -1166,12 +1175,15 @@ static int proc_stat_read(char *buf, size_t size, off_t offset,
if (sscanf(cpu_char, "%d", &physcpu) != 1)
continue;

if (use_view && max_cpus > 0 && (curcpu + 1) == max_cpus)
continue; // cannot break here because we need to consume all non-cpu lines

if (!cpu_in_cpuset(physcpu, cpuset))
continue;

curcpu++;

if (cgroup_ops->can_use_cpuview(cgroup_ops) && opts && opts->use_cfs)
if (use_view)
cpu_to_render = curcpu;
else
cpu_to_render = physcpu;
Expand Down