openstack/dragonflow
Code Issues Proposed changes

dpdk: could not bind or unbind nic in the latest release

Browse Source 
The new stable release dpdk package changes the script name
of binding/unbinding nics. This change causes bug in df.

This commit also makes dpdk deployment more stable.

Co-Authored-By: Li Ma <skywalker.nick@gmail.com>

Closes-Bug: #1652867
Change-Id: Ifd41965eb72cd8eabe2bbe94c46ba031233c6ae3
This commit is contained in:
yuyang 2016-12-09 11:26:45 +08:00 committed by Li Ma
parent a6e38e4ad8
commit bbd784c9b9
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/override-defaults
View File

@ -37,3 +37,9 @@ PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
INTEGRATION_BRIDGE=${INTEGRATION_BRIDGE:-br-int}
INTEGRATION_PEER_PORT=${INTEGRATION_PEER_PORT:-patch-ex}
PUBLIC_PEER_PORT=${PUBLIC_PEER_PORT:-patch-int}
if [[ "$ENABLE_DPDK" == "True" ]]; then
# By default, dragonflow uses OVS kernel datapath. If you want to use
# user space datapath powered by DPDK, please use 'netdev'.
OVS_DATAPATH_TYPE=netdev
fi

48
devstack/ovs_dpdk_setup.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
DPDK_VERSION=16.07
DPDK_DIR=$DEST/dpdk/dpdk-${DPDK_VERSION}
DPDK_VERSION=16.07.2
DPDK_DIR=$DEST/dpdk/dpdk-stable-${DPDK_VERSION}
DPDK_TARGET=x86_64-native-linuxapp-gcc
DPDK_BUILD=$DPDK_DIR/$DPDK_TARGET
@ -15,12 +15,6 @@ OVSDB_SOCK=/usr/local/var/run/openvswitch/db.sock
source $DEST/dragonflow/devstack/ovs_setup.sh
function _neutron_ovs_configure_dependencies {
if is_fedora; then
install_package -y kernel-devel
elif is_ubuntu; then
install_package -y build-essential
fi
# Configure TUN
if [ ! -e /sys/class/misc/tun]; then
sudo modprobe tun
@ -36,15 +30,11 @@ function _neutron_ovs_configure_dependencies {
sudo mount -t hugetlbfs none /dev/hugepages
# Configure UIO
sudo modprobe uio
sudo insmod $DPDK_BUILD/kmod/${DPDK_BIND_DRIVER}.ko
sudo modprobe uio || true
sudo insmod $DPDK_BUILD/kmod/${DPDK_BIND_DRIVER}.ko || true
}
function _configure_ovs_dpdk {
# By default, dragonflow uses OVS kernel datapath. If you want to use
# user space datapath powered by DPDK, please use 'netdev'.
OVS_DATAPATH_TYPE=netdev
# Configure user space datapath
iniset $DRAGONFLOW_CONF df vif_type vhostuser
iniset $DRAGONFLOW_CONF df vhost_sock_dir ${OVS_DIR}
@ -55,24 +45,32 @@ function _configure_ovs_dpdk {
# Set up DPDK NIC
sudo ip link set ${DPDK_NIC_NAME} down
sudo dpdk_nic_bind --bind=${DPDK_BIND_DRIVER} ${DPDK_PCI_TARGET}
sudo $DPDK_DIR/tools/dpdk-devbind.py --bind=${DPDK_BIND_DRIVER} ${DPDK_PCI_TARGET}
}
function _install_dpdk {
mkdir -p $DEST/dpdk
pushd $DEST/dpdk
if [ ! -e $DEST/dpdk/dpdk-${DPDK_VERSION}.zip ]
then
wget http://dpdk.org/browse/dpdk/snapshot/dpdk-${DPDK_VERSION}.zip
if is_fedora; then
install_package kernel-devel
elif is_ubuntu; then
install_package build-essential
fi
if [ ! -d $DEST/dpdk ]; then
mkdir -p $DEST/dpdk
pushd $DEST/dpdk
if [ ! -e $DEST/dpdk/dpdk-${DPDK_VERSION}.tar.xz ]
then
wget http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.tar.xz
fi
tar xvJf dpdk-${DPDK_VERSION}.tar.xz
cd $DPDK_DIR
sudo make install T=$DPDK_TARGET DESTDIR=install
popd
fi
unzip -o dpdk-${DPDK_VERSION}.zip
cd $DPDK_DIR
sudo make install T=$DPDK_TARGET DESTDIR=install
popd
}
function _uninstall_dpdk {
sudo dpdk_nic_bind -u ${DPDK_PCI_TARGET}
sudo $DPDK_DIR/tools/dpdk-devbind.py -u ${DPDK_PCI_TARGET}
sudo rmmod $DPDK_BUILD/kmod/${DPDK_BIND_DRIVER}.ko
sudo modprobe -r uio
sudo ip link set ${DPDK_NIC_NAME} up