aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-07-23 12:28:15 +0000
committerPeter Mikus <pmikus@cisco.com>2019-07-23 15:40:59 +0000
commit01d9a0df1ed8143daa4fdcd0a05bfdcf3f34e7a6 (patch)
treecae1e5bcb4dd73b7fa6814938813fc93446bebf0
parent37f84f1ab71ca4d7401f3a04421ee3bef6c9a455 (diff)
FIX: Vhost optimization
- Testpmd 9000B - Disable fsck - Remove redundant init mounts Change-Id: Ia063520d0a206e9eee831a5cc692e32baf5a92c8 Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/python/DpdkUtil.py3
-rw-r--r--resources/libraries/python/QemuUtils.py8
-rw-r--r--resources/templates/vm/init.sh4
3 files changed, 4 insertions, 11 deletions
diff --git a/resources/libraries/python/DpdkUtil.py b/resources/libraries/python/DpdkUtil.py
index edce1721fe..bbd6987be4 100644
--- a/resources/libraries/python/DpdkUtil.py
+++ b/resources/libraries/python/DpdkUtil.py
@@ -67,8 +67,7 @@ class DpdkUtil(object):
# Set the number of queues in the RX to N.
options.add_equals_from_dict('rxq', 'pmd_rxq', kwargs, 1)
# Set the hexadecimal bitmask of offloads.
- options.add_equals_if_from_dict(
- 'txqflags', '0xf00', 'pmd_tx_offloads', kwargs, True)
+ options.add_equals_from_dict('tx-offloads', 'pmd_tx_offloads', kwargs)
# Set the number of mbufs to be allocated in the mbuf pools.
options.add_equals_from_dict('total-num-mbufs', 'pmd_num_mbufs', kwargs)
# Disable hardware VLAN.
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index 0895f95409..a4d8533d52 100644
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -196,7 +196,7 @@ class QemuUtils(object):
self._params.add_with_value(
'append', '"ro rootfstype=9p rootflags=trans=virtio '
'root=virtioroot console={console} tsc=reliable '
- 'hugepages=256 init={init}"'.format(
+ 'hugepages=256 init={init} fastboot"'.format(
console=console, init=self._temp.get('ini')))
def create_kernelvm_config_vpp(self, **kwargs):
@@ -262,9 +262,8 @@ class QemuUtils(object):
pmd_num_mbufs=16384,
pmd_rxq=kwargs['queues'],
pmd_txq=kwargs['queues'],
- pmd_tx_offloads=False,
+ pmd_tx_offloads='0x0',
pmd_disable_hw_vlan=False,
- pmd_max_pkt_len=9200 if kwargs['jumbo_frames'] else None,
pmd_nb_cores=str(self._opt.get('smp') - 1))
self._opt['vnf_bin'] = ('{testpmd_path}/{testpmd_cmd}'.
@@ -287,9 +286,8 @@ class QemuUtils(object):
pmd_eth_peer_1='1,{mac}'.format(mac=kwargs['vif2_mac']),
pmd_rxq=kwargs['queues'],
pmd_txq=kwargs['queues'],
- pmd_tx_offloads=False,
+ pmd_tx_offloads='0x0',
pmd_disable_hw_vlan=False,
- pmd_max_pkt_len=9200 if kwargs['jumbo_frames'] else None,
pmd_nb_cores=str(self._opt.get('smp') - 1))
self._opt['vnf_bin'] = ('{testpmd_path}/{testpmd_cmd}'.
diff --git a/resources/templates/vm/init.sh b/resources/templates/vm/init.sh
index 716ff9af08..446b49923d 100644
--- a/resources/templates/vm/init.sh
+++ b/resources/templates/vm/init.sh
@@ -1,6 +1,4 @@
#!/bin/bash
-mount -t sysfs -o "nodev,noexec,nosuid" sysfs /sys
-mount -t proc -o "nodev,noexec,nosuid" proc /proc
mkdir /dev/pts
mkdir /dev/hugepages
mount -t devpts -o "rw,noexec,nosuid,gid=5,mode=0620" devpts /dev/pts || true
@@ -11,7 +9,5 @@ echo 0000:00:06.0 > /sys/bus/pci/devices/0000:00:06.0/driver/unbind
echo 0000:00:07.0 > /sys/bus/pci/devices/0000:00:07.0/driver/unbind
echo vfio-pci > /sys/bus/pci/devices/0000:00:06.0/driver_override
echo vfio-pci > /sys/bus/pci/devices/0000:00:07.0/driver_override
-echo 0000:00:06.0 > /sys/bus/pci/drivers/vfio-pci/bind
-echo 0000:00:07.0 > /sys/bus/pci/drivers/vfio-pci/bind
$vnf_bin
poweroff -f