Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-18 06:03:55 +03:00
Code Releases Activity

qmeventd: improve getting VMID from PID in presence of legacy cgroup entries

Browse Source 
On a hybrid cgroup system, the /proc/<PID>/cgroup file looks like

> 13:pids:/qemu.slice/110.scope
> 12:perf_event:/
> 11:devices:/qemu.slice
> 10:misc:/
> 9:hugetlb:/
> 8:freezer:/
> 7:cpu,cpuacct:/qemu.slice/110.scope
> 6:memory:/qemu.slice/110.scope
> 5:rdma:/
> 4:cpuset:/
> 3:blkio:/qemu.slice
> 2:net_cls,net_prio:/
> 1:name=systemd:/qemu.slice/110.scope
> 0::/qemu.slice/110.scope

but the order doesn't seem to be deterministic, so it can happen that
an entry like '11:devices:/qemu.slice' is the first to match the
'/qemu.slice' part, which previously made the code expect to find the
VMID.

To improve detection, as a first step, match the trailing slash too.

Reported in the community forum:
https://forum.proxmox.com/threads/129320/post-571654

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2023-07-10 10:52:59 +02:00 committed by Wolfgang Bumiller
parent 3234f5639d
commit d0b587533c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmeventd/qmeventd.c
View File

@ -109,7 +109,7 @@ get_vmid_from_pid(pid_t pid)
} }
cgroup_path++; cgroup_path++;
if (strncmp(cgroup_path, "/qemu.slice", 11)) { if (strncmp(cgroup_path, "/qemu.slice/", 12)) {
continue; continue;
} }
@ -142,7 +142,7 @@ get_vmid_from_pid(pid_t pid)
if (errno) { if (errno) {
fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno)); fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno));
} else { } else {
fprintf(stderr, "error parsing vmid for %d: no qemu.slice cgroup entry\n", pid); fprintf(stderr, "error parsing vmid for %d: no matching qemu.slice cgroup entry\n", pid);
} }
ret: ret: