From 7f98a9cdf06b03e5b16828677ecd7daccdc4b5ad Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Wed, 13 Nov 2019 09:53:23 +0530 Subject: Upgrade: Upgrade Upstream Software packages in VSPERF. This patch upgrades following upstream software packages: 1. DPDK: from 17.08 to 18.11-rc2 2. OVS: from 2.8.1 to 2.12.0 3. VPP: from 17.07 to 19.08.1 4. QEMU: from 2.9.1 to 3.1.1 Changed the vpp_plugins path in 02_vswitch.conf: from lib64/vpp_plugins to lib/vpp_plugins JIRA: VSPERF-606 Signed-off-by: Sridhar K. N. Rao Change-Id: Ib3018a7254e61337141773787cb5d3ea1cff18f4 --- conf/02_vswitch.conf | 2 +- conf/04_vnf.conf | 16 ++++++++++------ src/dpdk/Makefile | 4 ++-- src/package-list.mk | 8 ++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index 84ef71cb..283da278 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -115,7 +115,7 @@ PATHS['vswitch'] = { 'path': os.path.join(ROOT_DIR, 'src/vpp/vpp/build-root/install-vpp-native/vpp'), 'vpp': 'bin/vpp', 'vppctl': 'bin/vppctl', - 'vpp_plugin_path' : 'lib64/vpp_plugins', + 'vpp_plugin_path' : 'lib/vpp_plugins', }, 'bin': { 'vpp': 'vpp', diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index a6a31e9d..1574ca8d 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -87,8 +87,9 @@ GUEST_TIMEOUT = [180] # Guest images may require different drive types such as ide to mount shared # locations and/or boot correctly. You can modify the types here. -GUEST_BOOT_DRIVE_TYPE = ['scsi'] -GUEST_SHARED_DRIVE_TYPE = ['scsi'] +# Default setting to ide to support qemu version 3.1.1. +GUEST_BOOT_DRIVE_TYPE = ['ide'] +GUEST_SHARED_DRIVE_TYPE = ['ide'] # guest loopback application method; supported options are: # 'testpmd' - testpmd from dpdk will be built and used @@ -130,10 +131,13 @@ GUEST_PROMPT = ['root.*#'] GUEST_NICS_NR = [2] # template for guests with 4 NICS, but only GUEST_NICS_NR NICS will be configured at runtime -GUEST_NICS = [[{'device' : 'eth0', 'mac' : '#MAC(00:00:00:00:00:01,2)', 'pci' : '00:04.0', 'ip' : '#IP(192.168.1.2,4)/24'}, - {'device' : 'eth1', 'mac' : '#MAC(00:00:00:00:00:02,2)', 'pci' : '00:05.0', 'ip' : '#IP(192.168.1.3,4)/24'}, - {'device' : 'eth2', 'mac' : '#MAC(cc:00:00:00:00:01,2)', 'pci' : '00:06.0', 'ip' : '#IP(192.168.1.4,4)/24'}, - {'device' : 'eth3', 'mac' : '#MAC(cc:00:00:00:00:02,2)', 'pci' : '00:07.0', 'ip' : '#IP(192.168.1.5,4)/24'}, +# With qemu verison 3.1.1 the PCI assignments are starting from 00.03.0. +# TODO: Need a better approach for pci configuration. Currently its based on what qemu-system-x86_64 assigns. +# One option is to use the pci configuration as one of the parameters of the qemu-system-x86_64 command. +GUEST_NICS = [[{'device' : 'eth0', 'mac' : '#MAC(00:00:00:00:00:01,2)', 'pci' : '00:03.0', 'ip' : '#IP(192.168.1.2,4)/24'}, + {'device' : 'eth1', 'mac' : '#MAC(00:00:00:00:00:02,2)', 'pci' : '00:04.0', 'ip' : '#IP(192.168.1.3,4)/24'}, + {'device' : 'eth2', 'mac' : '#MAC(cc:00:00:00:00:01,2)', 'pci' : '00:05.0', 'ip' : '#IP(192.168.1.4,4)/24'}, + {'device' : 'eth3', 'mac' : '#MAC(cc:00:00:00:00:02,2)', 'pci' : '00:06.0', 'ip' : '#IP(192.168.1.5,4)/24'}, ]] # amount of host memory allocated for each guest diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 4b4330d7..1a1521db 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -82,13 +82,13 @@ endif # CentOS 7.3 specific config changes to compile ifeq ($(ID),"centos") ifeq ($(VERSION_ID),"7") - $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/lib/librte_eal/linuxapp/kni/Makefile + $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/kernel/linux/kni/Makefile endif endif # RHEL 7.3 specific config changes to compile ifeq ($(ID),"rhel") ifeq ($(VERSION_ID),"7.3") - $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/lib/librte_eal/linuxapp/kni/Makefile + $(AT)sed -i.bak s@'SRCS-y += ethtool/igb/igb_main.c'@'#SRCS-y += ethtool/igb/igb_main.c'@g $(WORK_DIR)/kernel/linux/kni/Makefile endif endif $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE_LINUXAPP) diff --git a/src/package-list.mk b/src/package-list.mk index d32a9ffd..11f876da 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -13,19 +13,19 @@ # dpdk section # DPDK_URL ?= git://dpdk.org/dpdk DPDK_URL ?= http://dpdk.org/git/dpdk -DPDK_TAG ?= v17.08 +DPDK_TAG ?= v18.11-rc2 # OVS section OVS_URL ?= https://github.com/openvswitch/ovs -OVS_TAG ?= v2.8.1 +OVS_TAG ?= v2.12.0 # VPP section VPP_URL ?= https://git.fd.io/vpp -VPP_TAG ?= v17.07 +VPP_TAG ?= v19.08.1 # QEMU section QEMU_URL ?= https://github.com/qemu/qemu.git -QEMU_TAG ?= v2.9.1 +QEMU_TAG ?= v3.1.1 # TREX section TREX_URL ?= https://github.com/cisco-system-traffic-generator/trex-core.git -- cgit 1.2.3-korg