From nobody Sun Feb 8 20:02:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1727968649769295.6844650642025; Thu, 3 Oct 2024 08:17:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0FBD51577; Thu, 3 Oct 2024 11:07:24 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CBFC91550; Thu, 3 Oct 2024 11:07:07 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CB0BA1513; Thu, 3 Oct 2024 11:07:03 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6B39C1512 for ; Thu, 3 Oct 2024 11:07:01 -0400 (EDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-aW6h8x7INYS4ejiX3QAQGw-1; Thu, 03 Oct 2024 11:07:00 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-42cb374f0cdso5675475e9.0 for ; Thu, 03 Oct 2024 08:06:59 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f802b27fasm17611035e9.40.2024.10.03.08.06.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2024 08:06:57 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 0398F2D2CFBE for ; Thu, 03 Oct 2024 17:06:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727968021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUwq8x+lWjGuFaksvVdEkKb1/n8LK582EcU8cIgoguw=; b=L+1EhVqX1WYgFNeLeGtvKhDkjqZxVewd6sjHrIiUbO0m69qAZ4cTZ/jIw1CF/EdVaDh1T3 1Bovh5egKHTg0oAR32n1i1a2f4Tn3C1eHyPbrLezkIihiyEiR3ek24VBaVGBqbJXWtaXGw PktWE/34Ymf43rbbMa0VgvED0mrr8TQ= X-MC-Unique: aW6h8x7INYS4ejiX3QAQGw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727968019; x=1728572819; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lUwq8x+lWjGuFaksvVdEkKb1/n8LK582EcU8cIgoguw=; b=Jb47ujgjJyZW80H8kcxdUmasyVXgyA2Crq2r5CSUU4YmIYJh/lphUXpUtDsx9atBib 3d5QDSgezYf76LHpBwj8Ibwc48Vi4wQUgoGM2cZvYoYBET2r1Z8eqIj/LZkHy73Bop9m aPI3keZGElJ1RQ33OyL0shnFEiHpgh6CuW4ITpUhHUIYOxpMxSMv+Yv2MQK0vAv0wCk6 vyqS0KQl6CcAy9daVmX/AB2xQhhl6czb6UMXq0dDquqyM8D+OF9XmH20nHf5u5Lca5O9 CRUr4e56rH5LSMIV1UA+dws3Oh7gOv4zFN4nkEwhFHk5n0BLVYNGwX7ucIO/bdmQhjIB wtCw== X-Gm-Message-State: AOJu0YxIIaZIYqQUy3sbTC4xgu727Hdhujqyn+/enm0kblYwXf6LMOg2 4fBBKfIOsC8cHhAp1cgECj/So5VZ1RIqM2Z7hgIH9E6GlhNn04HFVhuWfzJtxxUg4DnNiMVnEne RfSrkyOpwxv/nXiSzl2F0zoLNt4D8Ei4A1wTlyXWNL2GwkrEJUBepatSK3iLBpDwYYTJOr4RlUg PSzDacXFiWE+CqdytPh12aSDc5z5c22/QuGl8UCoY= X-Received: by 2002:a05:600c:5119:b0:42c:b991:98bc with SMTP id 5b1f17b1804b1-42f7debb113mr23146905e9.0.1727968018628; Thu, 03 Oct 2024 08:06:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAv0CPXlnkNRoeIrnd0oosoyGkIj7V+iJn2eD4/P+4kLthe3/iLw5vBaYNKCafw4dKISALRA== X-Received: by 2002:a05:600c:5119:b0:42c:b991:98bc with SMTP id 5b1f17b1804b1-42f7debb113mr23146545e9.0.1727968018056; Thu, 03 Oct 2024 08:06:58 -0700 (PDT) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH] util: Look for newer name of cpu wait time statistic Date: Thu, 3 Oct 2024 17:06:55 +0200 Message-ID: <1cc78f9692c1b4f41ab8f7fc4c763b95369b571f.1727968015.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JLA5PT4XYQ5KPMSMGWGN6BVI2R4XSXLW X-Message-ID-Hash: JLA5PT4XYQ5KPMSMGWGN6BVI2R4XSXLW X-MailFrom: mkletzan@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727968650828116600 Content-Type: text/plain; charset="utf-8"; x-default="true" It looks like linux changed the key for wait time in /proc//sched and /proc//task//sched files in commit ceeadb83aea2 (or around that time) from se.statistics.wait_sum to just wait_sum. Similarly to the previous change (from se.wait_sum) just look for the new name first. Resolves: https://issues.redhat.com/browse/RHEL-60030 Signed-off-by: Martin Kletzander Reviewed-by: Peter Krempa --- src/util/virprocess.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f1e5e4decd68..dd4bd866102e 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1849,8 +1849,10 @@ virProcessGetSchedInfo(unsigned long long *cpuWait, const char *line =3D lines[i]; =20 /* Needs CONFIG_SCHEDSTATS. The second check + * is the name used before ceeadb83aea2, the third one * is the old name the kernel used in past */ - if (STRPREFIX(line, "se.statistics.wait_sum") || + if (STRPREFIX(line, "wait_sum") || + STRPREFIX(line, "se.statistics.wait_sum") || STRPREFIX(line, "se.wait_sum")) { line =3D strchr(line, ':'); if (!line) { --=20 2.46.2