Hello,
The aim of this series is to make resctrl_tests run by using kselftest framework. - I modify resctrl_test Makefile and kselftest Makefile, to enable build/run resctrl_tests by using kselftest framework. Of course, users can also build/run resctrl_tests without using framework as before. - I change the default limited time for resctrl_tests to 120 seconds, to ensure the resctrl_tests finish in limited time on different environments. - When resctrl file system is not supported by environment or resctrl_tests is not run as root, return skip code of kselftest framework. - If resctrl_tests does not finish in limited time, terminate it as same as executing ctrl+c that kills parent process and child process.
Difference from v5: - Changed skip message when resctrlfs is not supported. [PATCH v6 3/6] - Changed resctrl's Makefile to always build with latest kernel headers and keep enabling gcc checks to detect buffer overflows. [PATCH v6 4/6] - Made README easier to understand. [PATCH v6 5/6] https://lore.kernel.org/lkml/20220311072147.3301525-1-tan.shaopeng@jp.fujits... [PATCH V5]
This patch series is based on v5.17-rc8.
Shaopeng Tan (6): selftests/resctrl: Kill child process before parent process terminates if SIGTERM is received selftests/resctrl: Change the default limited time to 120 seconds selftests/resctrl: Fix resctrl_tests' return code to work with selftest framework selftests/resctrl: Make resctrl_tests run using kselftest framework selftests/resctrl: Update README about using kselftest framework to build/run resctrl_tests selftests/resctrl: Add missing SPDX license to Makefile
tools/testing/selftests/Makefile | 1 + tools/testing/selftests/resctrl/Makefile | 19 +++------ tools/testing/selftests/resctrl/README | 39 +++++++++++++++---- .../testing/selftests/resctrl/resctrl_tests.c | 4 +- tools/testing/selftests/resctrl/resctrl_val.c | 1 + tools/testing/selftests/resctrl/settings | 3 ++ 6 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 tools/testing/selftests/resctrl/settings
In kselftest framework, a sub test is run using the timeout utility and it will send SIGTERM to the test upon timeout.
In resctrl_tests, a child process is created by fork() to run benchmark but SIGTERM is not set in sigaction(). If SIGTERM signal is received, the parent process will be killed, but the child process still exists.
kill child process before parent process terminates if SIGTERM signal is received.
Reviewed-by: Shuah Khan skhan@linuxfoundation.org Reviewed-by: Reinette Chatre reinette.chatre@intel.com Signed-off-by: Shaopeng Tan tan.shaopeng@jp.fujitsu.com --- tools/testing/selftests/resctrl/resctrl_val.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c index 95224345c78e..b32b96356ec7 100644 --- a/tools/testing/selftests/resctrl/resctrl_val.c +++ b/tools/testing/selftests/resctrl/resctrl_val.c @@ -678,6 +678,7 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param) sigemptyset(&sigact.sa_mask); sigact.sa_flags = SA_SIGINFO; if (sigaction(SIGINT, &sigact, NULL) || + sigaction(SIGTERM, &sigact, NULL) || sigaction(SIGHUP, &sigact, NULL)) { perror("# sigaction"); ret = errno;
On Fri, Mar 18, 2022 at 04:58:02PM +0900, Shaopeng Tan wrote:
In kselftest framework, a sub test is run using the timeout utility
s/is run/runs/
s/kill/Kill the/ add "the" before "parent"
Please fix the typos.
Reviewed-by: Fenghua Yu fenghua.yu@intel.com
Thanks.
-Fenghua
When testing on a Intel(R) Xeon(R) Gold 6254 CPU @ 3.10GHz the resctrl selftests fail due to timeout after exceeding the default time limit of 45 seconds. On this system the test takes about 68 seconds. Since the failing test by default accesses a fixed size of memory, the execution time should not vary significantly between different environment. A new default of 120 seconds should be sufficient yet easy to customize with the introduction of the "settings" file for reference.
Reviewed-by: Reinette Chatre reinette.chatre@intel.com Signed-off-by: Shaopeng Tan tan.shaopeng@jp.fujitsu.com --- tools/testing/selftests/resctrl/settings | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tools/testing/selftests/resctrl/settings
diff --git a/tools/testing/selftests/resctrl/settings b/tools/testing/selftests/resctrl/settings new file mode 100644 index 000000000000..a383f3d4565b --- /dev/null +++ b/tools/testing/selftests/resctrl/settings @@ -0,0 +1,3 @@ +# If running time is longer than 120 seconds when new tests are added in +# the future, increase timeout here. +timeout=120
On Fri, Mar 18, 2022 at 04:58:03PM +0900, Shaopeng Tan wrote:
Reviewed-by: Fenghua Yu fenghua.yu@intel.com
Thanks.
-Fenghua
In kselftest framework, if a sub test can not run by some reasons, the test result should be marked as SKIP rather than FAIL. Return KSFT_SKIP(4) instead of KSFT_FAIL(1) if resctrl_tests is not run as root or it is run on a test environment which does not support resctrl.
- ksft_exit_fail_msg(): returns KSFT_FAIL(1) - ksft_exit_skip(): returns KSFT_SKIP(4)
Reviewed-by: Shuah Khan skhan@linuxfoundation.org Signed-off-by: Shaopeng Tan tan.shaopeng@jp.fujitsu.com --- tools/testing/selftests/resctrl/resctrl_tests.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c index 973f09a66e1e..ed7e1a995b01 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -205,7 +205,7 @@ int main(int argc, char **argv) * 2. We execute perf commands */ if (geteuid() != 0) - return ksft_exit_fail_msg("Not running as root, abort testing.\n"); + return ksft_exit_skip("Not running as root. Skipping...\n");
/* Detect AMD vendor */ detect_amd(); @@ -235,7 +235,7 @@ int main(int argc, char **argv) sprintf(bm_type, "fill_buf");
if (!check_resctrlfs_support()) - return ksft_exit_fail_msg("resctrl FS does not exist\n"); + return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config options.\n");
filter_dmesg();
Hi Shaopeng Tan,
On 3/18/2022 12:58 AM, Shaopeng Tan wrote:
Almost.
"config options" -> "config option"
With that fixed you can add: Reviewed-by: Reinette Chatre reinette.chatre@intel.com
Reinette
On Fri, Mar 18, 2022 at 04:58:04PM +0900, Shaopeng Tan wrote:
In kselftest framework, if a sub test can not run by some reasons,
s/by/for/
the test result should be marked as SKIP rather than FAIL. Return KSFT_SKIP(4) instead of KSFT_FAIL(1) if resctrl_tests is not run
s/is/does/
as root or it is run on a test environment which does not support resctrl.
s/is run/runs/
Please fix the typos.
Reviewed-by: Fenghua Yu fenghua.yu@intel.com
Thanks.
-Fenghua
In kselftest framework, all tests can be build/run at a time, and a sub test also can be build/run individually. As follows: $ make kselftest-all TARGETS=resctrl $ make -C tools/testing/selftests run_tests $ make -C tools/testing/selftests TARGETS=resctrl run_tests
However, resctrl_tests cannot be run using kselftest framework, users have to change directory to tools/testing/selftests/resctrl/, run "make" to build executable file "resctrl_tests", and run "sudo ./resctrl_tests" to execute the test.
To build/run resctrl_tests using kselftest framework. Modify tools/testing/selftests/Makefile and tools/testing/selftests/resctrl/Makefile.
Even after this change, users can still build/run resctrl_tests without using framework as before.
Signed-off-by: Shaopeng Tan tan.shaopeng@jp.fujitsu.com --- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/resctrl/Makefile | 17 ++++------------- 2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index d08fe4cfe811..6138354b3760 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -52,6 +52,7 @@ TARGETS += proc TARGETS += pstore TARGETS += ptrace TARGETS += openat2 +TARGETS += resctrl TARGETS += rlimits TARGETS += rseq TARGETS += rtc diff --git a/tools/testing/selftests/resctrl/Makefile b/tools/testing/selftests/resctrl/Makefile index 6bcee2ec91a9..bee5fa8f1ac9 100644 --- a/tools/testing/selftests/resctrl/Makefile +++ b/tools/testing/selftests/resctrl/Makefile @@ -1,17 +1,8 @@ -CC = $(CROSS_COMPILE)gcc CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 -SRCS=$(wildcard *.c) -OBJS=$(SRCS:.c=.o) +CFLAGS += $(KHDR_INCLUDES)
-all: resctrl_tests +TEST_GEN_PROGS := resctrl_tests
-$(OBJS): $(SRCS) - $(CC) $(CFLAGS) -c $(SRCS) +include ../lib.mk
-resctrl_tests: $(OBJS) - $(CC) $(CFLAGS) -o $@ $^ - -.PHONY: clean - -clean: - $(RM) $(OBJS) resctrl_tests +$(OUTPUT)/resctrl_tests: $(wildcard *.c)
Hi Shaopeng Tan,
On 3/18/2022 12:58 AM, Shaopeng Tan wrote:
With the addition of KHDR_INCLUDES care should be taken to ensure that this work follows the work that introduces this to kselftest since it is not in mainline yet.
Apart from that, for the resctrl bits:
Reviewed-by: Reinette Chatre reinette.chatre@intel.com # resctrl changes
Reinette
On Fri, Mar 18, 2022 at 04:58:05PM +0900, Shaopeng Tan wrote:
In kselftest framework, all tests can be build/run at a time,
s/build/built/
and a sub test also can be build/run individually. As follows:
s/build/built/
Reviewed-by: Fenghua Yu fenghua.yu@intel.com
Thanks.
-Fenghua
resctrl_tests can be built or run using kselftests framework. Add description on how to do so in README.
Signed-off-by: Shaopeng Tan tan.shaopeng@jp.fujitsu.com --- tools/testing/selftests/resctrl/README | 39 +++++++++++++++++++++----- 1 file changed, 32 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/resctrl/README b/tools/testing/selftests/resctrl/README index 3d2bbd4fa3aa..58d0cb4e6a16 100644 --- a/tools/testing/selftests/resctrl/README +++ b/tools/testing/selftests/resctrl/README @@ -12,24 +12,49 @@ Allocation test on Intel RDT hardware. More tests will be added in the future. And the test suit can be extended to cover AMD QoS and ARM MPAM hardware as well.
+resctrl_tests can be run with or without kselftest framework. + +WITH KSELFTEST FRAMEWORK +======================= + BUILD -----
-Run "make" to build executable file "resctrl_tests". +Build executable file "resctrl_tests" from top level directory of the kernel source: + $ make -C tools/testing/selftests TARGETS=resctrl
RUN ---
-To use resctrl_tests, root or sudoer privileges are required. This is because -the test needs to mount resctrl file system and change contents in the file -system. +Run resctrl_tests as sudo or root since the test needs to mount resctrl file +system and change contents in the file system. +Using kselftest framework will run all supported tests within resctrl_tests: + + $ sudo make -C tools/testing/selftests TARGETS=resctrl run_tests + +More details about kselftest framework can be found in +Documentation/dev-tools/kselftest.rst. + +WITHOUT KSELFTEST FRAMEWORK +=========================== + +BUILD +----- + +Build executable file "resctrl_tests" from this directory(tools/testing/selftests/resctrl/): + $ make + +RUN +---
+Run resctrl_tests as sudo or root since the test needs to mount resctrl file +system and change contents in the file system. Executing the test without any parameter will run all supported tests:
- sudo ./resctrl_tests + $ sudo ./resctrl_tests
OVERVIEW OF EXECUTION ---------------------- +=====================
A test case has four stages:
@@ -41,7 +66,7 @@ A test case has four stages: - teardown: umount resctrl and clear temporary files.
ARGUMENTS ---------- +=========
Parameter '-h' shows usage information.
On 3/18/2022 12:58 AM, Shaopeng Tan wrote:
Thank you.
Reviewed-by: Reinette Chatre reinette.chatre@intel.com
Reinette
On Fri, Mar 18, 2022 at 04:58:06PM +0900, Shaopeng Tan wrote:
Reviewed-by: Fenghua Yu fenghua.yu@intel.com
Thanks.
-Fenghua
Add the missing SPDX(SPDX-License-Identifier) license header to tools/testing/selftests/resctrl/Makefile.
Signed-off-by: Shaopeng Tan tan.shaopeng@jp.fujitsu.com --- tools/testing/selftests/resctrl/Makefile | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/tools/testing/selftests/resctrl/Makefile b/tools/testing/selftests/resctrl/Makefile index bee5fa8f1ac9..73d53257df42 100644 --- a/tools/testing/selftests/resctrl/Makefile +++ b/tools/testing/selftests/resctrl/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 CFLAGS += $(KHDR_INCLUDES)
On 3/18/2022 12:58 AM, Shaopeng Tan wrote:
Acked-by: Reinette Chatre reinette.chatre@intel.com
Reinette
On Fri, Mar 18, 2022 at 04:58:07PM +0900, Shaopeng Tan wrote:
Reviewed-by: Fenghua Yu fenghua.yu@intel.com
Thanks.
-Fenghua
Hi Shaopeng Tan,
On 3/18/2022 12:58 AM, Shaopeng Tan wrote:
I do not think this is accurate because the KHDR_INCLUDES you use in patch 4/6 does not yet exist in v5.17.rc8. It seems to be available on the "next" branch of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
Reinette
linux-kselftest-mirror@lists.linaro.org
-
Fenghua Yu -
Reinette Chatre -
Shaopeng Tan