moved pmutool installation to integ test dockerfile

Signed-off-by: Shyam Jesal <[email protected]>

Author: shyamjesal

configs/.wordlist.txt

@@ -308,6 +308,7 @@ multithreaded
 namespaces
 nd
 neuroevolution
+nmi
 noicon
 nr
 orchestrator
@@ -322,6 +323,7 @@ pragmas
 pre
 preconfigured
 priyank
+proc
 profileCPU
 profileCPUID
 profileTime
@@ -348,6 +350,7 @@ snapshotting
 stateful
 sudo
 svc
+sys
 th
 toc
 toml

docs/profiling.md

@@ -80,8 +80,10 @@ Profiler:
 ## Pre-requisites
 At the root of this repository, please run the following script to install the essential tools
 for profiling and binding.
-```
-scripts/install_pmutool.sh 
+```bash
+scripts/install_pmutool.sh
+# disabling nmi watchdog to minimize multiplexing
+sudo echo 0 > /proc/sys/kernel/nmi_watchdog
 ```
 
 ## Quick-start guide

scripts/github_runner/Dockerfile.github_runner

@@ -45,6 +45,7 @@ RUN apt-get update && \
     bc \
     dmsetup \
     gnupg-agent \
+    numactl \
     software-properties-common && \
     sudo sysctl -w net.ipv4.conf.all.forwarding=1 && \
     sudo sysctl net.ipv4.ip_forward=1 && \
@@ -56,6 +57,7 @@ RUN apt-get update && \
 
 COPY scripts/github_runner/setup_runner.sh /setup_runner.sh
 COPY scripts/create_devmapper.sh /create_devmapper.sh
+COPY scripts/install_pmutools.sh /install_pmutools.sh
 COPY bin/firecracker /usr/local/bin/
 COPY bin/jailer /usr/local/bin/
 COPY bin/containerd-shim-aws-firecracker /usr/local/bin/

scripts/github_runner/setup_runner.sh

@@ -31,4 +31,11 @@ if [ 64 -eq ${#CONTAINERID} ]; then
   sudo sed -i "s/fc-dev-thinpool/${CONTAINERID}_thinpool/" /etc/firecracker-containerd/config.toml
 fi
 
-/create_devmapper.sh
+/create_devmapper.sh
+
+sudo apt-get install linux-tools-`uname -r` -y
+
+if [ ! -d "/usr/local/pmu-tools" ]; then
+  ln -s /usr/bin/python3 /usr/bin/python
+  /install_pmutools.sh
+fi

scripts/github_runner/setup_runner_host.sh

@@ -45,7 +45,6 @@ sudo apt-get install --yes docker-ce docker-ce-cli containerd.io >> /dev/null
 
 PWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 $PWD/../install_go.sh
-$PWD/../install_pmutools.sh
 
 # install kind from ease-lab/kind
 rm -rf /tmp/kind/
@@ -57,6 +56,9 @@ sudo mv kind /usr/local/bin/
 sudo usermod -aG docker $USER
 newgrp docker
 
+# Allow profiling using Perf / PMU tools
+sudo sysctl -w kernel.perf_event_paranoid=-1
+
 #setup crontab for nightly reboots
 TMPFILE=$(mktemp)
 #write out current crontab

scripts/install_pmutools.sh

@@ -24,14 +24,12 @@
 
 set -e
 
-sudo apt-get install linux-tools-`uname -r` -y
-sudo apt install numactl
+sudo apt-get install numactl \
+    linux-tools-`uname -r`  -y
 
 sudo git clone https://github.com/andikleen/pmu-tools /usr/local/pmu-tools
 
 sudo sysctl -w kernel.perf_event_paranoid=-1
-export PATH=$PATH:/usr/local/pmu-tools
-sudo sh -c  "echo 'export PATH=\$PATH:/usr/local/pmu-tools' >> /etc/profile"
 
 # first run, download essential files
-toplev --print > /dev/null
+/usr/local/pmu-tools/toplev --print > /dev/null