rename resctrlHostMount to resctrlMount

intel · May 23, 2024 · 7c6a03c · 7c6a03c
1 parent 5c4bb9e
commit 7c6a03c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/deployment/pcm/README.md b/deployment/pcm/README.md
@@ -366,7 +366,7 @@ kubectl logs ds/pcm
 | perf-uncore   | sys_perf_open() perf_paranoid<=0/privileged/CAP_ADMIN      | PCM_USE_UNCORE_PERF             | use perf for uncore   | programPerfEvent(), PerfVirtualControlRegister()         |                                                     |
 | perf-topdown  | /sys/bus/event_source/devices/cpu/events                   | sysMount                        | yes                   | cpucounters.cpp:perfSupportsTopDown()                    | TODO: conflicts with sys/fs/resctrl                 |
 | RDT           | uses "msr" or "resctrl" interface                          | PCM_NO_RDT                      | yes                   | cpucounters.cpp:isRDTDisabled()/QOSMetricAvailable()     |                                                     |
-| resctrl       | RW: /sys/fs/resctrl                                        | PCM_USE_RESCTRL                 | yes                   | resctrl.cpp                                              | resctrlHostMount                                    |
+| resctrl       | RW: /sys/fs/resctrl                                        | PCM_USE_RESCTRL                 | yes                   | resctrl.cpp                                              | resctrlMount                                    |
 | watchdog      | RO/RW: /proc/sys/kernel/nmi_watchdog                       | PCM_KEEP_NMI_WATCHDOG           | yes (tries to disable)| src/cpucounters.cpp:disableNMIWatchdog()                 |                                                     |
 | msr           | RW: /dev/cpu/X/msr + privileged or CAP_ADMIN/CAP_RAWIO     | PCM_NO_MSR                      | msr is disabled       | msr.cpp:MsrHandle()                                      | privileged or some method to access /dev/cpu        |
 |               | RW: /dev/mem                                               | ?                               | msr is disabled       | cpucounters.cpp:initUncoreObjects, pci.cpp:PCIHandleM()  | privileged or some method to access /dev/cpu        |

diff --git a/deployment/pcm/docs/direct-unprivileged-examples/values-direct-unprivileged.yaml b/deployment/pcm/docs/direct-unprivileged-examples/values-direct-unprivileged.yaml
@@ -10,7 +10,7 @@ PCM_NO_RDT: 0               # Collect RDT data
 PCM_USE_RESCTRL: 0          # using MSR (no resctrl)
 
 # RDT metrics will be used by direct msr programming
-resctrlHostMount: false     
+resctrlMount: false     
 resctrlInsideMount: false
 
 # sys and pci mounts are required for uncore PMU devices discovery

diff --git a/deployment/pcm/templates/daemonset.yaml b/deployment/pcm/templates/daemonset.yaml
@@ -153,7 +153,7 @@ spec:
           name: nmi-watchdog
           readOnly: true  # RW? # TODO
         {{- end }}
-        {{- if .Values.resctrlHostMount }}
+        {{- if .Values.resctrlMount }}
         - mountPath: /sys/fs/resctrl
           name: sysfs-resctrl
         {{- end }}
@@ -193,7 +193,7 @@ spec:
       #   hostPath:
       #     path: /sys/firmware/acpi/tables/MCFG
       # {{- end }}
-      {{- if .Values.resctrlHostMount }}
+      {{- if .Values.resctrlMount }}
       - name: sysfs-resctrl
         hostPath:
           path: /sys/fs/resctrl

diff --git a/deployment/pcm/values-direct-privileged.yaml b/deployment/pcm/values-direct-privileged.yaml
@@ -9,7 +9,7 @@ PCM_NO_RDT: 0               # Enable RDT metrics ...
 PCM_USE_RESCTRL: 0          # but using MSR (no resctrl filesystem)
 
 # with privileged container addtional mounts aren't required
-resctrlHostMount: false     # with MSR resctrl mount is not needed
+resctrlMount: false     # with MSR resctrl mount is not needed
 resctrlInsideMount: false
 sysMount: false
 pciMount: false

diff --git a/deployment/pcm/values-vm.yaml b/deployment/pcm/values-vm.yaml
@@ -3,4 +3,4 @@ nmiWatchdogMount: true
 
 # Disable RDT because is not avaiable for VM instances
 PCM_NO_RDT: 1                 
-resctrlHostMount: false
+resctrlMount: false
diff --git a/deployment/pcm/values.yaml b/deployment/pcm/values.yaml
@@ -60,7 +60,7 @@ PCM_NO_RDT: 0                 # 0 - try to collect RDT data, enables local/remot
 PCM_USE_RESCTRL: 1            # use Linux Perf  instead of MSR access (more reliable)
 # required for indirect RDT access, not available for VM only in baremetal
 # do not mount by default RDT can be also accessed through direct MSR programming
-resctrlHostMount: true        # mount from external host
+resctrlMount: true        # mount from external host
 resctrlInsideMount: false     # TODO: mount inside with extra call to mount, requires image with mount installed - doesn't require 
 
 ### -------------- Other (NMI handling and/or on VM/AWS)