From: Christos Sfakianakis <csfakian(a)redhat.com>
Change tc qdisc to mq for the ethernet devices' root when
parallel perf streams are used. This feature has existed in
the old recipes.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
lnst/Recipes/ENRT/BondRecipe.py | 4 ++++
lnst/Recipes/ENRT/DoubleBondRecipe.py | 5 +++++
lnst/Recipes/ENRT/DoubleTeamRecipe.py | 5 +++++
lnst/Recipes/ENRT/SimplePerfRecipe.py | 4 ++++
lnst/Recipes/ENRT/TeamRecipe.py | 4 ++++
lnst/Recipes/ENRT/TeamVsBondRecipe.py | 5 +++++
lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py | 4 ++++
lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py | 4 ++++
lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py | 4 ++++
lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py | 4 ++++
lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py | 5 +++++
.../ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py | 4 ++++
lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 4 ++++
.../Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py | 4 ++++
lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 4 ++++
lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py | 5 +++++
lnst/Recipes/ENRT/VlansOverBondRecipe.py | 4 ++++
lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 4 ++++
lnst/Recipes/ENRT/VlansRecipe.py | 4 ++++
19 files changed, 81 insertions(+)
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py
index 4132f93..3a75373 100644
--- a/lnst/Recipes/ENRT/BondRecipe.py
+++ b/lnst/Recipes/ENRT/BondRecipe.py
@@ -68,6 +68,10 @@ class BondRecipe(BaseEnrtRecipe):
for dev in [m1.eth0, m1.eth1, m2.eth0]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m, d in [(m1, m1.eth0), (m1, m1.eth1), (m2, m2.eth0)]:
+ m.run("tc qdisc replace dev %s root mq" % d.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py
b/lnst/Recipes/ENRT/DoubleBondRecipe.py
index a135aee..44b11d2 100644
--- a/lnst/Recipes/ENRT/DoubleBondRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py
@@ -69,6 +69,11 @@ class DoubleBondRecipe(BaseEnrtRecipe):
for dev in [m.eth0, m.eth1]:
self._pin_dev_interrupts(m.eth0, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [m1, m2]:
+ for dev in [m.eth0, m.eth1]:
+ m.run("tc qdisc replace dev %s root mq" % dev.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
index cfd7715..7ca5de1 100644
--- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
@@ -83,6 +83,11 @@ class DoubleTeamRecipe(BaseEnrtRecipe):
for dev in [m.eth1, m.eth2]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [m1, m2]:
+ for dev in [m.eth1, m.eth2]:
+ m.run("tc qdisc replace dev %s root mq" % dev.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/SimplePerfRecipe.py
b/lnst/Recipes/ENRT/SimplePerfRecipe.py
index 32a4fa8..9512c7a 100644
--- a/lnst/Recipes/ENRT/SimplePerfRecipe.py
+++ b/lnst/Recipes/ENRT/SimplePerfRecipe.py
@@ -64,6 +64,10 @@ class SimplePerfRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [m1, m2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/TeamRecipe.py b/lnst/Recipes/ENRT/TeamRecipe.py
index 036a36e..3d0b6f3 100644
--- a/lnst/Recipes/ENRT/TeamRecipe.py
+++ b/lnst/Recipes/ENRT/TeamRecipe.py
@@ -72,6 +72,10 @@ class TeamRecipe(BaseEnrtRecipe):
for dev in [m1.eth1, m1.eth2, m2.eth1]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m, d in [(m1, m1.eth1), (m1, m1.eth2), (m2, m2.eth1)]:
+ m.run("tc qdisc replace dev %s root mq" % d.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index ccf2b21..698b786 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -87,6 +87,11 @@ class TeamVsBondRecipe(BaseEnrtRecipe):
for dev in [m.eth1, m.eth2]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [m1, m2]:
+ for dev in [m.eth1, m.eth2]:
+ m.run("tc qdisc replace dev %s root mq" % dev.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index 47f53cf..3c8346f 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -101,6 +101,10 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index a72e8d4..aae90b7 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -83,6 +83,10 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, 0)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
index 04d3bba..e4f5c62 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -99,6 +99,10 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
index 62c19ec..da2713e 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -82,6 +82,10 @@ class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, 0)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index 089267f..9d0609e 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -131,6 +131,11 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
for dev in [m.eth0, m.eth1]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ for dev in [m.eth0, m.eth1]:
+ m.run("tc qdisc replace dev %s root mq" % dev.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
index 77e979e..43dff0a 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -104,6 +104,10 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth1, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth1.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
index b5d38a7..a04ce84 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -83,6 +83,10 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, 0)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
index 2e464c0..d7048ae 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
@@ -94,6 +94,10 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth1, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth1.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
index cceda69..ae214eb 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -80,6 +80,10 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, 0)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
index acaa39f..4dd29e8 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
@@ -140,6 +140,11 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):
for dev in [m.eth1, m.eth2]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [host1, host2]:
+ for dev in [m.eth1, m.eth2]:
+ m.run("tc qdisc replace dev %s root mq" % dev.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
index 2eae23e..7af3b93 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -89,6 +89,10 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
for dev in [m1.eth0, m1.eth1, m2.eth0]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m, d in [(m1, m1.eth0), (m1, m1.eth1), (m2, m2.eth0)]:
+ m.run("tc qdisc replace dev %s root mq" % d.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index c5cd954..e685e82 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -89,6 +89,10 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
for dev in [m1.eth1, m1.eth2, m2.eth1]:
self._pin_dev_interrupts(dev, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m, d in [(m1, m1.eth1), (m1, m1.eth2), (m2, m2.eth1)]:
+ m.run("tc qdisc replace dev %s root mq" % d.name)
+
return configuration
def test_wide_deconfiguration(self, config):
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index 6786724..de476cd 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -78,6 +78,10 @@ class VlansRecipe(BaseEnrtRecipe):
m.run("service irqbalance stop")
self._pin_dev_interrupts(m.eth0, self.params.dev_intr_cpu)
+ if self.params.perf_parallel_streams > 1:
+ for m in [m1, m2]:
+ m.run("tc qdisc replace dev %s root mq" % m.eth0.name)
+
return configuration
def test_wide_deconfiguration(self, config):
--
2.17.1