ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts: replace backticsk with dollar-parenthesis syntax

Browse Source 
Scripts were using a mix of two approaches, lets unify that so
just dollar-parenthesis syntax is used.

Also update two scripts from spdk/test which we previously missed.

Change-Id: I429f9bc158076462b419fae597f716c329f9b7aa
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460344
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Karol Latecki 2019-07-03 17:12:39 +02:00 committed by Ben Walker
parent dd414873f6
commit cf090c6cb9
11 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autobuild.sh
View File

@ -101,7 +101,7 @@ timing_exit "$make_timing_label"
# Check for generated files that are not listed in .gitignore # Check for generated files that are not listed in .gitignore
timing_enter generated_files_check timing_enter generated_files_check
if [ `git status --porcelain --ignore-submodules | wc -l` -ne 0 ]; then if [ $(git status --porcelain --ignore-submodules | wc -l) -ne 0 ]; then
echo "Generated files missing from .gitignore:" echo "Generated files missing from .gitignore:"
git status --porcelain --ignore-submodules git status --porcelain --ignore-submodules
exit 1 exit 1
@ -112,11 +112,11 @@ timing_exit generated_files_check
# capturing a binary's stat data before and after touching a # capturing a binary's stat data before and after touching a
# header file and re-making. # header file and re-making.
timing_enter dependency_check timing_enter dependency_check
STAT1=`stat examples/nvme/identify/identify` STAT1=$(stat examples/nvme/identify/identify)
sleep 1 sleep 1
touch lib/nvme/nvme_internal.h touch lib/nvme/nvme_internal.h
$MAKE $MAKEFLAGS $MAKE $MAKEFLAGS
STAT2=`stat examples/nvme/identify/identify` STAT2=$(stat examples/nvme/identify/identify)
if [ "$STAT1" == "$STAT2" ]; then if [ "$STAT1" == "$STAT2" ]; then
echo "Header dependency check failed" echo "Header dependency check failed"

2
autopackage.sh
View File

@ -21,7 +21,7 @@ cd $rootdir
timing_enter porcelain_check timing_enter porcelain_check
$MAKE clean $MAKE clean
if [ `git status --porcelain --ignore-submodules | wc -l` -ne 0 ]; then if [ $(git status --porcelain --ignore-submodules | wc -l) -ne 0 ]; then
echo make clean left the following files: echo make clean left the following files:
git status --porcelain --ignore-submodules git status --porcelain --ignore-submodules
exit 1 exit 1

6
scripts/ceph/start.sh
View File

@ -80,7 +80,7 @@ cp $ceph_conf /etc/ceph/ceph.conf
cp ${base_dir}/keyring /etc/ceph/keyring cp ${base_dir}/keyring /etc/ceph/keyring
ceph-run sh -c "ulimit -n 16384 && ulimit -c unlimited && exec ceph-mon -c ${ceph_conf} -i a --keyring=${base_dir}/keyring --pid-file=${base_dir}/pid/root@`hostname`.pid --mon-data=${mon_dir}" || true ceph-run sh -c "ulimit -n 16384 && ulimit -c unlimited && exec ceph-mon -c ${ceph_conf} -i a --keyring=${base_dir}/keyring --pid-file=${base_dir}/pid/root@$(hostname).pid --mon-data=${mon_dir}" || true
# create osd # create osd
@ -88,10 +88,10 @@ i=0
mkdir -p ${mnt_dir} mkdir -p ${mnt_dir}
uuid=`uuidgen` uuid=$(uuidgen)
ceph -c ${ceph_conf} osd create ${uuid} $i ceph -c ${ceph_conf} osd create ${uuid} $i
ceph-osd -c ${ceph_conf} -i $i --mkfs --mkkey --osd-uuid ${uuid} ceph-osd -c ${ceph_conf} -i $i --mkfs --mkkey --osd-uuid ${uuid}
ceph -c ${ceph_conf} osd crush add osd.${i} 1.0 host=`hostname` root=default ceph -c ${ceph_conf} osd crush add osd.${i} 1.0 host=$(hostname) root=default
ceph -c ${ceph_conf} -i ${mnt_dir}/osd-device-${i}-data/keyring auth add osd.${i} osd "allow *" mon "allow profile osd" mgr "allow" ceph -c ${ceph_conf} -i ${mnt_dir}/osd-device-${i}-data/keyring auth add osd.${i} osd "allow *" mon "allow profile osd" mgr "allow"
# start osd # start osd

2
scripts/gen_nvme.sh
View File

@ -43,7 +43,7 @@ bdfs=()
# then most likely PCI_WHITELIST option was used for setup.sh # then most likely PCI_WHITELIST option was used for setup.sh
# and we do not want to use that disk. # and we do not want to use that disk.
for bdf in $(iter_pci_class_code 01 08 02); do for bdf in $(iter_pci_class_code 01 08 02); do
driver=`grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}'` driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent | awk -F"=" '{print $2}')
if [ "$driver" != "nvme" ]; then if [ "$driver" != "nvme" ]; then
bdfs+=("$bdf") bdfs+=("$bdf")
fi fi

4
scripts/prep_benchmarks.sh
View File

@ -18,10 +18,10 @@ function configure_performance() {
echo "Done" echo "Done"
echo -n "Moving all interrupts off of core 0..." echo -n "Moving all interrupts off of core 0..."
count=`expr $(nproc) / 4` count=$(expr $(nproc) / 4)
cpumask="e" cpumask="e"
for ((i=1; i<$count; i++)); do for ((i=1; i<$count; i++)); do
if [ `expr $i % 8` -eq 0 ]; then if [ $(expr $i % 8) -eq 0 ]; then
cpumask=",$cpumask" cpumask=",$cpumask"
fi fi
cpumask="f$cpumask" cpumask="f$cpumask"

80
scripts/setup.sh
View File

@ -7,7 +7,7 @@ source "$rootdir/scripts/common.sh"
function usage() function usage()
{ {
if [ `uname` = Linux ]; then if [ $(uname) = Linux ]; then
options="[config|reset|status|cleanup|help]" options="[config|reset|status|cleanup|help]"
else else
options="[config|reset|help]" options="[config|reset|help]"
@ -22,13 +22,13 @@ function usage()
echo echo
echo "$options - as following:" echo "$options - as following:"
echo "config Default mode. Allocate hugepages and bind PCI devices." echo "config Default mode. Allocate hugepages and bind PCI devices."
if [ `uname` = Linux ]; then if [ $(uname) = Linux ]; then
echo "cleanup Remove any orphaned files that can be left in the system after SPDK application exit" echo "cleanup Remove any orphaned files that can be left in the system after SPDK application exit"
fi fi
echo "reset Rebind PCI devices back to their original drivers." echo "reset Rebind PCI devices back to their original drivers."
echo " Also cleanup any leftover spdk files/resources." echo " Also cleanup any leftover spdk files/resources."
echo " Hugepage memory size will remain unchanged." echo " Hugepage memory size will remain unchanged."
if [ `uname` = Linux ]; then if [ $(uname) = Linux ]; then
echo "status Print status of all SPDK-compatible devices on the system." echo "status Print status of all SPDK-compatible devices on the system."
fi fi
echo "help Print this help message." echo "help Print this help message."
@ -136,7 +136,7 @@ function linux_hugetlbfs_mounts() {
function get_nvme_name_from_bdf { function get_nvme_name_from_bdf {
set +e set +e
nvme_devs=`lsblk -d --output NAME | grep "^nvme"` nvme_devs=$(lsblk -d --output NAME | grep "^nvme")
set -e set -e
for dev in $nvme_devs; do for dev in $nvme_devs; do
link_name=$(readlink /sys/block/$dev/device/device) || true link_name=$(readlink /sys/block/$dev/device/device) || true
@ -152,7 +152,7 @@ function get_nvme_name_from_bdf {
} }
function get_virtio_names_from_bdf { function get_virtio_names_from_bdf {
blk_devs=`lsblk --nodeps --output NAME` blk_devs=$(lsblk --nodeps --output NAME)
virtio_names='' virtio_names=''
for dev in $blk_devs; do for dev in $blk_devs; do
@ -219,12 +219,12 @@ function configure_linux_pci {
done done
# IOAT # IOAT
TMP=`mktemp` TMP=$(mktemp)
#collect all the device_id info of ioat devices. #collect all the device_id info of ioat devices.
grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
for bdf in $(iter_all_pci_dev_id 8086 $dev_id); do for bdf in $(iter_all_pci_dev_id 8086 $dev_id); do
if ! pci_can_use $bdf; then if ! pci_can_use $bdf; then
pci_dev_echo "$bdf" "Skipping un-whitelisted I/OAT device" pci_dev_echo "$bdf" "Skipping un-whitelisted I/OAT device"
@ -237,12 +237,12 @@ function configure_linux_pci {
rm $TMP rm $TMP
# virtio # virtio
TMP=`mktemp` TMP=$(mktemp)
#collect all the device_id info of virtio devices. #collect all the device_id info of virtio devices.
grep "PCI_DEVICE_ID_VIRTIO" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_VIRTIO" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
for bdf in $(iter_all_pci_dev_id 1af4 $dev_id); do for bdf in $(iter_all_pci_dev_id 1af4 $dev_id); do
if ! pci_can_use $bdf; then if ! pci_can_use $bdf; then
pci_dev_echo "$bdf" "Skipping un-whitelisted Virtio device at $bdf" pci_dev_echo "$bdf" "Skipping un-whitelisted Virtio device at $bdf"
@ -263,12 +263,12 @@ function configure_linux_pci {
rm $TMP rm $TMP
# VMD # VMD
TMP=`mktemp` TMP=$(mktemp)
#collect all the device_id info of vmd devices. #collect all the device_id info of vmd devices.
grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
for bdf in $(iter_pci_dev_id 8086 $dev_id); do for bdf in $(iter_pci_dev_id 8086 $dev_id); do
if [[ -z "$PCI_WHITELIST" ]] || ! pci_can_use $bdf; then if [[ -z "$PCI_WHITELIST" ]] || ! pci_can_use $bdf; then
echo "Skipping un-whitelisted VMD device at $bdf" echo "Skipping un-whitelisted VMD device at $bdf"
@ -357,7 +357,7 @@ function configure_linux {
fi fi
echo "$NRHUGE" > "$hugepages_target" echo "$NRHUGE" > "$hugepages_target"
allocated_hugepages=`cat $hugepages_target` allocated_hugepages=$(cat $hugepages_target)
if [ "$allocated_hugepages" -lt "$NRHUGE" ]; then if [ "$allocated_hugepages" -lt "$NRHUGE" ]; then
echo "" echo ""
echo "## ERROR: requested $NRHUGE hugepages but only $allocated_hugepages could be allocated." echo "## ERROR: requested $NRHUGE hugepages but only $allocated_hugepages could be allocated."
@ -373,7 +373,7 @@ function configure_linux {
done done
fi fi
MEMLOCK_AMNT=`ulimit -l` MEMLOCK_AMNT=$(ulimit -l)
if [ "$MEMLOCK_AMNT" != "unlimited" ] ; then if [ "$MEMLOCK_AMNT" != "unlimited" ] ; then
MEMLOCK_MB=$(( $MEMLOCK_AMNT / 1024 )) MEMLOCK_MB=$(( $MEMLOCK_AMNT / 1024 ))
echo "" echo ""
@ -413,7 +413,7 @@ function reset_linux_pci {
done done
# IOAT # IOAT
TMP=`mktemp` TMP=$(mktemp)
#collect all the device_id info of ioat devices. #collect all the device_id info of ioat devices.
grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
@ -422,7 +422,7 @@ function reset_linux_pci {
check_for_driver ioatdma check_for_driver ioatdma
driver_loaded=$? driver_loaded=$?
set -e set -e
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
for bdf in $(iter_all_pci_dev_id 8086 $dev_id); do for bdf in $(iter_all_pci_dev_id 8086 $dev_id); do
if ! pci_can_use $bdf; then if ! pci_can_use $bdf; then
pci_dev_echo "$bdf" "Skipping un-whitelisted I/OAT device" pci_dev_echo "$bdf" "Skipping un-whitelisted I/OAT device"
@ -438,7 +438,7 @@ function reset_linux_pci {
rm $TMP rm $TMP
# virtio # virtio
TMP=`mktemp` TMP=$(mktemp)
#collect all the device_id info of virtio devices. #collect all the device_id info of virtio devices.
grep "PCI_DEVICE_ID_VIRTIO" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_VIRTIO" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
@ -448,7 +448,7 @@ function reset_linux_pci {
# virtio-pci but just virtio_scsi instead. Also need to make sure we get the # virtio-pci but just virtio_scsi instead. Also need to make sure we get the
# underscore vs. dash right in the virtio_scsi name. # underscore vs. dash right in the virtio_scsi name.
modprobe virtio-pci || true modprobe virtio-pci || true
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
for bdf in $(iter_all_pci_dev_id 1af4 $dev_id); do for bdf in $(iter_all_pci_dev_id 1af4 $dev_id); do
if ! pci_can_use $bdf; then if ! pci_can_use $bdf; then
pci_dev_echo "$bdf" "Skipping un-whitelisted Virtio device at" pci_dev_echo "$bdf" "Skipping un-whitelisted Virtio device at"
@ -460,7 +460,7 @@ function reset_linux_pci {
rm $TMP rm $TMP
# VMD # VMD
TMP=`mktemp` TMP=$(mktemp)
#collect all the device_id info of vmd devices. #collect all the device_id info of vmd devices.
grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
@ -469,7 +469,7 @@ function reset_linux_pci {
check_for_driver vmd check_for_driver vmd
driver_loaded=$? driver_loaded=$?
set -e set -e
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
for bdf in $(iter_pci_dev_id 8086 $dev_id); do for bdf in $(iter_pci_dev_id 8086 $dev_id); do
if ! pci_can_use $bdf; then if ! pci_can_use $bdf; then
echo "Skipping un-whitelisted VMD device at $bdf" echo "Skipping un-whitelisted VMD device at $bdf"
@ -503,8 +503,8 @@ function status_linux {
shopt -s nullglob shopt -s nullglob
for path in /sys/devices/system/node/node?/hugepages/hugepages-*/; do for path in /sys/devices/system/node/node?/hugepages/hugepages-*/; do
numa_nodes=$((numa_nodes + 1)) numa_nodes=$((numa_nodes + 1))
free_pages=`cat $path/free_hugepages` free_pages=$(cat $path/free_hugepages)
all_pages=`cat $path/nr_hugepages` all_pages=$(cat $path/nr_hugepages)
[[ $path =~ (node[0-9]+)/hugepages/hugepages-([0-9]+kB) ]] [[ $path =~ (node[0-9]+)/hugepages/hugepages-([0-9]+kB) ]]
@ -517,8 +517,8 @@ function status_linux {
# fall back to system-wide hugepages # fall back to system-wide hugepages
if [ "$numa_nodes" = "0" ]; then if [ "$numa_nodes" = "0" ]; then
free_pages=`grep HugePages_Free /proc/meminfo | awk '{ print $2 }'` free_pages=$(grep HugePages_Free /proc/meminfo | awk '{ print $2 }')
all_pages=`grep HugePages_Total /proc/meminfo | awk '{ print $2 }'` all_pages=$(grep HugePages_Total /proc/meminfo | awk '{ print $2 }')
node="-" node="-"
huge_size="$HUGEPGSZ" huge_size="$HUGEPGSZ"
@ -539,7 +539,7 @@ function status_linux {
device=$(cat /sys/bus/pci/devices/$bdf/device) device=$(cat /sys/bus/pci/devices/$bdf/device)
vendor=$(cat /sys/bus/pci/devices/$bdf/vendor) vendor=$(cat /sys/bus/pci/devices/$bdf/vendor)
if [ "$driver" = "nvme" -a -d /sys/bus/pci/devices/$bdf/nvme ]; then if [ "$driver" = "nvme" -a -d /sys/bus/pci/devices/$bdf/nvme ]; then
name="\t"`ls /sys/bus/pci/devices/$bdf/nvme`; name="\t"$(ls /sys/bus/pci/devices/$bdf/nvme);
else else
name="-"; name="-";
fi fi
@ -550,8 +550,8 @@ function status_linux {
echo "I/OAT DMA" echo "I/OAT DMA"
#collect all the device_id info of ioat devices. #collect all the device_id info of ioat devices.
TMP=`grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \ TMP=$(grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}'` | awk -F"x" '{print $2}')
echo -e "BDF\t\tVendor\tDevice\tNUMA\tDriver" echo -e "BDF\t\tVendor\tDevice\tNUMA\tDriver"
for dev_id in $TMP; do for dev_id in $TMP; do
for bdf in $(iter_all_pci_dev_id 8086 $dev_id); do for bdf in $(iter_all_pci_dev_id 8086 $dev_id); do
@ -571,8 +571,8 @@ function status_linux {
echo "virtio" echo "virtio"
#collect all the device_id info of virtio devices. #collect all the device_id info of virtio devices.
TMP=`grep "PCI_DEVICE_ID_VIRTIO" $rootdir/include/spdk/pci_ids.h \ TMP=$(grep "PCI_DEVICE_ID_VIRTIO" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}'` | awk -F"x" '{print $2}')
echo -e "BDF\t\tVendor\tDevice\tNUMA\tDriver\t\tDevice name" echo -e "BDF\t\tVendor\tDevice\tNUMA\tDriver\t\tDevice name"
for dev_id in $TMP; do for dev_id in $TMP; do
for bdf in $(iter_all_pci_dev_id 1af4 $dev_id); do for bdf in $(iter_all_pci_dev_id 1af4 $dev_id); do
@ -593,20 +593,20 @@ function status_linux {
echo "VMD" echo "VMD"
#collect all the device_id info of vmd devices. #collect all the device_id info of vmd devices.
TMP=`grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \ TMP=$(grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}'` | awk -F"x" '{print $2}')
echo -e "BDF\t\tNuma Node\tDriver Name" echo -e "BDF\t\tNuma Node\tDriver Name"
for dev_id in $TMP; do for dev_id in $TMP; do
for bdf in $(iter_pci_dev_id 8086 $dev_id); do for bdf in $(iter_pci_dev_id 8086 $dev_id); do
driver=`grep DRIVER /sys/bus/pci/devices/$bdf/uevent |awk -F"=" '{print $2}'` driver=$(grep DRIVER /sys/bus/pci/devices/$bdf/uevent |awk -F"=" '{print $2}')
node=`cat /sys/bus/pci/devices/$bdf/numa_node`; node=$(cat /sys/bus/pci/devices/$bdf/numa_node);
echo -e "$bdf\t$node\t\t$driver" echo -e "$bdf\t$node\t\t$driver"
done done
done done
} }
function configure_freebsd_pci { function configure_freebsd_pci {
TMP=`mktemp` TMP=$(mktemp)
# NVMe # NVMe
GREP_STR="class=0x010802" GREP_STR="class=0x010802"
@ -614,21 +614,21 @@ function configure_freebsd_pci {
# IOAT # IOAT
grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_INTEL_IOAT" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
GREP_STR="${GREP_STR}\|chip=0x${dev_id}8086" GREP_STR="${GREP_STR}\|chip=0x${dev_id}8086"
done done
# VMD # VMD
grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \ grep "PCI_DEVICE_ID_INTEL_VMD" $rootdir/include/spdk/pci_ids.h \
| awk -F"x" '{print $2}' > $TMP | awk -F"x" '{print $2}' > $TMP
for dev_id in `cat $TMP`; do for dev_id in $(cat $TMP); do
GREP_STR="${GREP_STR}\|chip=0x${dev_id}8086" GREP_STR="${GREP_STR}\|chip=0x${dev_id}8086"
done done
AWK_PROG="{if (count > 0) printf \",\"; printf \"%s:%s:%s\",\$2,\$3,\$4; count++}" AWK_PROG="{if (count > 0) printf \",\"; printf \"%s:%s:%s\",\$2,\$3,\$4; count++}"
echo $AWK_PROG > $TMP echo $AWK_PROG > $TMP
BDFS=`pciconf -l | grep "${GREP_STR}" | awk -F: -f $TMP` BDFS=$(pciconf -l | grep "${GREP_STR}" | awk -F: -f $TMP)
kldunload nic_uio.ko || true kldunload nic_uio.ko || true
kenv hw.nic_uio.bdfs=$BDFS kenv hw.nic_uio.bdfs=$BDFS
@ -641,7 +641,7 @@ function configure_freebsd {
# If contigmem is already loaded but the HUGEMEM specified doesn't match the # If contigmem is already loaded but the HUGEMEM specified doesn't match the
# previous value, unload contigmem so that we can reload with the new value. # previous value, unload contigmem so that we can reload with the new value.
if kldstat -q -m contigmem; then if kldstat -q -m contigmem; then
if [ `kenv hw.contigmem.num_buffers` -ne "$((HUGEMEM / 256))" ]; then if [ $(kenv hw.contigmem.num_buffers) -ne "$((HUGEMEM / 256))" ]; then
kldunload contigmem.ko kldunload contigmem.ko
fi fi
fi fi
@ -678,12 +678,12 @@ fi
if [ -z "$TARGET_USER" ]; then if [ -z "$TARGET_USER" ]; then
TARGET_USER="$SUDO_USER" TARGET_USER="$SUDO_USER"
if [ -z "$TARGET_USER" ]; then if [ -z "$TARGET_USER" ]; then
TARGET_USER=`logname 2>/dev/null` || true TARGET_USER=$(logname 2>/dev/null) || true
fi fi
fi fi
if [ `uname` = Linux ]; then if [ $(uname) = Linux ]; then
HUGEPGSZ=$(( `grep Hugepagesize /proc/meminfo | cut -d : -f 2 | tr -dc '0-9'` )) HUGEPGSZ=$(( $(grep Hugepagesize /proc/meminfo | cut -d : -f 2 | tr -dc '0-9') ))
HUGEPGSZ_MB=$(( $HUGEPGSZ / 1024 )) HUGEPGSZ_MB=$(( $HUGEPGSZ / 1024 ))
: ${NRHUGE=$(( (HUGEMEM + HUGEPGSZ_MB - 1) / HUGEPGSZ_MB ))} : ${NRHUGE=$(( (HUGEMEM + HUGEPGSZ_MB - 1) / HUGEPGSZ_MB ))}

4
scripts/vagrant/create_nvme_img.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SYSTEM=`uname -s` SYSTEM=$(uname -s)
size="1024M" size="1024M"
name="nvme_disk.img" name="nvme_disk.img"
@ -35,7 +35,7 @@ while getopts "s:n:h-:" opt; do
done done
if [ ! "${SYSTEM}" = "FreeBSD" ]; then if [ ! "${SYSTEM}" = "FreeBSD" ]; then
WHICH_OS=`lsb_release -i | awk '{print $3}'` WHICH_OS=$(lsb_release -i | awk '{print $3}')
nvme_disk="/var/lib/libvirt/images/$name" nvme_disk="/var/lib/libvirt/images/$name"
qemu-img create -f raw $nvme_disk ${size} qemu-img create -f raw $nvme_disk ${size}

2
scripts/vagrant/run-autorun.sh
View File

@ -47,7 +47,7 @@ fi
AUTOTEST_DRIVER_PATH=$($READLINK -f ${BASH_SOURCE%/*}) AUTOTEST_DRIVER_PATH=$($READLINK -f ${BASH_SOURCE%/*})
SPDK_AUTOTEST_LOCAL_PATH=$PWD SPDK_AUTOTEST_LOCAL_PATH=$PWD
TIMESTAMP=`date +"%Y%m%d%H%M%S"` TIMESTAMP=$(date +"%Y%m%d%H%M%S")
BUILD_NAME="build-${TIMESTAMP}" BUILD_NAME="build-${TIMESTAMP}"
# The command line help # The command line help

12
scripts/vagrant/update.sh
View File

@ -28,7 +28,7 @@ if [ ! -f /home/vagrant/autorun-spdk.conf ]; then
chgrp vagrant /home/vagrant/autorun-spdk.conf chgrp vagrant /home/vagrant/autorun-spdk.conf
fi fi
SYSTEM=`uname -s` SYSTEM=$(uname -s)
if [ "$SYSTEM" = "FreeBSD" ]; then if [ "$SYSTEM" = "FreeBSD" ]; then
# Do initial setup for the system # Do initial setup for the system
@ -50,7 +50,7 @@ else
# get the requested number of hugepages without rebooting. # get the requested number of hugepages without rebooting.
# So do it here just in case # So do it here just in case
sysctl -w vm.nr_hugepages=1024 sysctl -w vm.nr_hugepages=1024
HUGEPAGES=`sysctl -n vm.nr_hugepages` HUGEPAGES=$(sysctl -n vm.nr_hugepages)
if [ $HUGEPAGES != 1024 ]; then if [ $HUGEPAGES != 1024 ]; then
echo "Warning: Unable to get 1024 hugepages, only got $HUGEPAGES" echo "Warning: Unable to get 1024 hugepages, only got $HUGEPAGES"
echo "Warning: Adjusting HUGEMEM in /home/vagrant/autorun-spdk.conf" echo "Warning: Adjusting HUGEMEM in /home/vagrant/autorun-spdk.conf"
@ -64,10 +64,10 @@ else
elif [ -f /etc/redhat-release ];then elif [ -f /etc/redhat-release ];then
yum update -y yum update -y
yum install -y redhat-lsb yum install -y redhat-lsb
DISTRIB_ID=`lsb_release -si` DISTRIB_ID=$(lsb_release -si)
DISTRIB_RELEASE=`lsb_release -sr` DISTRIB_RELEASE=$(lsb_release -sr)
DISTRIB_CODENAME=`lsb_release -sc` DISTRIB_CODENAME=$(lsb_release -sc)
DISTRIB_DESCRIPTION=`lsb_release -sd` DISTRIB_DESCRIPTION=$(lsb_release -sd)
fi fi
# Do initial setup for the system # Do initial setup for the system

2
test/common/config/vm_setup.sh
View File

@ -220,7 +220,7 @@ function install_vpp()
echo "vpp already cloned." echo "vpp already cloned."
if [ ! -d /usr/local/src/vpp/build-root ]; then if [ ! -d /usr/local/src/vpp/build-root ]; then
echo "build-root has not been done" echo "build-root has not been done"
echo "remove the `pwd` and start again" echo "remove the $(pwd) and start again"
exit 1 exit 1
fi fi
else else

2
test/vhost/vhost.sh
View File

@ -25,7 +25,7 @@ if [[ ! -r "${VM_IMAGE}" ]]; then
exit 1 exit 1
fi fi
DISKS_NUMBER=`lspci -mm -n | grep 0108 | tr -d '"' | awk -F " " '{print "0000:"$1}'| wc -l` DISKS_NUMBER=$(lspci -mm -n | grep 0108 | tr -d '"' | awk -F " " '{print "0000:"$1}'| wc -l)
WORKDIR=$(readlink -f $(dirname $0)) WORKDIR=$(readlink -f $(dirname $0))