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 BD23A9AAE8 for ; Mon, 22 May 2023 12:26:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9F5302FBAE for ; Mon, 22 May 2023 12:25:39 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 22 May 2023 12:25:37 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id F15D78B63; Mon, 22 May 2023 12:25:29 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id EEC572E830F; Mon, 22 May 2023 12:25:29 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 22 May 2023 12:25:22 +0200 Message-Id: <20230522102528.186955-4-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522102528.186955-1-aderumier@odiso.com> References: <20230522102528.186955-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.015 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-common 1/1] read_cpuinfo: add msr support 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, 22 May 2023 10:26:09 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/ProcFSTools.pm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm index 3826fcc..f491452 100644 --- a/src/PVE/ProcFSTools.pm +++ b/src/PVE/ProcFSTools.pm @@ -21,12 +21,15 @@ my $clock_ticks = POSIX::sysconf(&POSIX::_SC_CLK_TCK); my $cpuinfo; sub read_cpuinfo { + my ($msr) = @_; + my $fn = '/proc/cpuinfo'; return $cpuinfo if $cpuinfo; my $res = { user_hz => $clock_ticks, + vendor => 'unknown', model => 'unknown', mhz => 0, cpus => 1, @@ -45,6 +48,8 @@ sub read_cpuinfo { $count++; } elsif ($line =~ m/^model\s+name\s*:\s*(.*)\s*$/i) { $res->{model} = $1 if $res->{model} eq 'unknown'; + } elsif ($line =~ m/^vendor_id\s*:\s*(.*)\s*$/i) { + $res->{vendor} = $1 if $res->{vendor} eq 'unknown'; } elsif ($line =~ m/^cpu\s+MHz\s*:\s*(\d+\.\d+)\s*$/i) { $res->{mhz} = $1 if !$res->{mhz}; } elsif ($line =~ m/^flags\s*:\s*(.*)$/) { @@ -70,9 +75,45 @@ sub read_cpuinfo { $cpuinfo = $res; + return $res if !$msr; + + if ($cpuinfo->{vendor} eq 'GenuineIntel') { + $res->{msr} = read_cpu_intel_msr(); + } + return $res; } +sub read_msr { + my ($fh, $offset) = @_; + + my $value = undef; + seek $fh, $offset,0; + read $fh, $value, 8; + return unpack("Q", $value) if $value; +} + +sub read_cpu_intel_msr { + my $msr = {}; + my $spectr_msr = undef; + my $capabilities_msr = undef; + my $fn = '/dev/cpu/0/msr'; + + if (!-d $fn) { + eval { + system("/sbin/modprobe msr >/dev/null 2>/dev/null"); + }; + } + return if !$fn; + + my $fh = IO::File->new ($fn, "r"); + return if !$fh; + $msr->{'spec-ctrl'} = read_msr($fh, 0x48); + $msr->{'arch-capabilities'} = read_msr($fh, 0x10a); + close $fh; + return $msr; +} + sub read_proc_uptime { my $ticks = shift; -- 2.30.2