remove hacks to handle /pcm/resctrl and unessesary out-of-date files

Author: ppalucki

KUBERNETES.md

@@ -104,11 +104,6 @@ More information here: https://kubernetes.io/docs/tutorials/security/ns-level-ps
 | perf-topdown  | /sys/bus/event_source/devices/cpu/events                   |                                 | yes                   | cpucounters.cpp:perfSupportsTopDown()                    | sysMount (TODO: conflicts with sys/fs)              |
 | RDT           | uses "msr" or "resctrl" interface                          | PCM_NO_RDT                      | 0 / 0                 | cpucounters.cpp:isRDTDisabled()/QOSMetricAvailable()     | PCM_NO_RDT                                          |
 | resctrl       | RW: /sys/fs/resctrl                                        | PCM_USE_RESCTRL                 | 0 / 0                 | resctrl.cpp                                              | resctrlHostMount                                    |
-|               | Notes:                                                     |                                 |                       |                                                          |                                                     |
-|               | * privileged "inside" mount or RW bind mount               |                                 |                       |                                                          |                                                     |
-|               | * /pcm/resctrl unprivileged (TODO WORKS!                   |                                 |                       |                                                          |                                                     |
-|               | * unprivileged RW bind mount in sys (TODO: doesn't work!)  |                                 |                       |                                                          |                                                     |
-|               | * unprivileged "inside" mount in sys (TODO: doesn't work!) |                                 |                       |                                                          |                                                     |
 | 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                      | 0 / 0                 | msr.cpp:MsrHandle()                                      | privileged or values-device-injector.yaml           |
 |               | RW: /dev/mem                                               | ?                               | 0 / 0                 | cpucounters.cpp:initUncoreObjects, pci.cpp:PCIHandleM()  | privileged or values-device-injector.yaml           |
@@ -118,6 +113,12 @@ More information here: https://kubernetes.io/docs/tutorials/security/ns-level-ps
 
 ### Validation on local kind cluster
 
+
+#### Requirements
+
+- kubectl/kind/helm/jq binaries available in PATH
+- docker service up and running
+
 #### 1) Optionally mount resctrl filesystem
 
 ```
@@ -191,9 +192,9 @@ helm install prometheus prometheus-community/kube-prometheus-stack --set prometh
 kubectl get sts prometheus-prometheus-kube-prometheus-prometheus
 ```
 
-#### 5) Deploy PCM helm chart in pcm namespace
+#### 5) Deploy PCM helm chart
 
-Deploy to "pcm" namespace
+Deploy with defaults:
 ```
 # Deploy to current namespace with defaults
 helm install pcm . 

deployment/pcm/README.md

@@ -139,9 +139,6 @@ spec:
           readOnly: true  # RW?
         {{- end }}
         {{- if .Values.resctrlHostMount }}
-        #- mountPath: /sys/fs/resctrl # HACK because issues with sys mounting! ?!?!?! really?
-        # - mountPath: /pcm/resctrl
-        #   name: sysfs-resctrl
         - mountPath: /sys/fs/resctrl
           name: sysfs-resctrl
         {{- end }}

deployment/pcm/templates/daemonset.yaml

@@ -1864,9 +1864,9 @@ void PCM::initUncoreObjects()
 #ifdef _MSC_VER
             std::cerr << "You must have signed msr.sys driver in your current directory and have administrator rights to run this program.\n";
 #else
-            std::cerr << "you must have read and write permissions for /proc/bus/pci/7f/10.* and /proc/bus/pci/ff/10.* devices (the 'chown' command can help).\n";
-            std::cerr << "you must have read and write permissions for /dev/mem device (the 'chown' command can help).\n";
-            std::cerr << "you must have read permission for /sys/firmware/acpi/tables/MCFG device (the 'chmod' command can help).\n";
+            //std::cerr << "you must have read and write permissions for /proc/bus/pci/7f/10.* and /proc/bus/pci/ff/10.* devices (the 'chown' command can help).\n";
+            //std::cerr << "you must have read and write permissions for /dev/mem device (the 'chown' command can help).\n";
+            //std::cerr << "you must have read permission for /sys/firmware/acpi/tables/MCFG device (the 'chmod' command can help).\n";
             std::cerr << "You must be root to access server uncore counters in PCM.\n";
 #endif
         }
@@ -6830,7 +6830,7 @@ void initSocket2Bus(std::vector<std::pair<uint32, uint32> > & socket2bus, uint32
                 // match
                 if (DEV_IDS[i] == device_id)
                 {
-                    std::cerr << "PCI: DEBUG: found bus " << std::hex << bus << " with device ID " << device_id << std::dec << "\n";
+                    // std::cout << "DEBUG: found bus " << std::hex << bus << " with device ID " << device_id << std::dec << "\n";
                     socket2bus.push_back(std::make_pair(group, bus));
                     break;
                 }

src/cpucounters.cpp

@@ -1294,7 +1294,7 @@ int mainThrows(int argc, char * argv[])
     set_signal_handlers();
 
     cerr << "\n";
-    cerr << " FOO1 Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
+    cerr << " Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
     cerr << "\n";
 
     cerr << "\n";

src/pcm.cpp

@@ -17,8 +17,7 @@ namespace pcm
     bool Resctrl::isMounted()
     {
         struct stat st;
-	//if (stat("/sys/fs/resctrl/mon_groups", &st) < 0)
-        if (stat("/pcm/resctrl/mon_groups", &st) < 0)
+        if (stat("/sys/fs/resctrl/mon_groups", &st) < 0)
         {
             return false;
         }
@@ -28,9 +27,9 @@ namespace pcm
     {
         if (isMounted() == false)
         {
-            std::cerr << "ERROR: /pcm/resctrl is not mounted\n";
+            std::cerr << "ERROR: /sys/fs/resctrl is not mounted\n";
             std::cerr << "ERROR: RDT metrics (L3OCC,LMB,RMB) will not be available\n";
-            std::cerr << "Mount it to make it work: mount -t resctrl resctrl /pcm/resctrl\n";
+            std::cerr << "Mount it to make it work: mount -t resctrl resctrl /sys/fs/resctrl\n";
             return;
         }
         const auto numCores = pcm.getNumCores();

src/resctrl.cpp

@@ -28,7 +28,7 @@ namespace pcm
         FileMapType L3OCC, MBL, MBT;
         Resctrl() = delete;
         size_t getMetric(const FileMapType & fileMap, int core);
-        static constexpr auto PCMPath = "/pcm/resctrl/mon_groups/pcm";
+        static constexpr auto PCMPath = "/sys/fs/resctrl/mon_groups/pcm";
     public:
         Resctrl(PCM & m) : pcm(m) {}
         bool isMounted();