peter/spectre-meltdown-checker
1
0
Fork 0
mirror of https://github.com/speed47/spectre-meltdown-checker.git synced 2026-04-01 12:47:07 +02:00
Code Issues Projects Releases Wiki Activity

use MSR names for read_msr for readability

Browse Source
This commit is contained in:
Stéphane Lesimple
2026-03-30 21:01:13 +02:00
parent 3d6acc460e
commit 994608a90a
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/340_cpu_msr.sh
View File

@@ -150,6 +150,11 @@ write_msr_one_core() {
return $ret return $ret
} }
readonly MSR_IA32_PLATFORM_ID=0x17
readonly MSR_IA32_SPEC_CTRL=0x48
readonly MSR_IA32_ARCH_CAPABILITIES=0x10a
readonly MSR_IA32_TSX_CTRL=0x122
readonly MSR_IA32_MCU_OPT_CTRL=0x123
readonly READ_MSR_RET_OK=0 readonly READ_MSR_RET_OK=0
readonly READ_MSR_RET_KO=1 readonly READ_MSR_RET_KO=1
readonly READ_MSR_RET_ERR=2 readonly READ_MSR_RET_ERR=2

2
src/libs/350_cpu_detect2.sh
View File

@@ -66,7 +66,7 @@ parse_cpu_details() {
# Set it to 8 (impossible value as it is 3 bit long) by default # Set it to 8 (impossible value as it is 3 bit long) by default
cpu_platformid=8 cpu_platformid=8
if [ "$cpu_vendor" = GenuineIntel ] && [ "$cpu_model" -ge 5 ]; then if [ "$cpu_vendor" = GenuineIntel ] && [ "$cpu_model" -ge 5 ]; then
read_msr 0x17 read_msr $MSR_IA32_PLATFORM_ID
ret=$? ret=$?
if [ $ret = $READ_MSR_RET_OK ]; then if [ $ret = $READ_MSR_RET_OK ]; then
# platform ID (bits 52:50) = bits 18:20 of the upper 32-bit word # platform ID (bits 52:50) = bits 18:20 of the upper 32-bit word

13
src/libs/400_hw_check.sh
View File

@@ -355,8 +355,7 @@ check_cpu() {
pr_info "* Hardware support (CPU microcode) for mitigation techniques" pr_info "* Hardware support (CPU microcode) for mitigation techniques"
pr_info " * Indirect Branch Restricted Speculation (IBRS)" pr_info " * Indirect Branch Restricted Speculation (IBRS)"
pr_info_nol " * SPEC_CTRL MSR is available: " pr_info_nol " * SPEC_CTRL MSR is available: "
# the new MSR 'SPEC_CTRL' is at offset 0x48 read_msr $MSR_IA32_SPEC_CTRL
read_msr 0x48
ret=$? ret=$?
if [ $ret = $READ_MSR_RET_OK ]; then if [ $ret = $READ_MSR_RET_OK ]; then
spec_ctrl_msr=1 spec_ctrl_msr=1
@@ -751,8 +750,7 @@ check_cpu() {
cap_gds_no=0 cap_gds_no=0
pstatus yellow NO pstatus yellow NO
else else
# the new MSR 'ARCH_CAPABILITIES' is at offset 0x10a read_msr $MSR_IA32_ARCH_CAPABILITIES
read_msr 0x10a
ret=$? ret=$?
cap_rdcl_no=0 cap_rdcl_no=0
cap_taa_no=0 cap_taa_no=0
@@ -866,7 +864,7 @@ check_cpu() {
fi fi
if [ "$cap_tsx_ctrl_msr" = 1 ]; then if [ "$cap_tsx_ctrl_msr" = 1 ]; then
read_msr 0x122 read_msr $MSR_IA32_TSX_CTRL
ret=$? ret=$?
if [ "$ret" = $READ_MSR_RET_OK ]; then if [ "$ret" = $READ_MSR_RET_OK ]; then
cap_tsx_ctrl_rtm_disable=$(( ret_read_msr_value_lo >> 0 & 1 )) cap_tsx_ctrl_rtm_disable=$(( ret_read_msr_value_lo >> 0 & 1 ))
@@ -904,8 +902,7 @@ check_cpu() {
cap_gds_mitg_dis=-1 cap_gds_mitg_dis=-1
cap_gds_mitg_lock=-1 cap_gds_mitg_lock=-1
if [ "$cap_gds_ctrl" = 1 ]; then if [ "$cap_gds_ctrl" = 1 ]; then
# read the IA32_MCU_OPT_CTRL MSR read_msr $MSR_IA32_MCU_OPT_CTRL
read_msr 0x123
ret=$? ret=$?
if [ "$ret" = $READ_MSR_RET_OK ]; then if [ "$ret" = $READ_MSR_RET_OK ]; then
cap_gds_mitg_dis=$(( ret_read_msr_value_lo >> 4 & 1 )) cap_gds_mitg_dis=$(( ret_read_msr_value_lo >> 4 & 1 ))
@@ -1013,7 +1010,7 @@ check_cpu() {
if [ $ret = $READ_CPUID_RET_OK ]; then if [ $ret = $READ_CPUID_RET_OK ]; then
pstatus blue YES pstatus blue YES
cap_srbds=1 cap_srbds=1
read_msr 0x123 read_msr $MSR_IA32_MCU_OPT_CTRL
ret=$? ret=$?
if [ $ret = $READ_MSR_RET_OK ]; then if [ $ret = $READ_MSR_RET_OK ]; then
if [ "$ret_read_msr_value" = "0000000000000000" ]; then if [ "$ret_read_msr_value" = "0000000000000000" ]; then