From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 2899E1FF15D for ; Thu, 19 Sep 2024 08:56:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E7D0AE8EE; Thu, 19 Sep 2024 08:56:22 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Tue, 17 Sep 2024 07:50:18 +0200 In-Reply-To: <20240917055020.10507-1-sascha.westermann@hl-services.de> References: <20240917055020.10507-1-sascha.westermann@hl-services.de> X-Mailman-Approved-At: Thu, 19 Sep 2024 08:56:19 +0200 MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Sascha Westermann via pve-devel Precedence: list Cc: Sascha Westermann X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH pve-common 1/3] Fix #5708: Add CPU raw counters Content-Type: multipart/mixed; boundary="===============7683025545292190856==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============7683025545292190856== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com 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 154CCC3715 for ; Tue, 17 Sep 2024 08:07:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EEC4410CBB for ; Tue, 17 Sep 2024 08:06:29 +0200 (CEST) Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on20724.outbound.protection.outlook.com [IPv6:2a01:111:f403:260c::724]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 17 Sep 2024 08:06:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YBXaThF3YeZJGgGxareD4f8mzdO7HlYNkqFTGVj5EFFSlp+dL2pByBLfCKMlROMy2IpYCDq5AttDXKEGQ17cWz1HCu4/jqvaNGR3AD0ILkA3IQvEaa0Ow784msvsDbUqBHCDctEbByt/JBn1CMqCHiKBCd1AKm7SfUjiixs8As0ZparQl8yf61E7fH4tSCGJ446wvJzlkaKj6cx26BrKgrF1wsC2o5oa9DT8reAWfZ2/WXkfE4oAgeu7LWGcR1A7J41ZSeUPzJQa8YwaWxlqbTiy0w6itPsC8xkTdxVT49Jy8C6DCJRKuej2zGTQRz2A73gOtsNw3i110gU3rjp6xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B/wxQGZObP6DSdAFaqwsCPrjNpi2keSbEqWttZfL608=; b=tbs79sJ6GIOYBMzDzCEEabRMZSzsYwk1PYyqAfhMI5Wb3vRa/8Vp1aikJ43OjexAu/73joKOsz/Vzv9ZPJygkRECAoVyaA9MHH/OnAsuYy+26iC2IVH3WgF+et/aSWZxNjK1gcdsTouHvRY1UYTLqfiuAqgDm5Wn6XP2woDJ3rKFMl8brXjFkcVi+COuciG+H1d9WtZAV1YpeUL/dZHVIt1JF3/74Tcz/oq93mnfkmwqpRx3Ye2Fn7NreFNg5+KIxN6/H99pyb4fedg4DaFmR2Se/Wd0JnHHTl9vX2quQU5PX9vsWdcfxYqBVQplo1jyF1Ue5LqZD6205tE7igH2sQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hl-services.de; dmarc=pass action=none header.from=hl-services.de; dkim=pass header.d=hl-services.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hl-services.de; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B/wxQGZObP6DSdAFaqwsCPrjNpi2keSbEqWttZfL608=; b=IwpP1YDrmq+sbeOReJMiQG/JRLJlax9ad5hIuGq9y5ZjYlOScqQHI1I1ChBHB2m72zYt0tdAC1Uc1GDLtkhI+//U3TXT7MHwNDWDl2cIjEyRm0hAgNQ3nAWgMBMcq6YQY2KrlI+1lBRtBeisi9fPeDj4eNb58tRVQwkQLCd88iv5xmgqIswLTK3krclnRfPbjmML4fi59R/fb50G5+4heGH7foyoaSTYhHT9P01G9uqNsccTQqT/yeWTuePcmmEb+jLx/7RV0qLtI8ob54vQzBqOrDqy5FjpGrzDkk/s8VJUydvRniaCeR8M81Z17MMHP7YcyZyK5jAGqRTuSY7QVQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=hl-services.de; Received: from AM9PR10MB4885.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:419::5) by GV2PR10MB7031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:d3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.24; Tue, 17 Sep 2024 05:50:32 +0000 Received: from AM9PR10MB4885.EURPRD10.PROD.OUTLOOK.COM ([fe80::69f0:b468:92e7:7210]) by AM9PR10MB4885.EURPRD10.PROD.OUTLOOK.COM ([fe80::69f0:b468:92e7:7210%6]) with mapi id 15.20.7962.022; Tue, 17 Sep 2024 05:50:32 +0000 From: Sascha Westermann To: pve-devel@lists.proxmox.com Cc: Sascha Westermann Subject: [PATCH pve-common 1/3] Fix #5708: Add CPU raw counters Date: Tue, 17 Sep 2024 07:50:18 +0200 Message-ID: <20240917055020.10507-2-sascha.westermann@hl-services.de> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240917055020.10507-1-sascha.westermann@hl-services.de> References: <20240917055020.10507-1-sascha.westermann@hl-services.de> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AM0PR03CA0045.eurprd03.prod.outlook.com (2603:10a6:208::22) To AM9PR10MB4885.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:419::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR10MB4885:EE_|GV2PR10MB7031:EE_ X-MS-Office365-Filtering-Correlation-Id: 2626cb3a-2326-4bca-38a9-08dcd6dca486 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?WY3aNWfy37Zia3gIcd2sYEulq5hxGunJUdpm8t1EhwpyzSgXDGMlUXg+jU2+?= =?us-ascii?Q?4Tn3Dz4SeiYYWGEqt14Z3RbDbcjlCAqpzCY2befkoxf9LQ6mRcLmmhLwa/PF?= =?us-ascii?Q?gpOyblo9H4RI5N4zH4+LeMk1znl0TYsMtcgG0H5EJ4pFfLnnhFbkRdD276+q?= =?us-ascii?Q?cMFlECsepTfuWNQrSyl4j3pIbKJfPAN/fr1WyHg7fQo27nZpKglpAm0oHgCY?= =?us-ascii?Q?AKRJXZ8xpHrBCuGujJK6RTA6DQq3sb1jd5/560lAyA3N9Oi/6iLAX2AcyM4d?= =?us-ascii?Q?9Zbr6lyMC7NkKazWUoKneeGMvS0uN4Z3SIfzjrdUNqIIvM7u2xJ2tjaqGMOu?= =?us-ascii?Q?B9R5W0YQYkjbeodxool3JaohBgYpu0QjWDgjTBXETMxYa47+oI13jZu6xd8V?= =?us-ascii?Q?VseDLAVG0cY96JAu50ZwuX6ae0P1JNqyisVVdBGSVS9OnsDqkq7ng43gOo/P?= =?us-ascii?Q?ONyG9NfaJcpMULcRHbMQe6a0XHpZGxRYuBud52wmtbNWoTuBq5Q+MFt7nL/I?= =?us-ascii?Q?nhOvRGDOftz2Tay5t8kmewdlxZ5U+oFclixQPK1A3QXlvTQj+0B96bmfESlW?= =?us-ascii?Q?43flyN+tlTE5isaDWSeH3hqe/ljS9/4mJxtCdN+a7OoQBMSZrCgbM1Pa6O1o?= =?us-ascii?Q?zfoMy/glgHgZdrkjXdTxoGkCaziOlaWBTY9JaoX2v4LMdby+NCu2jCPIoY6Q?= =?us-ascii?Q?SYS7MkEBG6soDbAfLGoFDxSTJhTzodXs9QtVoslkT9mW7mVrLGVAP+8aUtZH?= =?us-ascii?Q?n/RG+v/xsw97cQST9H9jzcRJ5EvorXGm/APPE/dhURUSaiVojONlJa4rView?= =?us-ascii?Q?zokHoBBKJ2dHVBfvBGT8nrF44QZTz7lqgmbLulNp1n1SFAwg+tVsDM1YgIgX?= =?us-ascii?Q?paVmgvd7tLECYdlrgB3p4MEpDoyN4RLLAK/rBJUbHkoEBJC66IdKynPwx8yP?= =?us-ascii?Q?Z14MER/0ys4K4+0HiABbKybGeZVxDw1NbTFfi42o+HzWs8+89zK08mHyQj+o?= =?us-ascii?Q?ZJt/y8FEUPoN5g6Zbudq4c5OGKvU8JKN8YCp4Z0dsV+ziHDbYYCfesc4maVl?= =?us-ascii?Q?j9vXTv8nubrmfspb8DBS+VNUZnWKFWs8a6m2V2CKUs7NXXyTWKa273F+yiss?= =?us-ascii?Q?f1tELkITmnRCSd9x3CviWtuYiHf5lb9z0l1Skomc3M6L0Axm0TXoMyII09vT?= =?us-ascii?Q?tgEX5PjD9ruDbV0E3gAoX5MdmkmF14z/LOy0hUUez5fU6YDDBlFM/IVet812?= =?us-ascii?Q?6/fRRZfunOwbPzomxm3sbkv8OiuiG8W0q9txO2T7EYC3RjFl6NUQ/LnUlC74?= =?us-ascii?Q?P8tkBtq1XQly+w1MFkPKBHHMwLKCjspKY6JhsczTxEiH+w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:fr;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR10MB4885.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(376014)(1800799024)(366016);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?j8wFd7aM3LrgPezn3b3dS3RmRdGyXrBDoieQXu3/4YwD5dQA1wZba7V6aiBV?= =?us-ascii?Q?SDGL+nV9RR4lARozWOZSfk8/SZYZUD4BFhIPkxqwu1ZTZphtLqOx0eyD469U?= =?us-ascii?Q?sJrwLZ9B83bYz56FXYRJE6RV7SR66bBIri+srqybixhQFaqxj5sJ6yXiIK0r?= =?us-ascii?Q?aCzu9TaUrDNNkiNAPqMoBMk4yaGt3BXzz3hn9NYxdu9X/B7V0VipIy2qzSYU?= =?us-ascii?Q?nppzVD6f/yYlqBXFFzTbVQR3SkOI9wjLwrCuKXJZ21wRS9R7m7GkZEH4ZrZ5?= =?us-ascii?Q?c88z006w1vW4TrrxubmFoSOnhYnZ0mgtE/i1U9zVTxDV+sF/fn0XA77uLmfK?= =?us-ascii?Q?cYFSz1viQARfMdafmzR6CcSwjc2udtE4PNdFwtABNl1/zGzEgLrbQudd67oM?= =?us-ascii?Q?j8VkN06LJZ2/RAOzUCtRcUItaH4LD3VgpiJ3wdjES/9cEIWzP7F0CfLhiBkN?= =?us-ascii?Q?VQyXv5AHx7XATqvT1/lbhK5X9uptfMcnnqQQ50eFLA8RxZIctm+CmVyg6nJn?= =?us-ascii?Q?S0j7XoGxZJsFcMlRqy55ZqVUtvyhm3UHaQdriNyB9HxzurrskNKq6p3wj6zJ?= =?us-ascii?Q?b+aEPYCLQD77V8HaPPb0I7Q3k6LPQL0RIGdeLkSGsaAOTwoxDbJ8n9EpK81x?= =?us-ascii?Q?xUU+BZkIuaMlrONWmRwelvhvgUlw3QrCya7LmDFW2CIByElETOYh1o9sCRE7?= =?us-ascii?Q?T2TTjY0t9aLVuJiGu1H5H7K8YKCrsXyGVZDqaPyZbUpnLRrE65xwGxyxBXTR?= =?us-ascii?Q?jsENOk3Rbmqt4JHYrnpd0vGyLDBIEtGXcqICq3VPN9fLMaB438cGbwl7s27r?= =?us-ascii?Q?Oeg1pXD/aYPsq1QgKAeEoJSurJ9RL0/wUKEaWFx2kYHe+U1cerLmn/GyqKlD?= =?us-ascii?Q?AJ9CPErCiKn5ED1xGfzZdTop85xK/zR7Yy+vPVv2Uo57jUiGDP5CjIcYF0jn?= =?us-ascii?Q?00jfV0bwncu0/ydkYtfZbdRcnSEg67f4L71ozjPOnlTY/p+o33HjXf+3Vfsd?= =?us-ascii?Q?lK1z5MP4gpLhleJHZ3Wubt3XZoY+TG5P0uYPxp1IilGk5mxBr4N44q1eIEZV?= =?us-ascii?Q?S5poJdEwuRdrQbz2MoH66LKggkYtIvWZiOC0OvKhFYD3mgO7Og0q6OVaKv8d?= =?us-ascii?Q?yOTrSwit+6Rb7BpmTYBBVI/pRVxtKStl1mWqiUbYzefr1mUKwGANrmzhHIhg?= =?us-ascii?Q?tvCf+F9uKlY0JSYn0sQO9VRdiHWzP13tU11Ot5pl5WalHuqfvYLmIS9M7XGc?= =?us-ascii?Q?2ZZB1IwliUY/CxsbQKPoEJVlRSMa5vDZkpdn4XyA6phY4XC1nI6r9LZfuaxs?= =?us-ascii?Q?TPMEQwscYSgD3tXKx5Y1c9vVaChyfN5ElYZzYwN4h+/cOJSWASrbMkrO2JZc?= =?us-ascii?Q?E7V5VlgeUsnR/bJV5PaJFcOR75c8eLcRWhqNtOfyttRNrzKYAQmqWVuo53OD?= =?us-ascii?Q?DL8w/n4ivfDb2Y7zk1Ra99WAeZgRI+m59R4dXLeRz/8JWTB47IeQFeXvRYQx?= =?us-ascii?Q?E7dIpyDp7srYqCzA0FXAB31SGt8VXKGgZmCdn86DMccp/hAKkX9Zkh9LCKla?= =?us-ascii?Q?kdF3mY+gcKZejdSd7hF7/JlYK/9F5oA8I5MRHtZHgddP11TSWu/puYdCj7SB?= =?us-ascii?Q?ZPy5pwjiwiIEW5LPB7659dOmR5rTadxunLJo0SVSGDjDQFZEymuJz1hqADXq?= =?us-ascii?Q?iEZmywZKrPOPomNX8ltbT+PGc64=3D?= X-OriginatorOrg: hl-services.de X-MS-Exchange-CrossTenant-Network-Message-Id: 2626cb3a-2326-4bca-38a9-08dcd6dca486 X-MS-Exchange-CrossTenant-AuthSource: AM9PR10MB4885.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2024 05:50:32.2430 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 996ee4f0-343c-4038-abc8-fd1e1094eeb5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YuuKRnRsOgfpD8oXk6zVWAZRGT1tkkXgE0/g5tMvFiY8NOhMLz/quedZJG33im87W8kYkTXBhzUyMWtMQP/A2tAIC8nm+TUV2fD2J5lonhnOaUlOJAS+B+xxqjqSbRsV X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7031 X-SPAM-LEVEL: Spam detection results: 0 ARC_SIGNED 0.001 Message has a ARC signature ARC_VALID 0.001 Message has a valid ARC signature AWL 0.001 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain DMARC_PASS -0.1 DMARC pass policy RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record X-Mailman-Approved-At: Thu, 19 Sep 2024 08:56:19 +0200 Add "guest_time" (43) from /proc//stat. Signed-off-by: Sascha Westermann --- src/PVE/ProcFSTools.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm index 3826fcc..5b0062e 100644 --- a/src/PVE/ProcFSTools.pm +++ b/src/PVE/ProcFSTools.pm @@ -239,7 +239,7 @@ sub read_proc_pid_stat { my $statstr = PVE::Tools::file_read_firstline("/proc/$pid/stat"); - if ($statstr && $statstr =~ m/^$pid \(.*\) (\S) (-?\d+) -?\d+ -?\d+ -?\d+ -?\d+ \d+ \d+ \d+ \d+ \d+ (\d+) (\d+) (-?\d+) (-?\d+) -?\d+ -?\d+ -?\d+ 0 (\d+) (\d+) (-?\d+) \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ -?\d+ -?\d+ \d+ \d+ \d+/) { + if ($statstr && $statstr =~ m/^$pid \(.*\) (\S) (-?\d+) -?\d+ -?\d+ -?\d+ -?\d+ \d+ \d+ \d+ \d+ \d+ (\d+) (\d+) (-?\d+) (-?\d+) -?\d+ -?\d+ -?\d+ 0 (\d+) (\d+) (-?\d+) \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ \d+ -?\d+ -?\d+ \d+ \d+ \d+ (\d+)/) { return { status => $1, ppid => $2, @@ -248,6 +248,7 @@ sub read_proc_pid_stat { starttime => $7, vsize => $8, rss => $9 * 4096, + guest_time => $10, }; } -- 2.46.0 --===============7683025545292190856== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============7683025545292190856==--