From 5318d333187fc26322c87aa913125189713e9d90 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Fri, 5 Jan 2018 14:53:30 -0700 Subject: [PATCH] scripts: Move logic in prep_benchmarks.sh into a function This prepares for adding the ability to undo the setup. Change-Id: Ie3fa3a76715663d9785a1d2f9d88ab20e0d07dce Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/393829 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu --- scripts/prep_benchmarks.sh | 72 ++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/scripts/prep_benchmarks.sh b/scripts/prep_benchmarks.sh index 4ecefb6c9..024e8c41d 100755 --- a/scripts/prep_benchmarks.sh +++ b/scripts/prep_benchmarks.sh @@ -1,41 +1,45 @@ #!/usr/bin/env bash -echo -n "Placing all CPUs in performance mode..." -for governor in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do - echo -n performance > $governor -done -echo "Done" +function configure_performance() { + echo -n "Placing all CPUs in performance mode..." + for governor in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do + echo -n performance > $governor + done + echo "Done" -echo -n "Disabling irqbalance service..." -service irqbalance stop 2> /dev/null -echo "Done" + echo -n "Disabling irqbalance service..." + service irqbalance stop 2> /dev/null + echo "Done" -echo -n "Moving all interrupts off of core 0..." -count=`expr $(nproc) / 4` -cpumask="e" -for ((i=1; i<$count; i++)); do - if [ `expr $i % 8` -eq 0 ]; then - cpumask=",$cpumask" - fi - cpumask="f$cpumask" -done -for file in /proc/irq/*/smp_affinity; do - echo "$cpumask" > $file 2> /dev/null -done -echo "Done" + echo -n "Moving all interrupts off of core 0..." + count=`expr $(nproc) / 4` + cpumask="e" + for ((i=1; i<$count; i++)); do + if [ `expr $i % 8` -eq 0 ]; then + cpumask=",$cpumask" + fi + cpumask="f$cpumask" + done + for file in /proc/irq/*/smp_affinity; do + echo "$cpumask" > $file 2> /dev/null + done + echo "Done" -echo -n "Configuring kernel blk-mq for for NVMe SSDs..." -for queue in /sys/block/nvme*n*/queue; do - if [ -f "$queue/nomerges" ]; then - echo "1" > $queue/nomerges - fi + echo -n "Configuring kernel blk-mq for for NVMe SSDs..." + for queue in /sys/block/nvme*n*/queue; do + if [ -f "$queue/nomerges" ]; then + echo "1" > $queue/nomerges + fi - if [ -f "$queue/io_poll" ]; then - echo "1" > $queue/io_poll - fi + if [ -f "$queue/io_poll" ]; then + echo "1" > $queue/io_poll + fi - if [ -f "$queue/io_poll_delay" ]; then - echo "-1" > $queue/io_poll_delay - fi -done -echo "Done" + if [ -f "$queue/io_poll_delay" ]; then + echo "-1" > $queue/io_poll_delay + fi + done + echo "Done" +} + +configure_performance