-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
pci_path="/sys/bus/pci/devices/${ADDR}"
drv_path="/sys/bus/pci/drivers/${DRIVER}"
- vd=$(cat ${pci_path}/vendor ${pci_path}/device) || {
- die "Failed to retrieve interface details!"
- }
- set +e
- echo ${vd} | sudo tee ${drv_path}/new_id
- set -e
- echo ${ADDR} | sudo tee ${pci_path}/driver/unbind || {
- die "Failed to unbind interface ${ADDR}!"
- }
+ if [ -d "${pci_path}/driver" ]; then
+ echo ${ADDR} | sudo tee ${pci_path}/driver/unbind || {
+ die "Failed to unbind interface ${ADDR}!"
+ }
+ fi
echo ${ADDR} | sudo tee ${drv_path}/bind || {
die "Failed to bind interface ${ADDR}!"
}
# Add Intel Corporation XL710/X710 Virtual Function to the
# whitelist.
pci_id="0x154c"
- tg_netdev=(enp24)
- dut1_netdev=(enp59)
+ tg_netdev=(ens1 enp24)
+ dut1_netdev=(ens5 enp59)
;;
"1n_tx2")
# Add Intel Corporation XL710/X710 Virtual Function to the
# whitelist.
pci_id="0x154c"
- tg_netdev=(enp5s2 enp5s3 enp5s4 enp5s5
- enp5s6 enp5s7 enp5s8 enp5s9)
- tg_netdev+=(enp8s2 enp8s3 enp8s4 enp8s5
- enp8s6 enp8s7 enp8s8 enp8s9)
- tg_netdev+=(enp8s10 enp8s11 enp8s12 enp8s13
- enp8s14 enp8s15 enp8s16 enp8s17)
- dut1_netdev=(enp133s2 enp133s3 enp133s4 enp133s5
- enp133s6 enp133s7 enp133s8 enp133s9)
- dut1_netdev+=(enp133s10 enp133s11 enp133s12 enp133s13
- enp133s14 enp133s15 enp133s16 enp133s17)
- dut1_netdev+=(enp5s10 enp5s11 enp5s12 enp5s13
- enp5s14 enp5s15 enp5s16 enp5s17)
+ tg_netdev=(enp5)
+ dut1_netdev=(enp145)
;;
"1n_vbox")
# Add Intel Corporation 82545EM Gigabit Ethernet Controller to the
# Automatically remove the container when it exits.
dcr_stc_params+="--rm "
# Size of /dev/shm.
- dcr_stc_params+="--shm-size 512M "
+ dcr_stc_params+="--shm-size 2G "
# Override access to PCI bus by attaching a filesystem mount to the
# container.
dcr_stc_params+="--mount type=tmpfs,destination=/sys/bus/pci/devices "
- # Mount vfio to be able to bind to see binded interfaces. We cannot use
- # --device=/dev/vfio as this does not see newly binded interfaces.
+ # Mount vfio to be able to bind to see bound interfaces. We cannot use
+ # --device=/dev/vfio as this does not see newly bound interfaces.
dcr_stc_params+="--volume /dev/vfio:/dev/vfio "
+ # Disable manipulation with hugepages by VPP.
+ dcr_stc_params+="--volume /dev/null:/etc/sysctl.d/80-vpp.conf "
# Mount docker.sock to be able to use docker deamon of the host.
dcr_stc_params+="--volume /var/run/docker.sock:/var/run/docker.sock "
# Mount /opt/boot/ where VM kernel and initrd are located.
dcr_stc_params+="--volume /opt/boot/:/opt/boot/ "
# Mount host hugepages for VMs.
dcr_stc_params+="--volume /dev/hugepages/:/dev/hugepages/ "
+ # Disable IPv6.
+ dcr_stc_params+="--sysctl net.ipv6.conf.all.disable_ipv6=1 "
+ dcr_stc_params+="--sysctl net.ipv6.conf.default.disable_ipv6=1 "
# Docker Container UUIDs.
declare -gA DCR_UUIDS