Commit 2a68c268 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-next-5.13-rc1' of... 

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

Pull Kselftest updates from Shuah Khan:

 - fixes and updates to resctrl test from Fenghua Yu and Reinette Chatre

 - fixes to Kselftest documentation, framework

 - minor spelling correction in timers test

* tag 'linux-kselftest-next-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (25 commits)
  selftests/resctrl: Change a few printed messages
  Documentation: kselftest: fix path to test module files
  selftests/resctrl: Create .gitignore to include resctrl_tests
  selftests/resctrl: Fix checking for < 0 for unsigned values
  selftests/resctrl: Fix incorrect parsing of iMC counters
  selftests/resctrl: Fix unmount resctrl FS
  selftests/resctrl: Skip the test if requested resctrl feature is not supported
  selftests/resctrl: Modularize resctrl test suite main() function
  selftests/resctrl: Don't hard code value of "no_of_bits" variable
  selftests/resctrl: Fix MBA/MBM results reporting format
  selftests/resctrl: Use resctrl/info for feature detection
  selftests/resctrl: Check for resctrl mount point only if resctrl FS is supported
  selftests/resctrl: Add config dependencies
  selftests/resctrl: Fix a printed message
  selftests/resctrl: Share show_cache_info() by CAT and CMT tests
  selftests/resctrl: Call kselftest APIs to log test results
  selftests/resctrl: Rename CQM test as CMT test
  selftests/resctrl: Fix missing options "-n" and "-p"
  selftests/resctrl: Ensure sibling CPU is not same as original CPU
  selftests/resctrl: Clean up resctrl features check
  ...
parents 55e6be65 e7507478

Documentation/dev-tools/kselftest.rst

+2 −2
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ using a shell script test runner. ``kselftest/module.sh`` is designed 
to facilitate this process.  There is also a header file provided to

assist writing kernel modules that are for use with kselftest:



- ``tools/testing/kselftest/kselftest_module.h``

- ``tools/testing/kselftest/kselftest/module.sh``

- ``tools/testing/selftests/kselftest_module.h``

- ``tools/testing/selftests/kselftest/module.sh``



How to use

----------

tools/testing/selftests/lib.mk

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ ifdef building_out_of_srctree 
		rsync -aq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \

	fi

	@if [ "X$(TEST_PROGS)" != "X" ]; then \

		$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(OUTPUT)/$(TEST_PROGS)) ; \

		$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \

				  $(addprefix $(OUTPUT)/,$(TEST_PROGS))) ; \

	else \

		$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS)); \

	fi

tools/testing/selftests/resctrl/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

resctrl_tests

tools/testing/selftests/resctrl/Makefile

+1 −1
Original line number Diff line number Diff line 
CC = $(CROSS_COMPILE)gcc

CFLAGS = -g -Wall

CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2

SRCS=$(wildcard *.c)

OBJS=$(SRCS:.c=.o)

tools/testing/selftests/resctrl/README

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ ARGUMENTS 
Parameter '-h' shows usage information.



usage: resctrl_tests [-h] [-b "benchmark_cmd [options]"] [-t test list] [-n no_of_bits]

        -b benchmark_cmd [options]: run specified benchmark for MBM, MBA and CQM default benchmark is builtin fill_buf

        -t test list: run tests specified in the test list, e.g. -t mbm, mba, cqm, cat

        -b benchmark_cmd [options]: run specified benchmark for MBM, MBA and CMT default benchmark is builtin fill_buf

        -t test list: run tests specified in the test list, e.g. -t mbm, mba, cmt, cat

        -n no_of_bits: run cache tests using specified no of bits in cache bit mask

        -p cpu_no: specify CPU number to run the test. 1 is default

        -h: help