From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 26DEECA78 for ; Mon, 10 Jul 2023 10:53:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 08BA63C747 for ; Mon, 10 Jul 2023 10:53:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 10 Jul 2023 10:53:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 08CCF424E4 for ; Mon, 10 Jul 2023 10:53:16 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 10 Jul 2023 10:52:59 +0200 Message-Id: <20230710085302.27606-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.045 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 qemu-server 1/4] qmeventd: improve getting VMID from PID in presence of legacy cgroup entries X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jul 2023 08:53:48 -0000 On a hybrid cgroup system, the /proc//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 --- Changes in v2: * Improve commit message, seems like the order is not the same on every boot. qmeventd/qmeventd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c index 921c0dca..503bce69 100644 --- a/qmeventd/qmeventd.c +++ b/qmeventd/qmeventd.c @@ -109,7 +109,7 @@ get_vmid_from_pid(pid_t pid) } cgroup_path++; - if (strncmp(cgroup_path, "/qemu.slice", 11)) { + if (strncmp(cgroup_path, "/qemu.slice/", 12)) { continue; } @@ -142,7 +142,7 @@ get_vmid_from_pid(pid_t pid) if (errno) { fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno)); } 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: -- 2.39.2