From a42ccffa0aa8336fac916da06cb7dc7e902fabf9 Mon Sep 17 00:00:00 2001
From: wawryk <maciejx.wawryk@intel.com>
Date: Tue, 29 Jun 2021 12:54:25 +0200
Subject: [PATCH] test/nvme: Always enable performance cpu governor in NVMe
 performance tests

Signed-off-by: wawryk <maciejx.wawryk@intel.com>
Change-Id: I2ef9bd23b545ea51e9e3f4b2b55189a2423707d4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8547
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 test/nvme/perf/run_perf.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/nvme/perf/run_perf.sh b/test/nvme/perf/run_perf.sh
index 6b2af2b76..189e16311 100755
--- a/test/nvme/perf/run_perf.sh
+++ b/test/nvme/perf/run_perf.sh
@@ -249,16 +249,21 @@ if [[ "$PLUGIN" =~ "kernel" ]]; then
 	fi
 fi
 
+cpu_governor="$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)"
+
 if [[ -n "$CPUFREQ" ]]; then
 	if [[ ! "$(cat /proc/cmdline)" =~ "intel_pstate=disable" ]]; then
 		echo "ERROR: Cannot set custom CPU frequency for test. intel_pstate=disable not in boot options."
 		false
 	else
-		cpu_governor="$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)"
 		cpupower frequency-set -g userspace
 		cpupower frequency-set -f $CPUFREQ
 	fi
+else
+	cpupower frequency-set -g performance
 fi
+current_governor=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
+echo "INFO: Using $current_governor cpu governor for test."
 
 if $PERFTOP; then
 	echo "INFO: starting perf record on cores $CPUS_ALLOWED"