Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4f3f22e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.11-rc1' of... 

Merge tag 'linux-kselftest-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest update from Shuah Khan:
 "This update consists of:

   - fixes to several existing tests from Stafford Horne

   - cpufreq tests from Viresh Kumar

   - Selftest build and install fixes from Bamvor Jian Zhang and Michael
     Ellerman

   - Fixes to protection-keys tests from Dave Hansen

   - Warning fixes from Shuah Khan"

* tag 'linux-kselftest-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (28 commits)
  selftests/powerpc: Fix remaining fallout from recent changes
  selftests/powerpc: Fix the clean rule since recent changes
  selftests: Fix the .S and .S -> .o rules
  selftests: Fix the .c linking rule
  selftests: Fix selftests build to just build, not run tests
  selftests, x86, protection_keys: fix wrong offset in siginfo
  selftests, x86, protection_keys: fix uninitialized variable warning
  selftest: cpufreq: Update MAINTAINERS file
  selftest: cpufreq: Add special tests
  selftest: cpufreq: Add support to test cpufreq modules
  selftest: cpufreq: Add suspend/resume/hibernate support
  selftest: cpufreq: Add support for cpufreq tests
  selftests: Add intel_pstate to TARGETS
  selftests/intel_pstate: Update makefile to match new style
  selftests/intel_pstate: Fix warning on loop index overflow
  cpupower: Restore format of frequency-info limit
  selftests/futex: Add headers to makefile dependencies
  selftests/futex: Add stdio used for logging
  selftests: x86 protection_keys remove dead code
  selftests: x86 protection_keys fix unused variable compile warnings
  ...
parents cb419553 68bd42d9

Documentation/kselftest.txt

+12 −0
Original line number Diff line number Diff line
@@ -95,3 +95,15 @@ In general, the rules for selftests are 


 * Don't cause the top-level "make run_tests" to fail if your feature is

   unconfigured.



Contributing new tests(details)

===============================



 * Use TEST_GEN_XXX if such binaries or files are generated during

   compiling.

   TEST_PROGS, TEST_GEN_PROGS mean it is the excutable tested by

   default.

   TEST_PROGS_EXTENDED, TEST_GEN_PROGS_EXTENDED mean it is the

   executable which is not tested by default.

   TEST_FILES, TEST_GEN_FILES mean it is the file which is used by

   test.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3452,6 +3452,7 @@ B: https://bugzilla.kernel.org 
F:	Documentation/cpu-freq/

F:	drivers/cpufreq/

F:	include/linux/cpufreq.h

F:	tools/testing/selftests/cpufreq/



CPU FREQUENCY DRIVERS - ARM BIG LITTLE

M:	Viresh Kumar <viresh.kumar@linaro.org>

tools/power/cpupower/utils/cpufreq-info.c

+12 −9
Original line number Diff line number Diff line
@@ -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;

	}



	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;

}

tools/testing/selftests/Makefile

+29 −9
Original line number Diff line number Diff line 
TARGETS =  bpf

TARGETS += breakpoints

TARGETS += capabilities

TARGETS += cpufreq

TARGETS += cpu-hotplug

TARGETS += efivarfs

TARGETS += exec
@@ -8,6 +9,7 @@ TARGETS += firmware 
TARGETS += ftrace

TARGETS += futex

TARGETS += gpio

TARGETS += intel_pstate

TARGETS += ipc

TARGETS += kcmp

TARGETS += lib
@@ -49,29 +51,44 @@ override LDFLAGS = 
override MAKEFLAGS =

endif



BUILD := $(O)

ifndef BUILD

  BUILD := $(KBUILD_OUTPUT)

endif

ifndef BUILD

  BUILD := $(shell pwd)

endif



export BUILD

all:

	for TARGET in $(TARGETS); do		\

		make -C $$TARGET; \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		mkdir $$BUILD_TARGET  -p;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET;\

	done;



run_tests: all

	for TARGET in $(TARGETS); do \

		make -C $$TARGET run_tests; \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\

	done;



hotplug:

	for TARGET in $(TARGETS_HOTPLUG); do \

		make -C $$TARGET; \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET;\

	done;



run_hotplug: hotplug

	for TARGET in $(TARGETS_HOTPLUG); do \

		make -C $$TARGET run_full_test; \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\

	done;



clean_hotplug:

	for TARGET in $(TARGETS_HOTPLUG); do \

		make -C $$TARGET clean; \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\

	done;



run_pstore_crash:
@@ -86,7 +103,8 @@ ifdef INSTALL_PATH 
	@# Ask all targets to install their files

	mkdir -p $(INSTALL_PATH)

	for TARGET in $(TARGETS); do \

		make -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \

	done;



	@# Ask all targets to emit their test scripts
@@ -95,10 +113,11 @@ ifdef INSTALL_PATH 
	echo "ROOT=\$$PWD" >> $(ALL_SCRIPT)



	for TARGET in $(TARGETS); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		echo "echo ; echo Running tests in $$TARGET" >> $(ALL_SCRIPT); \

		echo "echo ========================================" >> $(ALL_SCRIPT); \

		echo "cd $$TARGET" >> $(ALL_SCRIPT); \

		make -s --no-print-directory -C $$TARGET emit_tests >> $(ALL_SCRIPT); \

		make -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \

		echo "cd \$$ROOT" >> $(ALL_SCRIPT); \

	done;
@@ -109,7 +128,8 @@ endif 


clean:

	for TARGET in $(TARGETS); do \

		make -C $$TARGET clean; \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

		make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\

	done;



.PHONY: install

tools/testing/selftests/bpf/Makefile

+2 −8
Original line number Diff line number Diff line
@@ -3,15 +3,12 @@ BPFOBJ := $(LIBDIR)/bpf/bpf.o 


CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR)



test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map

TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map



TEST_PROGS := $(test_objs) test_kmod.sh

TEST_FILES := $(test_objs)

TEST_PROGS := test_kmod.sh



.PHONY: all clean force



all: $(test_objs)



# force a rebuild of BPFOBJ when its dependencies are updated

force:
@@ -21,6 +18,3 @@ $(BPFOBJ): force 
$(test_objs): $(BPFOBJ)



include ../lib.mk
 


clean:

	$(RM) $(test_objs)