From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-common 1/1] read_cpuinfo: add msr support
Date: Mon, 22 May 2023 12:25:22 +0200 [thread overview]
Message-ID: <20230522102528.186955-4-aderumier@odiso.com> (raw)
In-Reply-To: <20230522102528.186955-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
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
next prev parent reply other threads:[~2023-05-22 10:26 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 10:25 [pve-devel] [PATCH-SERIES v3 qemu-server/manager/common] add and set x86-64-v2 as default model for new vms and detect best cpumodel Alexandre Derumier
2023-05-22 10:25 ` [pve-devel] [PATCH v3 qemu-server 1/7] cpuconfig: add new x86-64-vX models Alexandre Derumier
2023-05-31 11:08 ` Fiona Ebner
2023-05-31 15:08 ` DERUMIER, Alexandre
2023-06-01 9:17 ` Fiona Ebner
2023-06-01 11:27 ` DERUMIER, Alexandre
2023-05-22 10:25 ` [pve-devel] [PATCH v2 pve-manager 1/1] qemu: processor : set x86-64-v2 as default cputype for create wizard Alexandre Derumier
2023-05-22 10:25 ` Alexandre Derumier [this message]
2023-05-22 10:25 ` [pve-devel] [PATCH v3 qemu-server 2/7] cpumodel: add cpu models with flags Alexandre Derumier
2023-05-22 10:25 ` [pve-devel] [PATCH v3 qemu-server 3/7] cpumodel: compute qemu supported flags Alexandre Derumier
2023-05-22 10:25 ` [pve-devel] [PATCH v3 qemu-server 4/7] cpuconfig: add get_host_cpu_flags Alexandre Derumier
2023-05-22 10:25 ` [pve-devel] [PATCH v3 qemu-server 5/7] cpuconfig: add find_best_cpumodel Alexandre Derumier
2023-05-22 10:25 ` [pve-devel] [PATCH v3 qemu-server 6/7] cpuconfig: add find_hosts_common_flags Alexandre Derumier
2023-05-22 10:25 ` [pve-devel] [PATCH v3 qemu-server 7/7] add best cpu model detection tests Alexandre Derumier
2023-05-31 11:36 ` [pve-devel] [PATCH-SERIES v3 qemu-server/manager/common] add and set x86-64-v2 as default model for new vms and detect best cpumodel Fiona Ebner
2023-05-31 14:34 ` DERUMIER, Alexandre
2023-06-01 8:34 ` Fiona Ebner
2023-06-01 9:06 ` DERUMIER, Alexandre
2023-06-03 14:14 ` Thomas Lamprecht
2023-06-04 6:29 ` DERUMIER, Alexandre
2023-06-03 14:05 ` Thomas Lamprecht
2023-06-01 9:34 ` Fiona Ebner
2023-06-01 11:37 ` DERUMIER, Alexandre
2023-06-01 13:53 ` DERUMIER, Alexandre
2023-06-01 15:56 ` Fiona Ebner
2023-06-01 21:15 ` DERUMIER, Alexandre
2023-06-02 7:28 ` Fiona Ebner
2023-06-02 9:13 ` DERUMIER, Alexandre
2023-06-02 11:13 ` Fiona Ebner
2023-06-02 11:44 ` DERUMIER, Alexandre
2023-06-03 14:21 ` Thomas Lamprecht
[not found] ` <8277a27b-a70f-b731-69f7-fc9ae69b2da2@binovo.es>
2023-06-01 16:00 ` Fiona Ebner
2023-06-02 12:41 ` Aaron Lauterer
2023-06-02 14:15 ` DERUMIER, Alexandre
2023-06-02 16:09 ` Aaron Lauterer
2023-06-02 16:27 ` DERUMIER, Alexandre
[not found] ` <fa3565e5-3a9c-9348-f291-554a0e0d6628@binovo.es>
2023-06-06 9:15 ` Fiona Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230522102528.186955-4-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox