Merge pull request #24 from intel/prep274

change binary name of rd/wrmsr to avoid conflict with system installed binaries

.gitignore

@@ -10,8 +10,8 @@ src/reporter/reporter*
 src/collector/collector
 src/collector/collector.exe
 src/collector/collector_arm64
-src/rdmsr/rdmsr
-src/wrmsr/wrmsr
+src/rdmsr/rdmsrx
+src/wrmsr/wrmsrx
 src/msrbusy/msrbusy
 src/calcfreq/calcfreq
 # src

RELEASE_NOTES

@@ -7,6 +7,10 @@ Fully Supported Platforms
 - Operating Systems: Ubuntu 16.04, 18.04, 20.04, 22.04, CentOS 7, Amazon Linux 2, Debian 11, RHEL 9, Rocky Linux 8
   Note: svr-info may work on other micro-architectures and Linux distributions, but has not been thoroughly tested
 
+2.7.4
+Bugs Fixed
+- false positive Vulnerability for CVE-2022-40982 ("Downfall") on some ICX systems
+
 2.7.3
 Sub-components Updated
 - spectre-meltdown-checker -- updated to latest HEAD commit

src/Makefile

@@ -56,10 +56,10 @@ reporter:
 	cd reporter && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o reporter
 
 rdmsr:
-	cd rdmsr && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o rdmsr
+	cd rdmsr && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o rdmsrx
 
 wrmsr:
-	cd wrmsr && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o wrmsr
+	cd wrmsr && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o wrmsrx
 
 msrbusy:
 	cd msrbusy && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o msrbusy
@@ -242,8 +242,8 @@ collector-deps-amd64: collector_tools
 	cp linux/tools/perf/perf $(TMPDIR)
 	cp -R async-profiler $(TMPDIR)
 	cp flamegraph/stackcollapse-perf.pl $(TMPDIR)
-	cp rdmsr/rdmsr $(TMPDIR)
-	cp wrmsr/wrmsr $(TMPDIR)
+	cp rdmsr/rdmsrx $(TMPDIR)
+	cp wrmsr/wrmsrx $(TMPDIR)
 	cp spectre-meltdown-checker/spectre-meltdown-checker.sh $(TMPDIR)
 	cp stress-ng/stress-ng $(TMPDIR)
 	cp sysstat/mpstat $(TMPDIR)
@@ -282,8 +282,8 @@ clean:
 	rm -f orchestrator/resources/collector_deps_arm64.tgz
 	rm -f orchestrator/resources/reporter
 	rm -f orchestrator/resources/sshpass
-	rm -f rdmsr/rdmsr
-	rm -f wrmsr/wrmsr
+	rm -f rdmsr/rdmsrx
+	rm -f wrmsr/wrmsrx
 	rm -f msrbusy/msrbusy
 
 reset:

src/orchestrator/resources/collector_reports.yaml.tmpl

@@ -127,81 +127,81 @@ commands:
     superuser: true
     parallel: true
   - label: rdmsr 0x1a4
-    command: rdmsr -f 3:0 0x1a4  # MSR_MISC_FEATURE_CONTROL: L2 and DCU Prefetcher enabled/disabled
+    command: rdmsrx -f 3:0 0x1a4  # MSR_MISC_FEATURE_CONTROL: L2 and DCU Prefetcher enabled/disabled
     superuser: true
     modprobe: msr
     parallel: true
   - label: rdmsr 0x1b0
-    command: rdmsr -f 3:0 0x1b0  # IA32_ENERGY_PERF_BIAS: Performance Energy Bias Hint (0 is highest perf, 15 is highest energy saving)
+    command: rdmsrx -f 3:0 0x1b0  # IA32_ENERGY_PERF_BIAS: Performance Energy Bias Hint (0 is highest perf, 15 is highest energy saving)
     superuser: true
     modprobe: msr
     parallel: true
   - label: rdmsr 0x1ad
-    command: rdmsr 0x1ad  # MSR_TURBO_RATIO_LIMIT: Maximum Ratio Limit of Turbo Mode
+    command: rdmsrx 0x1ad  # MSR_TURBO_RATIO_LIMIT: Maximum Ratio Limit of Turbo Mode
     superuser: true
     modprobe: msr
     parallel: true
   - label: rdmsr 0x1ae
-    command: rdmsr 0x1ae  # MSR_TURBO_GROUP_CORE_CNT: Group Size of Active Cores for Turbo Mode Operation
+    command: rdmsrx 0x1ae  # MSR_TURBO_GROUP_CORE_CNT: Group Size of Active Cores for Turbo Mode Operation
     superuser: true
     modprobe: msr
     parallel: true
   - label: rdmsr 0x4f
-    command: rdmsr -a 0x4f  # MSR_PPIN: Protected Processor Inventory Number
+    command: rdmsrx -a 0x4f  # MSR_PPIN: Protected Processor Inventory Number
     superuser: true
     modprobe: msr
     parallel: true
   - label: rdmsr 0x610
-    command: rdmsr -f 14:0 0x610  # MSR_PKG_POWER_LIMIT: Package limit in bits 14:0
+    command: rdmsrx -f 14:0 0x610  # MSR_PKG_POWER_LIMIT: Package limit in bits 14:0
     superuser: true
     modprobe: msr
     parallel: true
   - label: rdmsr 0x6d
-    command: rdmsr 0x6d  # TODO: what is the name/ID of this MSR? SPR Features
+    command: rdmsrx 0x6d  # TODO: what is the name/ID of this MSR? SPR Features
     superuser: true
     modprobe: msr
     parallel: true
   - label: rdmsr 0xc90
-    command: rdmsr 0xc90
+    command: rdmsrx 0xc90
     superuser: true
     modprobe: msr
     parallel: true
   - label: uncore cha count
-    command: rdmsr 0x702
+    command: rdmsrx 0x702
     superuser: true
     modprobe: msr
     parallel: true
   - label: uncore client cha count
-    command: rdmsr 0x396
+    command: rdmsrx 0x396
     superuser: true
     modprobe: msr
     parallel: true
   - label: uncore cha count spr
-    command: rdmsr 0x2FFE
+    command: rdmsrx 0x2FFE
     superuser: true
     modprobe: msr
     parallel: true
   - label: uncore max frequency
-    command: rdmsr -f 6:0 0x620  # MSR_UNCORE_RATIO_LIMIT: MAX_RATIO in bits 6:0
+    command: rdmsrx -f 6:0 0x620  # MSR_UNCORE_RATIO_LIMIT: MAX_RATIO in bits 6:0
     superuser: true
     modprobe: msr
     parallel: true
   - label: uncore min frequency
-    command: rdmsr -f 14:8 0x620  # MSR_UNCORE_RATIO_LIMIT: MIN_RATIO in bits 14:8
+    command: rdmsrx -f 14:8 0x620  # MSR_UNCORE_RATIO_LIMIT: MIN_RATIO in bits 14:8
     superuser: true
     modprobe: msr
     parallel: true
   - label: active idle utilization point
     command: |-
-        wrmsr 0xb0 0x80000694  # must write this value to this MSR before reading 0xb1
-        rdmsr -f 15:8 0xb1 # ACTIVE IDLE - UTILIZATION POINT
+        wrmsrx 0xb0 0x80000694  # must write this value to this MSR before reading 0xb1
+        rdmsrx -f 15:8 0xb1 # ACTIVE IDLE - UTILIZATION POINT
     superuser: true
     modprobe: msr
     parallel: true
   - label: active idle mesh frequency
     command: |-
-        wrmsr 0xb0 0x80000694  # must write this value to this MSR before reading 0xb1
-        rdmsr -f 7:0 0xb1 # ACTIVE IDLE - MESH FREQUENCY
+        wrmsrx 0xb0 0x80000694  # must write this value to this MSR before reading 0xb1
+        rdmsrx -f 7:0 0xb1 # ACTIVE IDLE - MESH FREQUENCY
     superuser: true
     modprobe: msr
     parallel: true

version.txt

@@ -1 +1 @@
-2.7.3
+2.7.4