summaryrefslogtreecommitdiffstats
path: root/vnfs
diff options
context:
space:
mode:
authorChristian Trautman <ctrautma@redhat.com>2016-09-05 02:42:19 -0400
committerMaryam Tahhan <maryam.tahhan@intel.com>2016-09-14 14:43:49 +0000
commita325eb33fbe408243209b19f2d9cc288b2e57548 (patch)
tree035b86339e0ca4bfe2ff8ed6b9d2915dd9022bd6 /vnfs
parentacdb444a54124834acdde45107062eaf1452c119 (diff)
merge_buffers: Add option to disable merge buffer on qemu startup
In cases with VHost user and non-jumbo frame scenarios we can disable merge buffers on the guest NICS to improve performance. This patch adds this option to the 04_vnf conf file. JIRA: VSPERF-388 Change-Id: Ic1f776e90fdccaa5d5a0c952c96811a8747fe936 Signed-off-by: Christian Trautman <ctrautma@redhat.com>
Diffstat (limited to 'vnfs')
-rw-r--r--vnfs/qemu/qemu_dpdk_vhost_user.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/vnfs/qemu/qemu_dpdk_vhost_user.py b/vnfs/qemu/qemu_dpdk_vhost_user.py
index fc46aba1..794a4772 100644
--- a/vnfs/qemu/qemu_dpdk_vhost_user.py
+++ b/vnfs/qemu/qemu_dpdk_vhost_user.py
@@ -39,6 +39,12 @@ class QemuDpdkVhostUser(IVnfQemu):
else:
queue_str, mq_vector_str = '', ''
+ # Guest merge buffer setting
+ if S.getValue('GUEST_NIC_MERGE_BUFFERS_DISABLE')[self._number]:
+ merge_buff = 'mrg_rxbuf=off,'
+ else:
+ merge_buff = ''
+
# calculate index of first interface, i.e. check how many
# interfaces has been created for previous VMs, where 1st NIC
# of 1st VM has index 0
@@ -60,7 +66,8 @@ class QemuDpdkVhostUser(IVnfQemu):
'-device',
'virtio-net-pci,mac=' +
self._nics[nic]['mac'] +
- ',netdev=' + net + ',csum=off,gso=off,' +
+ ',netdev=' + net + ',csum=off,' + merge_buff +
+ 'gso=off,' +
'guest_tso4=off,guest_tso6=off,guest_ecn=off' +
mq_vector_str,
]