Autotune softirq (strizhechenko#132)

* Moved common logic from autorps to auto_softirq_tune and inherit autorps/autoxps from it. * Fixed: hardcoded queue prefix in auto_softirq_tune led to broken autoxps.
logicall · Jul 12, 2017 · 1e9269f · 1e9269f
1 parent d2149a1
commit 1e9269f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 25 deletions.
diff --git a/netutils_linux_tuning/__init__.py b/netutils_linux_tuning/__init__.py
@@ -6,6 +6,6 @@
 """
 from netutils_linux_tuning.rx_buffers import RxBuffersTune
 from netutils_linux_tuning.rss_ladder import RSSLadder
-from netutils_linux_tuning.autorps import AutoRPS
+from netutils_linux_tuning.auto_softirq_tune import AutoRPS, AutoXPS
 
-__all__ = ['RxBuffersTune', 'AutoRPS', 'RSSLadder']
+__all__ = ['RxBuffersTune', 'AutoRPS', 'AutoXPS', 'RSSLadder']
diff --git a/netutils_linux_tuning/autorps.py → netutils_linux_tuning/auto_softirq_tune.py b/netutils_linux_tuning/autorps.py → netutils_linux_tuning/auto_softirq_tune.py
@@ -1,5 +1,6 @@
 # coding=utf-8
-""" Receive Packet Steering tuning utility """
+""" Transmit Packet Steering tuning utility """
+
 import os
 
 from six import print_
@@ -8,11 +9,11 @@
 from netutils_linux_tuning.base_tune import CPUBasedTune
 
 
-class AutoRPS(CPUBasedTune):
+class AutoSoftirqTune(CPUBasedTune):
     """ Allows to use multi-cpu packets processing for budget NICs """
     numa = None
-    target = 'rps_cpus'
-    queue_prefix = 'rx'
+    target = None
+    queue_prefix = None
 
     def __init__(self):
         CPUBasedTune.__init__(self)
@@ -87,7 +88,7 @@ def detect_queues_real(self):
         :return: queue list to write cpu mask found by really reading /sys/
         """
         queue_dir = "/sys/class/net/{0}/queues/".format(self.options.dev)
-        return [queue for queue in os.listdir(queue_dir) if queue.startswith('rx')]
+        return [queue for queue in os.listdir(queue_dir) if queue.startswith(self.queue_prefix)]
 
     def lscpu(self):
         """
@@ -98,3 +99,15 @@ def lscpu(self):
         lscpu_output_filename = os.path.join(self.options.test_dir, "lscpu_output")
         lscpu_output = open(lscpu_output_filename).read()
         return str(lscpu_output) if isinstance(lscpu_output, bytes) else lscpu_output
+
+
+class AutoXPS(AutoSoftirqTune):
+    """ Allows to use multi-cpu packets processing for budget NICs """
+    target = 'xps_cpus'
+    queue_prefix = 'tx'
+
+
+class AutoRPS(AutoSoftirqTune):
+    """ Allows to use multi-cpu packets processing for budget NICs """
+    target = 'rps_cpus'
+    queue_prefix = 'rx'
diff --git a/netutils_linux_tuning/autorps_test.py b/netutils_linux_tuning/autorps_test.py
@@ -2,7 +2,7 @@
 
 from unittest import TestCase
 
-from netutils_linux_tuning.autorps import AutoRPS
+from netutils_linux_tuning.auto_softirq_tune import AutoRPS
 
 
 class AutoRPSTests(TestCase):

diff --git a/netutils_linux_tuning/autoxps.py b/netutils_linux_tuning/autoxps.py
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@ def read(*paths):
 
 setuptools.setup(
     name='netutils-linux',
-    version='2.2.4',
+    version='2.2.5',
     author='Oleg Strizhechenko',
     author_email='[email protected]',
     license='MIT',

diff --git a/utils/autorps b/utils/autorps
@@ -2,7 +2,7 @@
 
 # coding=utf-8
 
-from netutils_linux_tuning.autorps import AutoRPS
+from netutils_linux_tuning.auto_softirq_tune import AutoRPS
 
 if __name__ == '__main__':
     AutoRPS()
diff --git a/utils/autoxps b/utils/autoxps
@@ -2,7 +2,7 @@
 
 # coding=utf-8
 
-from netutils_linux_tuning.autoxps import AutoXPS
+from netutils_linux_tuning.auto_softirq_tune import AutoXPS
 
 if __name__ == '__main__':
     AutoXPS()