aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2016-07-12 17:09:22 +0100
committerMiroslav Miklus <mmiklus@cisco.com>2016-07-15 11:52:00 +0000
commitb037f5f0f010ebe3d1cf49ff4966733897bac814 (patch)
treed953c106ab023e051f7f5bc5ff368412acfd76ea
parentfd005636dc0a164987bad411fc3fa8318928f903 (diff)
CSIT-206 Adjust qemu runtime options
- Modify runtime optimization of qemu process in qemu library - Add ballon=none - Add option to set affinity - Add mem-prealloc - Add vhost extend options Change-Id: I721557d3e38599d783dfe0773f0593a250f8fae7 Signed-off-by: pmikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/python/QemuUtils.py29
1 files changed, 22 insertions, 7 deletions
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index d105dae89a..15c4e2315a 100644
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -39,9 +39,9 @@ class QemuUtils(object):
self._qemu_opt['smp'] = '-smp 1,sockets=1,cores=1,threads=1'
# Daemonize the QEMU process after initialization. Default one
# management interface.
- self._qemu_opt['options'] = '-daemonize -enable-kvm ' \
+ self._qemu_opt['options'] = '-cpu host -daemonize -enable-kvm ' \
'-machine pc-1.0,accel=kvm,usb=off,mem-merge=off ' \
- '-net nic,macaddr=52:54:00:00:02:01'
+ '-net nic,macaddr=52:54:00:00:02:01 -balloon none'
self._qemu_opt['ssh_fwd_port'] = 10022
# Default serial console port
self._qemu_opt['serial_port'] = 4556
@@ -51,6 +51,8 @@ class QemuUtils(object):
self._qemu_opt['huge_mnt'] = '/mnt/huge'
# Default image for CSIT virl setup
self._qemu_opt['disk_image'] = '/var/lib/vm/vhost-nested.img'
+ # Affinity of qemu processes
+ self._qemu_opt['affinity'] = False
# VM node info dict
self._vm_info = {
'type': NodeType.VM,
@@ -102,7 +104,7 @@ class QemuUtils(object):
:param mem_size: RAM size in Mega Bytes.
:type mem_size: int
"""
- self._qemu_opt['mem_size'] = mem_size
+ self._qemu_opt['mem_size'] = int(mem_size)
def qemu_set_huge_mnt(self, huge_mnt):
"""Set hugefile mount point.
@@ -120,6 +122,14 @@ class QemuUtils(object):
"""
self._qemu_opt['disk_image'] = disk_image
+ def qemu_set_affinity(self, mask):
+ """Set qemu affinity by taskset with cpu mask.
+
+ :param mask: Hex CPU mask.
+ :type mask: str
+ """
+ self._qemu_opt['affinity'] = mask
+
def qemu_set_node(self, node):
"""Set node to run QEMU on.
@@ -157,9 +167,11 @@ class QemuUtils(object):
# e.g. vhost1 MAC is 52:54:00:00:04:01
if mac is None:
mac = '52:54:00:00:04:{0:02x}'.format(self._vhost_id)
+ extend_options = 'csum=off,gso=off,guest_tso4=off,guest_tso6=off,'\
+ 'guest_ecn=off,mrg_rxbuf=off'
# Create Virtio network device.
- device = ' -device virtio-net-pci,netdev=vhost{0},mac={1}'.format(
- self._vhost_id, mac)
+ device = ' -device virtio-net-pci,netdev=vhost{0},mac={1},{2}'.format(
+ self._vhost_id, mac, extend_options)
self._qemu_opt['options'] += device
# Add interface MAC and socket to the node dict
if_data = {'mac_address': mac, 'socket': socket}
@@ -334,7 +346,7 @@ class QemuUtils(object):
self._qemu_opt.get('ssh_fwd_port'))
# Memory and huge pages
mem = '-object memory-backend-file,id=mem,size={0}M,mem-path={1},' \
- 'share=on -m {0} -numa node,memdev=mem'.format(
+ 'share=on -m {0} -numa node,memdev=mem -mem-prealloc'.format(
self._qemu_opt.get('mem_size'), self._qemu_opt.get('huge_mnt'))
self._huge_page_check()
# Setup QMP via unix socket
@@ -348,9 +360,12 @@ class QemuUtils(object):
'-device isa-serial,chardev=qga0'
# Graphic setup
graphic = '-monitor none -display none -vga none'
+ qbin = 'taskset {0} {1}'.format(self._qemu_opt.get('affinity'),
+ self.__QEMU_BIN) if self._qemu_opt.get(
+ 'affinity') else self.__QEMU_BIN
# Run QEMU
cmd = '{0} {1} {2} {3} {4} -hda {5} {6} {7} {8} {9}'.format(
- self.__QEMU_BIN, self._qemu_opt.get('smp'), mem, ssh_fwd,
+ qbin, self._qemu_opt.get('smp'), mem, ssh_fwd,
self._qemu_opt.get('options'),
self._qemu_opt.get('disk_image'), qmp, serial, qga, graphic)
(ret_code, _, stderr) = self._ssh.exec_command_sudo(cmd, timeout=300)