Selftests fixes for futex and intel_pstate

The intel_pstate kselftest expects that the output of cpupower frequency-info -l | tail -1 | awk ' { print $1 } ' to get frequency limits. This does not work after the following two changes.

- 562e5f1a3: rework the "cpupower frequency-info" command (Jacob Tanenbaum) removed parsable limit output
- ce512b840: Do not analyse offlined cpus
(Thomas Renninger) added newline to break limit parsing more

This change preserves human readable output if wanted as well as parsable output for scripts/tests.

Cc Thomas Renninger <[email protected]>

Cc "Shreyas B. Prabhu" <[email protected]>

Cc "Rafael J. Wysocki" <[email protected]>

Cc [email protected]

Signed-off-by Stafford Horne <[email protected]>

---
 tools/power/cpupower/utils/cpufreq-info.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

tools/power/cpupower/utils/cpufreq-info.c +12 -9

index 590d12a..3e701f0 100644
@@ -285,20 +285,24 @@ static int get_freq_hardware(unsigned int cpu, unsigned int human)
 
 /* --hwlimits / -l */
 
-static int get_hardware_limits(unsigned int cpu)
+static int get_hardware_limits(unsigned int cpu, unsigned int human)
 {
 	unsigned long min, max;
 
-	printf(_("  hardware limits: "));
 	if (cpufreq_get_hardware_limits(cpu, &min, &max)) {
 		printf(_("Not Available\n"));
 		return -EINVAL;
 	}
 
-	print_speed(min);
-	printf(" - ");
-	print_speed(max);
-	printf("\n");
+	if (human) {
+		printf(_("  hardware limits: "));
+		print_speed(min);
+		printf(" - ");
+		print_speed(max);
+		printf("\n");
+	} else {
+		printf("%lu %lu\n", min, max);
+	}
 	return 0;
 }
 

@@ -456,7 +460,7 @@ static void debug_output_one(unsigned int cpu)
 	get_related_cpus(cpu);
 	get_affected_cpus(cpu);
 	get_latency(cpu, 1);
-	get_hardware_limits(cpu);
+	get_hardware_limits(cpu, 1);
 
 	freqs = cpufreq_get_available_frequencies(cpu);
 	if (freqs) {

@@ -622,7 +626,7 @@ int cmd_freq_info(int argc, char **argv)
 			ret = get_driver(cpu);
 			break;
 		case 'l':
-			ret = get_hardware_limits(cpu);
+			ret = get_hardware_limits(cpu, human);
 			break;
 		case 'w':
 			ret = get_freq_hardware(cpu, human);

@@ -639,7 +643,6 @@ int cmd_freq_info(int argc, char **argv)
 		}
 		if (ret)
 			return ret;
-		printf("\n");
 	}
 	return ret;
 }

Signature · 1 line

2.9.3

This is followup to my previous patch [1] which was a very simple makefile change. After a comment from Darren Hart I updated intel_pstate as well, but noticed a few issues with running intel_pstate. That caused the change to expand a bit.

- fix build deps for futex test *original*
- update makefile for intel_pstate to be in sync with Bamvor's changes
- update cpupower frequency-info to fix intel_pstate test

For the linux-pm list the change to cpupower might be an issue, but if so it would be nice if they can suggest a better way to get the self test to do what it wants to do.

The series is based on Shuah's kselftest next branch, because that is where Bamvor's latest changes are:
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git next

[1] https://lkml.org/lkml/2017/1/5/903

Stafford Horne (6):
selftests/futex: Add stdio used for logging selftests/futex: Add headers to makefile dependencies
cpupower: Restore format of frequency-info limit selftests/intel_pstate: Fix warning on loop index overflow selftests/intel_pstate: Update makefile to match new style
selftests: Add intel_pstate to TARGETS

 tools/power/cpupower/utils/cpufreq-info.c         | 21 ++++++++++++---------
 tools/testing/selftests/Makefile                  |  1 +
 tools/testing/selftests/futex/functional/Makefile |  5 ++++-
 tools/testing/selftests/futex/include/logging.h   |  1 +
 tools/testing/selftests/intel_pstate/Makefile     | 13 ++++---------
 tools/testing/selftests/intel_pstate/aperf.c      |  2 +-
 6 files changed, 23 insertions(+), 20 deletions(-)

Quoted 27 lines · Stafford Horne

This is followup to my previous patch [1] which was a very simple makefile change. After a comment from Darren Hart I updated intel_pstate as well, but noticed a few issues with running intel_pstate. That caused the change to expand a bit.

- fix build deps for futex test *original*
- update makefile for intel_pstate to be in sync with Bamvor's changes
- update cpupower frequency-info to fix intel_pstate test

For the linux-pm list the change to cpupower might be an issue, but if so it would be nice if they can suggest a better way to get the self test to do what it wants to do.

The series is based on Shuah's kselftest next branch, because that is where Bamvor's latest changes are:
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git next

[1] https://lkml.org/lkml/2017/1/5/903

Stafford Horne (6):
selftests/futex: Add stdio used for logging selftests/futex: Add headers to makefile dependencies
cpupower: Restore format of frequency-info limit selftests/intel_pstate: Fix warning on loop index overflow selftests/intel_pstate: Update makefile to match new style
selftests: Add intel_pstate to TARGETS

Quoted 8 lines

 tools/power/cpupower/utils/cpufreq-info.c         | 21 ++++++++++++---------
 tools/testing/selftests/Makefile                  |  1 +
 tools/testing/selftests/futex/functional/Makefile |  5 ++++-
 tools/testing/selftests/futex/include/logging.h   |  1 +
 tools/testing/selftests/intel_pstate/Makefile     | 13 ++++---------
 tools/testing/selftests/intel_pstate/aperf.c      |  2 +-
 6 files changed, 23 insertions(+), 20 deletions(-)

The series is now in linux-kselftest next for 4.11

thanks for the fixes.