From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id EBDD31FF0C0 for ; Wed, 18 Nov 2026 10:19:03 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 943FD2160E; Wed, 18 Nov 2026 10:19:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y2TrfKLXZs+V2SMnghZsOIXglmuNecgzcWvuj3C4ORcTiXnaafPfvbinAaiR1bcxkEpyUxLJdmz124XaLTauXWvDiPrT3tn769V3IQ+k3/l5xQao2kEJF5eBvGVnOIVvHT3HM8wfYI8rbrJNSE3L6b3Do0QiByZgj8iXGN/iBPuu+GBUbbYg0azEd3zPWxfPI3vDHKUGnkvulYLiibTqjvl2RC7GN99NeqZVph5IHF/PXfNN3/XjmMpqS3u0CPmlnAjWPpzsDWAf5m7AnPB29qpWKdf68QGZ4Tp5hO7iUltmKW7n6QQJgtvtWDLH75DRPlI2nQZuK3sG1nU1RFu2ag== 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=7bAq1064vLflAwbVAljPd9xR0xfBL2LjOUUQ981aoDs=; b=yReDU9sVSD4Aqt5VLqiiO2CEjk3oio9hWaWKBrwhEKlG5yuCo72rzWx+rbgQd/pnwDNlPsiefzZsBQnj3/KxAbjP0vhztpPef5vO1PLnOi/4aH6Oz7QZsOwjGx0apv9MB/Biut9GrSX0gB/DTVTz5zWr8ptof4ZmnjifmtZE5N7NmFU45pqfKW2kjokzsr9NK9Mprwq94Rdts4DJlhTI6WfT9AOO9/PDq/jhfLy1Lxp3Yzm8T++SAxh9FhGreH7duFKeXoPL+AbedHPpRua//Q+QIxePuuPVV+XTePryXuUhwd2z85SyFByghc1ETZDBsfmvEZNFLJdQVODc4xRjLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cyber.gent; dmarc=pass action=none header.from=cyber.gent; dkim=pass header.d=cyber.gent; arc=none Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cyber.gent; From: Yvan Janssens To: pve-devel@lists.proxmox.com Subject: [PATCH common] procfs: cpuinfo: count CPUs and report the machine type on s390x Date: Wed, 18 Nov 2026 10:18:48 +0100 Message-ID: <20261118091848.72539-1-yvanj@cyber.gent> X-Mailer: git-send-email 2.54.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AS9PR05CA0280.eurprd05.prod.outlook.com (2603:10a6:20b:492::32) To DBAP193MB0876.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:1cc::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBAP193MB0876:EE_|AM8P193MB0882:EE_ X-MS-Office365-Filtering-Correlation-Id: c4979cbc-e462-43f0-9e7c-08df4554f4f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|376014|23010399003|366016|6133799003|18002099003|56012099006|261102123227099003|261026121527099003|261021121427099003|261021123027099003|10067099003; X-Microsoft-Antispam-Message-Info: Wbw9yWUzQglQu+Gnl39sJh4UniUU4qUiAfIUToHh6n/iL6172NTdC1/tyJBo+HmgmiWyyquxURo35vBnhTsjZM1oL75Bnr2nFGoRKhKNuYpJpH1aV3F3eZ7XCvJbM9t9RCns5/E96JX4GX+tPULJ9Ybp3NwCvAGNR1fT+hLt0IYs2buL2MEY9VVN+/EPneRJAb+8yz3Hau94gW9WARI5MDvsB0Ia9lwGeXwgl0HF1+zdzZUUP1ISrd2hcbat24wL57Gg3ExTju1Y2kh2Sr0EWN2Zk8Bpt485ZJ6R1B1RQQIyE9A7ErzTWEyHFdtorhg4tRzt6nOoE3CAwiUtB+7h4uwcetCYGYrr3zpc7GDUnhq+sgCS0PXwrBFJUo62X1KZCy0+a+pYK40OE7lVvbNBHbX3JRR/BuVzPi/dzbKy/xs9ZWs/Eec0GdIUL4tS1ucPCHXuoLUjQcftk9GqpAr6IdLA7HfvB+ALPdH12962x1bqQdjcdfLTx64juDQGUEgsp9C4OGd9Lem2ai0nhkoOgf5C0UtfdEcXNZR16KqKqYRB2Ov82q9ipVf1TnRWoaMW2K0D1RQ27XiPNlVbWHBaUjCCD4ZyUShb9v0gW6InFW4OSKWjOxmavMenSA/2t0E3cfqurUHO7NtbnAB5z5dWhNAX2S3wAFMn1usHpAT6N08= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DBAP193MB0876.EURP193.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(1800799024)(376014)(23010399003)(366016)(6133799003)(18002099003)(56012099006)(261102123227099003)(261026121527099003)(261021121427099003)(261021123027099003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hwHmmxV0f5lVJpiA4ASWLgfqZYCFLmoRhzdFkSPB/0Gu8c7zztwZiHQbLXWq?= =?us-ascii?Q?wnnM4RTmXK/Fz8czvSy9yzZq2ZwEnvnLz1VlopEhtmqGBoZZvtWN0X0l+hDq?= =?us-ascii?Q?7K4QGVxYlgLW6V0SzcTgi72M3LzD8UXOV7fY6m7RkrMMoV9LwfQP15UtiW6x?= =?us-ascii?Q?bQaQoSl4BRNcniWNLCx66rhD1FMqZjm8kdTYfN4A5DXW5ELJfAEVq2ch7pme?= =?us-ascii?Q?AAfKXZ/AWNt+Dh32ziB0bqTAhsZrGz62cJVt49nivSy1fsRdAhQsMv/t+UE2?= =?us-ascii?Q?lpFTepVD/zAqgbFdvbi6nsOOZ5r+yShtioXCJATZ4BFgMpO2FfHemOi5d83e?= =?us-ascii?Q?eVBOaV2U81+4QXCKvvUP+VtWUAdveMCGorxekfOje57r/JvxRle43RaUZOXA?= =?us-ascii?Q?HmHhJqHhZWwGAHWdsFLJ2g4o0/dN0eoZxxr+uVG4ymAcqEmuh0SBTbJ+opRT?= =?us-ascii?Q?j500K1HZZrsAVv7LnPmu4ugQdZk8VboSCYU2YVajVpqx6Itt/vbDJgs2zSy7?= =?us-ascii?Q?JAs9wLWjVIHbfx3eKKYOsG2k7qrg/wxmuCeRPsbOlgJRWBGFbfuEVGdw+BQB?= =?us-ascii?Q?j2DF6z2PXScWVYeJ3O5doRFc6JB1zN5uHdBk3+8A/KkmnTKR/J0J/YPRhbPZ?= =?us-ascii?Q?LjQZP+ZsC3wjZB2EoDAGqD0SPLfCCdawa7PsPeBD9DvrIJh+xkDR2pnBZ65v?= =?us-ascii?Q?2jglqFQfSAik5TgI5//q2G1Ppm2W7JMZ7FqMH+qbcwJPmrMRgMKvPV2X+Foc?= =?us-ascii?Q?98F3tPCvGFczdwOlefoljOrQa0Pe/o7BCgbkjmV/Zv0IQGYQYDNgGMMes69Y?= =?us-ascii?Q?ul4PvscvYlagqvMcNlp98KuHG35lLth6/rJ10IHSuOjXrvuBMAk+YZxcGbVb?= =?us-ascii?Q?nS7QpInkqVSB2eYwClis1Rj91xUNxd0qf84dh+5ouHRBK5YCakQDtFcYyoTG?= =?us-ascii?Q?TALzRFsU9LkraWYOaX6iCmDcjjzxGz3UCxHKwIEJOHQUYnXOswPqiMEm8bCO?= =?us-ascii?Q?9qhz1I+/HXfz78TSD2PYyExcU2l7IQlY5SZT6CaCt6I1Xi/bE7iV74a2mKzv?= =?us-ascii?Q?ahpikGIBfqrqaxkCp522IcQOwsUi/y23bMtP44B7H4tkvQnIyTAM3rxeTKVi?= =?us-ascii?Q?vIepU4pIVH6BOrabekc3ol+AgVTfMhM/3sakC1H9yf2voIojxbIib/uYx4D5?= =?us-ascii?Q?2rX6yPW7TTMWdDJyuQEbweH3jz1lcdsjl89t5k0pVB6WYX9gwV5xzYjdjzCJ?= =?us-ascii?Q?HXhAfdzL/j9mlSSdkl4wFA8FtkZMLxWVpt3CltzO3v0ul+fC7YaC1uKB9Kek?= =?us-ascii?Q?SY5IS95UCQ6sSXefUNbWH7Q4+3kJB/9e/VvCM15vt3n9KYJ2JKPbIo83IM+y?= =?us-ascii?Q?ewHJj28srkPqyR7kyHBVMrxffjzzMTdv8kpy1PXF0aHdBYBXkcihtb8peWWj?= =?us-ascii?Q?/NuYgPc95EPg77sqNJiTjJYOZGFYRMRhqS8ch1a1lqoh4MGCYZhXDgGRrXsC?= =?us-ascii?Q?zpFjV+oNlrC5Kvrq+n+W3bYUrM2uoMBIxsnx41Z2BQnDJpc0ohbhihJt+n4e?= =?us-ascii?Q?WmVs6cNENAScAVwICHMAvK9ED0EvFPm9VvelQNtE4ePgdeiy/9GLvsCXBP/F?= =?us-ascii?Q?AWmaYlQTs/PfmRtplde6Y5xDv/+TO8aJUSwG3Z6PkfFNBA321ShoOuO19/qs?= =?us-ascii?Q?wS8wgIWD4lQHQNT2IbLawcxG1UH+PlUJIIXyFMXMAjlXMG+W2ehQsOO/sm7Q?= =?us-ascii?Q?7Zdm6MVgkQ=3D=3D?= X-OriginatorOrg: cyber.gent X-MS-Exchange-CrossTenant-Network-Message-Id: c4979cbc-e462-43f0-9e7c-08df4554f4f4 X-MS-Exchange-CrossTenant-AuthSource: DBAP193MB0876.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2026 09:18:50.3269 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d5a0a0d6-18b4-44e3-8e5e-e5dbe37f9ee2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j1riH1S1XCuNrNjHXI/ZAbCsHBx3YSBxZD+ASUXwQvAFrCk1LZz8Nnt660pjIcv3H2p7GLCVo97QffLkszQNAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB0882 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 Adjusted score from AWL reputation of From: address DMARC_PASS -0.1 DMARC pass policy GB_MSAUTHSOURCE_EUROPE 0.01 Mail authenticated via Microsoft Europe (EURP) datacenter KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 33HH7TG2HNW44OXFQ3ZEQIO2OTHDYS5N X-Message-ID-Hash: 33HH7TG2HNW44OXFQ3ZEQIO2OTHDYS5N X-MailFrom: yvanj@cyber.gent X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On s390x, /proc/cpuinfo has no 'processor : N' lines; each per-CPU block starts with 'cpu number : N' instead. read_cpuinfo thus reports 0 CPUs, and qemu-server refuses to start any VM ("MAX 0 vcpus allowed per VM on this node"). Count the 'cpu number' lines as well. As there is no 'model name' line either, fall back to the machine type for the model, similar to arm64. Signed-off-by: Yvan Janssens --- Excerpt of /proc/cpuinfo on an s390x host (IBM z14 ZR1 LPAR, 6 IFLs, Debian 13 kernel 6.12), trimmed, CPU serial number redacted: vendor_id : IBM/S390 # processors : 6 [...] processor 0: version = 00, identification = **REDACTED**, machine = 3907 processor 1: version = 00, identification = **REDACTED**, machine = 3907 [...] cpu number : 0 physical id : 1 core id : 0 book id : 0 drawer id : 0 dedicated : 1 address : 0 siblings : 1 cpu cores : 1 version : 00 identification : **REDACTED** machine : 3907 cpu MHz dynamic : 4504 cpu MHz static : 4504 [...] read_cpuinfo before: cpus=0 sockets=2 cores=6 model=unknown read_cpuinfo after: cpus=6 sockets=2 cores=6 model=IBM 3907 src/PVE/ProcFSTools.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm index 12e0358..9a86baa 100644 --- a/src/PVE/ProcFSTools.pm +++ b/src/PVE/ProcFSTools.pm @@ -93,9 +93,9 @@ sub read_cpuinfo { my $cpuid = 0; my $idhash = {}; my $count = 0; - my ($cpu_implementer, $cpu_part); + my ($cpu_implementer, $cpu_part, $s390_machine); while (defined(my $line = <$fh>)) { - if ($line =~ m/^processor\s*:\s*\d+\s*$/i) { + if ($line =~ m/^(?:processor|cpu number)\s*:\s*\d+\s*$/i) { $count++; } elsif ($line =~ m/^model\s+name\s*:\s*(.*)\s*$/i) { $res->{model} = $1 if $res->{model} eq 'unknown'; @@ -116,6 +116,8 @@ sub read_cpuinfo { $cpu_implementer //= hex($1); } elsif ($line =~ m/^CPU part\s*:\s*(0x[0-9a-fA-F]+)\s*$/) { $cpu_part //= hex($1); + } elsif ($line =~ m/^machine\s*:\s*(\d+)\s*$/) { + $s390_machine //= $1; } } @@ -129,6 +131,10 @@ sub read_cpuinfo { } } + # s390x has no 'model name' either; report the machine type, like lscpu does + $res->{model} = "IBM $s390_machine" + if $res->{vendor} eq 'IBM/S390' && $res->{model} eq 'unknown' && defined($s390_machine); + # Hardware Virtual Machine (Intel VT / AMD-V) $res->{hvm} = $res->{flags} =~ m/\s(vmx|svm)\s/; -- 2.54.0 (Apple Git-157)