From ecd443c76bbbf955e70233013cb0a31f5b001710 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Tue, 5 Mar 2019 15:13:35 +0000
Subject: [PATCH 1/2] Detect irqbalance presence and suggest remedy

This patch will print a warning if a network function tries to bind
to a CPU, but irqbalance is detected.  Irqbalance, installed by default
on Debian-derived systems, will modify CPU affinities for IRQ
handlers in an effort to spread out the IRQ-processing load among
CPUs.  However this is not what we want in Snabb; we do not want
data-plane CPUs to run IRQ handlers, and we do not want bug reports
coming from users that have this daemon installed.

See https://github.com/snabbco/snabb/blob/master/src/doc/performance-tuning.md#avoid-interrupts-on-data-plane-cpus, for more details.
---
 src/lib/numa.lua | 56 +++++++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/lib/numa.lua b/src/lib/numa.lua
index 60cb80af6b..078b04fa42 100644
--- a/src/lib/numa.lua
+++ b/src/lib/numa.lua
@@ -141,6 +141,39 @@ function check_affinity_for_pci_addresses (addrs)
    end
 end
 
+local irqbalanced_checked = false
+local function assert_irqbalanced_disabled (warn)
+   if irqbalanced_checked then return end
+   irqbalanced_checked = true
+   for path in os.getenv('PATH'):split(':') do
+      if S.stat(path..'/irqbalance') then
+         if S.stat('/etc/default/irqbalance') then
+            for line in io.lines('/etc/default/irqbalance') do
+               if line:match('^ENABLED=0') then return end
+            end
+         end
+         warn('Irqbalanced detected; this will hurt performance!  %s',
+              'Consider uninstalling via "sudo apt-get uninstall irqbalance" and rebooting.')
+      end
+   end
+end
+
+local function check_cpu_performance_tuning (cpu, strict)
+   local warn = warn
+   if strict then warn = die end
+   assert_irqbalanced_disabled(warn)
+   local path = '/sys/devices/system/cpu/cpu'..cpu..'/cpufreq/scaling_governor'
+   local gov = assert(io.open(path)):read()
+   if not gov:match('performance') then
+      warn('Expected performance scaling governor for CPU %s, but got "%s"',
+           cpu, gov)
+   end
+
+   if not isolated_cpus()[cpu] then
+      warn('Expected dedicated core, but CPU %s is not in isolcpus set', cpu)
+   end
+end
+
 function unbind_cpu ()
    local cpu_set = S.sched_getaffinity()
    cpu_set:zero()
@@ -169,13 +202,7 @@ function bind_to_cpu (cpu, skip_perf_checks)
 
    bind_to_numa_node (cpu_and_node.node)
 
-   if not skip_perf_checks then
-      local ok, err = pcall(check_cpu_performance_tuning, bound_cpu)
-      if not ok then
-         warn("Error checking performance tuning on CPU %s: %s",
-              bound_cpu, tostring(err))
-      end
-   end
+   if not skip_perf_checks then check_cpu_performance_tuning(bound_cpu) end
 end
 
 function unbind_numa_node ()
@@ -210,21 +237,6 @@ function prevent_preemption(priority)
       'Failed to enable real-time scheduling.  Try running as root.')
 end
 
-function check_cpu_performance_tuning (cpu, strict)
-   local warn = warn
-   if strict then warn = die end
-   local path = '/sys/devices/system/cpu/cpu'..cpu..'/cpufreq/scaling_governor'
-   local gov = assert(io.open(path)):read()
-   if not gov:match('performance') then
-      warn('Expected performance scaling governor for CPU %s, but got "%s"',
-           cpu, gov)
-   end
-
-   if not isolated_cpus()[cpu] then
-      warn('Expected dedicated core, but CPU %s is not in isolcpus set', cpu)
-   end
-end
-
 function selftest ()
 
    local cpus = parse_cpuset("0-5,7")

From 9f7177bc988ffd793c0d85771d8c445829c00a52 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Wed, 6 Mar 2019 13:37:55 +0000
Subject: [PATCH 2/2] Fix uninstall advice for irqbalance

---
 src/lib/numa.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/numa.lua b/src/lib/numa.lua
index 078b04fa42..55b510be24 100644
--- a/src/lib/numa.lua
+++ b/src/lib/numa.lua
@@ -153,7 +153,7 @@ local function assert_irqbalanced_disabled (warn)
             end
          end
          warn('Irqbalanced detected; this will hurt performance!  %s',
-              'Consider uninstalling via "sudo apt-get uninstall irqbalance" and rebooting.')
+              'Consider uninstalling via "sudo apt-get remove irqbalance" and rebooting.')
       end
    end
 end