diff options
Diffstat (limited to 'src/dpdk')
| -rwxr-xr-x | src/dpdk/Makefile | 54 | ||||
| -rw-r--r-- | src/dpdk/dpdk.py | 58 |
2 files changed, 63 insertions, 49 deletions
diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 25ec3f12..69255f75 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -1,7 +1,7 @@ # makefile to manage dpdk package # -# Copyright 2015 OPNFV +# Copyright 2015-2016 OPNFV # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ # # Contributors: # Aihua Li, Huawei Technologies. +# Martin Klozik, Intel Corporation. include ../mk/master.mk include ../package-list.mk @@ -29,16 +30,31 @@ ifndef VHOST_USER endif WORK_DIR = dpdk TAG_DONE_FLAG = $(WORK_DIR)/.$(DPDK_TAG).tag.done -DPDK_VANILLA = ../../src_vanilla/dpdk DPDK_CUSE = ../../src_cuse/dpdk -# the name has been changed from version to version -ifeq ($(DPDK_TAG),v1.6.0r0) +# VHOST configuration options are stored in different files based on DPDK version +# v1.2.3r0-v1.6.0r2 - configuration inside config/defconfig_x86_64-default-linuxapp-gcc +# v1.7.0-rc1-v2.2.0 - configuration inside config/common_linuxapp +# v16 and newer - configuration split between config/common_linuxapp and config/common_base +DPDK_TAG_MAJOR = $(shell echo $(DPDK_TAG) | cut -d. -f1) +DPDK_TAG_MINOR = $(shell echo $(DPDK_TAG) | cut -d. -f2) +ifeq ($(DPDK_TAG_MAJOR),v1) +ifeq ($(DPDK_TAG_MINOR), $(filter $(DPDK_TAG_MINOR), 7 8)) + DPDK_TARGET = x86_64-native-linuxapp-gcc + CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp +else DPDK_TARGET = x86_64-default-linuxapp-gcc - CONFIG_FILE = $(WORK_DIR)/config/defconfig_x86_64-default-linuxapp-gcc + CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/defconfig_x86_64-default-linuxapp-gcc +endif +else +ifeq ($(DPDK_TAG_MAJOR),v2) + DPDK_TARGET = x86_64-native-linuxapp-gcc + CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp else DPDK_TARGET = x86_64-native-linuxapp-gcc - CONFIG_FILE = $(WORK_DIR)/config/common_linuxapp + CONFIG_FILE_BASE = $(WORK_DIR)/config/common_base + CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp +endif endif all: force_make @@ -47,14 +63,27 @@ all: force_make INSTALL_TARGET = force_make # modify CONFIG_FILE to enable VHOST_USER build and restore original CONFIG_FILE after the build +# DPDK v16 comments: +## CONFIG_RTE_BUILD_COMBINE_LIBS has been obsoleted +## CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_LIBRTE_KNI are listed in both config_base and config_linuxapp, +## values from config_linuxapp will be used, but options are modified at both places to avoid confusion. force_make: $(TAG_DONE_FLAG) $(AT)cd $(WORK_DIR) && git pull $(DPDK_URL) $(DPDK_TAG) - $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE) - $(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE) - $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE) - $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE) +ifdef CONFIG_FILE_BASE + $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE_BASE) + $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE_BASE) + $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE_BASE) +else + $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE_LINUXAPP) + $(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE_LINUXAPP) +endif + $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE_LINUXAPP) + $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE_LINUXAPP) $(AT)cd $(WORK_DIR); make install T=$(DPDK_TARGET) -j DESTDIR=$(WORK_DIR) - $(AT)cd `dirname $(CONFIG_FILE)` && git checkout `basename $(CONFIG_FILE)` && cd - + $(AT)cd `dirname $(CONFIG_FILE_LINUXAPP)` && git checkout `basename $(CONFIG_FILE_LINUXAPP)` && cd - +ifdef CONFIG_FILE_BASE + $(AT)cd `dirname $(CONFIG_FILE_BASE)` && git checkout `basename $(CONFIG_FILE_BASE)` && cd - +endif $(AT)echo "VHOST_USER = $(VHOST_USER)" ifeq ($(VHOST_USER),n) $(AT)cd $(WORK_DIR)/lib/librte_vhost/eventfd_link; make @@ -70,7 +99,6 @@ clean: $(AT)cd $(WORK_DIR) && git clean -xfd *.o clobber: $(AT)rm -rf $(WORK_DIR) - $(AT)rm -rf $(DPDK_VANILLA) $(AT)rm -rf $(DPDK_CUSE) # distclean is for developer who would like to keep the @@ -86,8 +114,6 @@ sanity: $(WORK_DIR): $(AT)git clone $(DPDK_URL) - $(AT)mkdir -p $(DPDK_VANILLA) - $(AT)cp -rf ./* $(DPDK_VANILLA) $(AT)mkdir -p $(DPDK_CUSE) $(AT)cp -rf ./* $(DPDK_CUSE) diff --git a/src/dpdk/dpdk.py b/src/dpdk/dpdk.py index f8cbbd81..30f228f7 100644 --- a/src/dpdk/dpdk.py +++ b/src/dpdk/dpdk.py @@ -23,7 +23,6 @@ from sys import platform as _platform import os import subprocess import logging -import locale from tools import tasks from conf import settings @@ -31,17 +30,25 @@ from tools.module_manager import ModuleManager _LOGGER = logging.getLogger(__name__) RTE_PCI_TOOL = os.path.join( - settings.getValue('RTE_SDK'), 'tools', 'dpdk_nic_bind.py') + settings.getValue('RTE_SDK_USER'), 'tools', 'dpdk_nic_bind.py') _DPDK_MODULE_MANAGER = ModuleManager() + +# declare global NIC variables only as their content might not be known yet +_NICS = [] +_NICS_PCI = [] + # # system management # - def init(): """Setup system for DPDK. """ + global _NICS + global _NICS_PCI + _NICS = settings.getValue('NICS') + _NICS_PCI = list(nic['pci'] for nic in _NICS) if not _is_linux(): _LOGGER.error('Not running on a compatible Linux version. Exiting...') return @@ -175,54 +182,35 @@ def _bind_nics(): True) tasks.run_task(['sudo', RTE_PCI_TOOL, '--bind=' + _driver] + - settings.getValue('WHITELIST_NICS'), _LOGGER, - 'Binding NICs %s...' % - settings.getValue('WHITELIST_NICS'), + _NICS_PCI, _LOGGER, + 'Binding NICs %s...' % _NICS_PCI, True) except subprocess.CalledProcessError: - _LOGGER.error('Unable to bind NICs %s', - str(settings.getValue('WHITELIST_NICS'))) - -def _unbind_nics_get_driver(): - """Check what driver the NICs should be bound to - after unbinding them from DPDK. - """ - _driver_list = [] - _output = subprocess.check_output([os.path.expanduser(RTE_PCI_TOOL), '--status']) - _my_encoding = locale.getdefaultlocale()[1] - for line in _output.decode(_my_encoding).split('\n'): - for nic in settings.getValue('WHITELIST_NICS'): - if nic in line: - _driver_list.append((line.split("unused=", 1)[1])) - return _driver_list + _LOGGER.error('Unable to bind NICs %s', str(_NICS_PCI)) def _unbind_nics(): """Unbind NICs using the Intel DPDK ``dpdk_nic_bind.py`` tool. """ - nic_drivers = _unbind_nics_get_driver() try: tasks.run_task(['sudo', RTE_PCI_TOOL, '--unbind'] + - settings.getValue('WHITELIST_NICS'), _LOGGER, - 'Unbinding NICs %s...' % - str(settings.getValue('WHITELIST_NICS')), + _NICS_PCI, _LOGGER, + 'Unbinding NICs %s...' % str(_NICS_PCI), True) except subprocess.CalledProcessError: - _LOGGER.error('Unable to unbind NICs %s', - str(settings.getValue('WHITELIST_NICS'))) + _LOGGER.error('Unable to unbind NICs %s', str(_NICS_PCI)) # Rebind NICs to their original drivers # using the Intel DPDK ``dpdk_nic_bind.py`` tool. - for i, nic in enumerate(settings.getValue('WHITELIST_NICS')): + for nic in _NICS: try: - if nic_drivers[i] != '': + if nic['driver']: tasks.run_task(['sudo', RTE_PCI_TOOL, '--bind', - nic_drivers[i], nic], - _LOGGER, 'Binding NIC %s...' % - nic, + nic['driver'], nic['pci']], + _LOGGER, 'Binding NIC %s to %s...' % + (nic['pci'], nic['driver']), True) except subprocess.CalledProcessError: - _LOGGER.error('Unable to bind NICs %s to drivers %s', - str(settings.getValue('WHITELIST_NICS')), - nic_drivers) + _LOGGER.error('Unable to bind NIC %s to driver %s', + nic['pci'], nic['driver']) class Dpdk(object): """A context manager for the system init/cleanup. |