On Thu, Feb 07, 2019 at 02:47:52PM +0100, olichtne(a)redhat.com wrote:
From: Ondrej Lichtner <olichtne(a)redhat.com>
The guest only has 16G ram in our lab, using 13000x2MB=26GB hugepage
memory that can lead to the OOM killer causing problems, e.g. killing
testpmd which will break the setup and then cause deconfiguration
hangs...
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
recipes/regression_tests/phase3/ovs-dpdk-pvp.py | 3 ++-
recipes/regression_tests/phase3/ovs-dpdk-pvp.xml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
b/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
index b17227c..ab2639c 100644
--- a/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
+++ b/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
@@ -117,6 +117,7 @@ host2_dpdk_cores = ctl.get_alias("host2_dpdk_cores")
guest_testpmd_cores = ctl.get_alias("guest_testpmd_cores")
guest_dpdk_cores = ctl.get_alias("guest_dpdk_cores")
nr_hugepages = int(ctl.get_alias("nr_hugepages"))
+guest_nr_hugepages = int(ctl.get_alias("guest_nr_hugepages"))
socket_mem = int(ctl.get_alias("socket_mem"))
guest_mem_amount = ctl.get_alias("guest_mem_amount")
guest_virtname = ctl.get_alias("guest_virtname")
@@ -318,7 +319,7 @@ g_nic2_out = run_ssh_command_on_guest("ethtool -i %s" %
g_nic2_name, guest, h2,
g_nic1_pci = re.search("^bus-info: (\S+)$", g_nic1_out,
re.MULTILINE).group(1)
g_nic2_pci = re.search("^bus-info: (\S+)$", g_nic2_out,
re.MULTILINE).group(1)
-run_ssh_command_on_guest("echo -n %d
>/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages" % nr_hugepages, guest,
h2, guest_virtname)
+run_ssh_command_on_guest("echo -n %d
>/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages" % guest_nr_hugepages,
guest, h2, guest_virtname)
run_ssh_command_on_guest("modprobe -r vfio_iommu_type1", guest, h2,
guest_virtname)
run_ssh_command_on_guest("modprobe -r vfio", guest, h2, guest_virtname)
run_ssh_command_on_guest("modprobe vfio enable_unsafe_noiommu_mode=1", guest,
h2, guest_virtname)
diff --git a/recipes/regression_tests/phase3/ovs-dpdk-pvp.xml
b/recipes/regression_tests/phase3/ovs-dpdk-pvp.xml
index 4968f7d..1e69d43 100644
--- a/recipes/regression_tests/phase3/ovs-dpdk-pvp.xml
+++ b/recipes/regression_tests/phase3/ovs-dpdk-pvp.xml
@@ -9,6 +9,7 @@
<alias name="guest_testpmd_cores" value="0x7" />
<alias name="guest_dpdk_cores" value="0x6" />
<alias name="nr_hugepages" value="13000" />
+ <alias name="guest_nr_hugepages" value="3000" />
<alias name="socket_mem" value="2048" />
<alias name="trex_dir" value="" />
<alias name="guest_mem_amount" value="16777216" />
--
2.20.1
Tested this in beaker, should work and fix issues we've had for the past
couple of test runs. Pushing to master...
-Ondrej