9:26 a.m.
From: Ondrej Lichtner <olichtne(a)redhat.com>
The previous attempt to remove problems with rx offload on team and bond
devices turned out to be incorrect since i just removed the setting
where we tried running rx=off when in fact the problem is that we're
trying to run rx=on in every other setting. This patch removes the rx
offload from all the settings completely to fix this issue.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
recipes/regression_tests/phase1/3_vlans_over_bond.py | 10 +++++-----
recipes/regression_tests/phase1/bonding_test.py | 10 +++++-----
.../phase1/virtual_bridge_2_vlans_over_bond.py | 10 +++++-----
recipes/regression_tests/phase2/3_vlans_over_team.py | 10 +++++-----
recipes/regression_tests/phase2/team_test.py | 10 +++++-----
.../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 10 +++++-----
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index 291df08..e998480 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -23,11 +23,11 @@ m2.sync_resources(modules=["IcmpPing",
"Icmp6Ping", "Netperf"])
# ------
vlans = ["vlan10", "vlan20", "vlan30"]
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
+offloads = ["gro", "gso", "tso", "tx"]
+offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 49632ab..8909ca0 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -23,11 +23,11 @@ m2.sync_resources(modules=["IcmpPing",
"Icmp6Ping", "Netperf"])
# TESTS
# ------
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
+offloads = ["gro", "gso", "tso", "tx"]
+offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
index 9b255c5..8b580a9 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
@@ -30,11 +30,11 @@ g4.sync_resources(modules=["IcmpPing",
"Icmp6Ping", "Netperf"])
# TESTS
# ------
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
+offloads = ["gro", "gso", "tso", "tx"]
+offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
ipv = ctl.get_alias("ipv")
netperf_duration = int(ctl.get_alias("netperf_duration"))
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 0920d69..de7f955 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -23,11 +23,11 @@ m2.sync_resources(modules=["IcmpPing",
"Icmp6Ping", "Netperf"])
# ------
vlans = ["vlan10", "vlan20", "vlan30"]
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
+offloads = ["gro", "gso", "tso", "tx"]
+offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index b17a5c0..50e8364 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -22,11 +22,11 @@ m2.sync_resources(modules=["IcmpPing",
"Icmp6Ping", "Netperf"])
# TESTS
# ------
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
+offloads = ["gro", "gso", "tso", "tx"]
+offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
diff --git
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
index 4b9b096..6f02921 100644
---
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
+++
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
@@ -30,11 +30,11 @@ g4.sync_resources(modules=["IcmpPing",
"Icmp6Ping", "Netperf"])
# TESTS
# ------
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on"),
("rx", "on")],
- [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")]]
+offloads = ["gro", "gso", "tso", "tx"]
+offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"off"), ("tso", "off"), ("tx", "on")],
+ [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
ipv = ctl.get_alias("ipv")
netperf_duration = int(ctl.get_alias("netperf_duration"))
--
2.6.2