thermal: add new test group
PATCH v14 1/1 thermal: add new test group
Currently consists of only one test for the CPU package thermal sensor interface for Intel platforms.
It works by checking the initial count of thermal interrupts. Then it decreases the threshold for sending a thermal interrupt to just above the current temperature and runs a workload on the CPU. Finally, it restores the original thermal threshold and checks whether the number of thermal interrupts increased.
---
Addresses Andrea's feedback, adding support for testing all the matching thermal zones.
runtest/thermal | 3 + testcases/kernel/Makefile | 1 + testcases/kernel/thermal/.gitignore | 1 + testcases/kernel/thermal/Makefile | 9 + .../kernel/thermal/thermal_interrupt_events.c | 230 ++++++++++++++++++ 5 files changed, 244 insertions(+) create mode 100644 runtest/thermal create mode 100644 testcases/kernel/thermal/.gitignore create mode 100644 testcases/kernel/thermal/Makefile create mode 100644 testcases/kernel/thermal/thermal_interrupt_events.c
runtest/thermal new file +3 -0
@@ -0,0 +1,3 @@ +# Thermal driver API +# https://docs.kernel.org/driver-api/thermal/ +thermal_interrupt_events thermal_interrupt_events
testcases/kernel/Makefile +1 -0
@@ -36,6 +36,7 @@ SUBDIRS += connectors \ sched \ security \ sound \ + thermal \ tracing \ uevents \ watchqueue \
testcases/kernel/thermal/.gitignore new file +1 -0
@@ -0,0 +1 @@ +thermal_interrupt_events
testcases/kernel/thermal/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2025, Intel Corporation. All rights reserved. +# Author:Piotr Kubaj <[email protected]> + +top_srcdir ?= ../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/thermal/thermal_interrupt_events.c new file +230 -0
230 lines not on this page · raw message
Signature · 13 lines
2.47.3 --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Spolka oswiadcza, ze posiada status duzego przedsiebiorcy w rozumieniu ustawy z dnia 8 marca 2013 r. o przeciwdzialaniu nadmiernym opoznieniom w transakcjach handlowych. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Piotr,
Minor notes:
testcases/kernel/thermal/thermal_interrupt_events.c line 78
Quoted 8 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +8
-0+static void setup (void ) +{ +char line[8192 ]; + + nproc =tst_ncpus (); +tst_res (TDEBUG ,"Number of logical cores: %d" , nproc); + interrupt_init =calloc (nproc,sizeof (uint64_t )); + interrupt_later =calloc (nproc,sizeof (uint64_t ));
You correctly had SAFE_CALLOC() in v13, here you accident start using calloc() again.
testcases/kernel/thermal/thermal_interrupt_events.c line 90
Quoted 12 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +12
-0+ +DIR *dir =SAFE_OPENDIR ("/sys/class/thermal/" ); +struct dirent *entry; + +while ((entry =SAFE_READDIR (dir))) { +if ((!strncmp (entry->d_name,"thermal_zone" ,sizeof ("thermal_zone" ) -1 ))) + tz_counter++; + } +SAFE_CLOSEDIR (dir); +tst_res (TDEBUG ,"Found %d thermal zone(s)" , tz_counter); + + x86_pkg_temp_tz =calloc (tz_counter,sizeof (bool ));
And here as well.
...
Quoted 10 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +10
-0+memset (interrupts,0 , nproc *sizeof (*interrupts)); +FILE *fp =SAFE_FOPEN ("/proc/interrupts" ,"r" ); + +while (fgets (line,sizeof (line), fp)) { +if (strstr (line,"Thermal event interrupts" )) { + interrupts_found = true; +char *ptr =strchr (line,':' ); + +for (int i =0 ; i < nproc; i++) { +char *endptr;
testcases/kernel/thermal/thermal_interrupt_events.c line 55
Quoted 10 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +10
-0+ +while (*ptr && !isdigit (*ptr)) + ptr++; + + errno =0 ; + + interrupts[i] =strtoull (ptr, &endptr,10 ); + +if (ptr == endptr) +tst_brk (TBROK ,"interrupt not found" );
Printing CPU would help to debug on error, right?
tst_brk(TBROK, "CPU %d: interrupt not found", nproc);
testcases/kernel/thermal/thermal_interrupt_events.c line 58
Quoted 3 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +3
-0+ +if (errno ==ERANGE ) +tst_brk (TCONF ,"interrupt out of range" );
I would expect this is quite serious error (test bug), therefore TBROK should be used, right? TCONF is really for skipping the test due SUT not suitable for running the test. But if the only error, it can be changed before merge.
tst_brk(TBROK, "CPU %d: interrupt out of range", nproc);
...
testcases/kernel/thermal/thermal_interrupt_events.c line 217
Quoted 8 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +8
-0+static struct tst_test test = { + .cleanup = cleanup, + .forks_child =1 , + .needs_drivers = (const char *const []) { +"x86_pkg_temp_thermal" , +NULL + }, + .min_runtime =180 ,
You had .min_runtime = 5 sec in the v13, now again back 3 min.
As I wrote earlier, using tst_set_runtime() would be much better than expect 3 min run (on my laptop the test needs few sec, but it will waste time in case of the test get stuck for whatever reason or might not enough for really big machine).
+#define TEST_RUNTIME 3
#define RUNTIME 30
#define SLEEP 10
#define TEMP_INCREMENT 10
...
@@ -73,9 +74,10 @@ static void setup(void)
char line[8192];
nproc = tst_ncpus();
+ tst_set_runtime(nproc * TEST_RUNTIME);
This will lead to run in my machine:
tst_test.c:1887: TINFO: Overall timeout per run is 0h 00m 30s tst_test.c:1908: TINFO: Updating runtime to 0h 00m 12s tst_test.c:1887: TINFO: Overall timeout per run is 0h 00m 42s
I'd be ok to apply the following changes before merge. But I'd really prefer Cyril to give ack to this before merge.
Kind regards,
Petr
testcases/kernel/thermal/thermal_interrupt_events.c line 230
Quoted 13 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +13
-0+ .needs_root = 1, + .setup = setup, + .supported_archs = (const char *const []) { +"x86" , +"x86_64" , +NULL + }, + .tags = (const struct tst_tag []) { + {"linux-git" ,"9635c586a559ba0e45b2bfbff79c937ddbaf1a62" }, + {} + }, + .test_all = run +};
+++ testcases/kernel/thermal/thermal_interrupt_events.c @@ -19,6 +19,7 @@
#include "tst_test.h"
#include "tst_timer_test.h"
+#define TEST_RUNTIME 3
#define RUNTIME 30
#define SLEEP 10
#define TEMP_INCREMENT 10
@@ -52,10 +53,10 @@ static void read_interrupts(uint64_t *interrupts, const int nproc)
interrupts[i] = strtoull(ptr, &endptr, 10);
if (ptr == endptr)
- tst_brk(TBROK, "interrupt not found");
+ tst_brk(TBROK, "CPU %d: interrupt not found", nproc);
if (errno == ERANGE)
- tst_brk(TCONF, "interrupt out of range");
+ tst_brk(TBROK, "CPU %d: interrupt out of range", nproc);
ptr = endptr;
tst_res(TDEBUG, "interrupts[%d]: %ld", i, interrupts[i]);
@@ -73,9 +74,10 @@ static void setup(void)
char line[8192];
nproc = tst_ncpus();
+ tst_set_runtime(nproc * TEST_RUNTIME);
tst_res(TDEBUG, "Number of logical cores: %d", nproc);
- interrupt_init = calloc(nproc, sizeof(uint64_t));
- interrupt_later = calloc(nproc, sizeof(uint64_t));
+ interrupt_init = SAFE_CALLOC(nproc, sizeof(uint64_t));
+ interrupt_later = SAFE_CALLOC(nproc, sizeof(uint64_t));
DIR *dir = SAFE_OPENDIR("/sys/class/thermal/"); struct dirent *entry;
@@ -87,7 +89,7 @@ static void setup(void)
SAFE_CLOSEDIR(dir);
tst_res(TDEBUG, "Found %d thermal zone(s)", tz_counter);
- x86_pkg_temp_tz = calloc(tz_counter, sizeof(bool));
+ x86_pkg_temp_tz = SAFE_CALLOC(tz_counter, sizeof(bool));
for (int i = 0; i < tz_counter; i++) {
char path[PATH_MAX];
@@ -214,7 +216,6 @@ static struct tst_test test = {
"x86_pkg_temp_thermal", NULL
},
- .min_runtime = 180,
.needs_root = 1,
.setup = setup,
.supported_archs = (const char *const []) {
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Piotr,
Quoted 1 line
+static int nproc,
temp_high, temp, trip,tz_counter;
trip is a single int, but cleanup() uses it to restore trip_point_1_temp for ALL x86_pkg_temp zones. If there are multiple such zones, each test_zone() call overwrites trip at the SAFE_FILE_SCANF, so only the last zone's original value survives. The earlier zones get the wrong value restored.
This needs to be a per-zone array, e.g. static int *trip_orig; allocated alongside x86_pkg_temp_tz in setup(), with each zone's original trip value saved individually.
Quoted 2 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +2
-0+ interrupt_init =calloc (nproc,sizeof (uint64_t )); + interrupt_later =calloc (nproc,sizeof (uint64_t ));
[...]
testcases/kernel/thermal/thermal_interrupt_events.c line 90
Quoted 1 line
testcases/kernel/thermal/thermal_interrupt_events.c new file +1
-0+ x86_pkg_temp_tz =calloc (tz_counter,sizeof (bool ));
LTP has SAFE_CALLOC() in tst_safe_macros.h. Please use it instead of raw calloc() — it handles the NULL check and calls tst_brk(TBROK) on failure.
testcases/kernel/thermal/thermal_interrupt_events.c line 61
Quoted 1 line
testcases/kernel/thermal/thermal_interrupt_events.c new file +1
-0+tst_res (TDEBUG ,"interrupts[%d]: %ld" , i, interrupts[i]);
interrupts[i] is uint64_t but printed with %ld. Use PRIu64:
tst_res(TDEBUG, "interrupts[%d]: %" PRIu64, i, interrupts[i]);
Same issue below in run():
testcases/kernel/thermal/thermal_interrupt_events.c
Quoted 4 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +3
-0+tst_res (TFAIL ,"CPU %d interrupt counter: %ld (previous: %ld)" , + i, interrupt_later[i], interrupt_init[i]); +SAFE_FILE_SCANF (path,"%s" , line);
%s without a width limit can overflow line[8192]. Use "%8191s".
Quoted 2 lines
(quoted diff) +2
-0+static void *cpu_workload(double run_time) +{
[...]
Review
Quoted 2 lines
(quoted diff) +2
-0+ return NULL; +}
cpu_workload() returns void * as if it were a pthread start routine, but it is only called directly from the child process. It should return void.
testcases/kernel/thermal/thermal_interrupt_events.c line 196
Quoted 6 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +6
-0+for (int i =0 ; i < tz_counter; i++) { +if (x86_pkg_temp_tz[i]) { +read_interrupts (interrupt_init, nproc); +test_zone (i); +read_interrupts (interrupt_later, nproc); +for (int i =0 ; i < nproc; i++) {
Inner i shadows the outer loop variable i. Please rename to j or cpu to avoid confusion.
Regards,
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp