Skip to contentSkip to conversation

thermal: add new test group

PATCH Superseded Piotr Kubaj 3 participants 4 messages Mar 4 – Mar 10

v11 of 21 Superseded Latest is v21 →

lore
Share & tools
lore
#0 lore raw

PATCH v11 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.

---
Patch version 11
Switched 1 to true and added reference to kernel fix.

---
 runtest/thermal                               |   3 +
 testcases/kernel/Makefile                     |   1 +
 testcases/kernel/thermal/.gitignore           |   1 +
 testcases/kernel/thermal/Makefile             |   9 +
 .../kernel/thermal/thermal_interrupt_events.c | 225 ++++++++++++++++++
 5 files changed, 239 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
new file mode 100644
index 000000000..57e3d29f8
@@ -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
index 98fd45a9d..ac816e4e8 100644
@@ -36,6 +36,7 @@ SUBDIRS			+= connectors \
 			   sched \
 			   security \
 			   sound \
+			   thermal \
 			   tracing \
 			   uevents \
 			   watchqueue \
testcases/kernel/thermal/.gitignore new file +1 -0
new file mode 100644
index 000000000..1090bdad8
@@ -0,0 +1 @@
+thermal_interrupt_events
testcases/kernel/thermal/Makefile new file +9 -0
new file mode 100644
index 000000000..4657c3fb3
@@ -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 +225 -0

225 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
Reviewed-by on v11 1/1
#1 lore raw

Hi Piotr,

Quoted 8 lines

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.

Quoted 4 lines

---
Patch version 11
Switched 1 to true and added reference to kernel fix.

Generally LGTM, maybe Cyril will have some comments.

...

Quoted 18 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +18 -0
+static void read_interrupts(uint64_t *interrupts, const int nproc)
+{
+	bool interrupts_found = false;
+	char line[8192];
+
+	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;
+
+				while (*ptr && !isdigit(*ptr))
+					ptr++;

testcases/kernel/thermal/thermal_interrupt_events.c line 58

Quoted 10 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +10 -0
+
+				errno = 0;
+
+				interrupts[i] = strtoull(ptr, &endptr, 10);
+
+				if (ptr == endptr)
+					tst_brk(TBROK, "interrupt not found");
+
+				if (errno == ERANGE)
+					tst_brk(TCONF, "interrupt out of range");

I wonder if this is expected to happen. Can be value really over LLONG_MAX?

Because arch/x86/include/asm/hardirq.h has

unsigned int irq_thermal_count

=> if it's over the range, I'd quit with tst_brk(TBROK).

Also we don't have safe_strtoull() in lib/safe_macros.c (it would be trivial to add) otherwise I would just use it.

(Otherwise IMHO Cyril's request from v8 was done
https://lore.kernel.org/ltp/[email protected]/)

Quoted 11 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +11 -0
+
+				ptr = endptr;
+				tst_res(TDEBUG, "interrupts[%d]: %ld", i, interrupts[i]);
+			}
+			break;
+		}
+	}
+	SAFE_FCLOSE(fp);
+	if (!interrupts_found)
+		tst_brk(TCONF, "No Thermal event interrupts line in /proc/interrupts");
+}

...

Quoted 27 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +27 -0
+static void cleanup(void)
+{
+	if (x86_pkg_temp_tz_found)
+		SAFE_FILE_PRINTF(trip_path, "%d", trip);
+
+	free(x86_pkg_temp_tz);
+	free(interrupt_init);
+	free(interrupt_later);
+}
+
+static void run(void)
+{
+	for (int i = 0; i < tz_counter; i++) {
+		if (x86_pkg_temp_tz[i])
+			test_zone(i);
+	}
+	read_interrupts(interrupt_later, nproc);
+
+	for (int i = 0; i < nproc; i++) {
+		if (interrupt_later[i] < interrupt_init[i])
+			tst_res(TFAIL, "CPU %d interrupt counter: %ld (previous: %ld)",
+				i, interrupt_later[i], interrupt_init[i]);
+	}
+
+	if (temp <= temp_high)
+		tst_res(TFAIL, "Zone temperature is not rising as expected");
+	else

testcases/kernel/thermal/thermal_interrupt_events.c line 211

Quoted 10 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +10 -0
+		tst_res(TPASS, "x86 package thermal interrupt triggered");
+}
+
+static struct tst_test test = {
+	.cleanup = cleanup,
+	.forks_child = 1,
+	.needs_drivers = (const char *const []) {
+		"x86_pkg_temp_thermal",
+		NULL
+	},

nit: Alternatively instead of needs drivers we could check via .needs_kconfigs for CONFIG_X86_THERMAL_VECTOR (functionality wrapped in kernel, defined in drivers/thermal/intel/Kconfig). Cyril WDYT?

IMHO we slowly convert from modules.{dep,builtin} based search in lib/tst_kernel.c to kconfig related checks (functionality which come to LTP later).

testcases/kernel/thermal/thermal_interrupt_events.c line 212

Quoted 1 line
testcases/kernel/thermal/thermal_interrupt_events.c new file +1 -0
+	.min_runtime = 180,

Test is mostly super quick. I suppose we can lower down this to e.g. 5 because it depends on number of the zones.
But could we define it to 5 here and set in the setup correct value via tst_set_runtime().

testcases/kernel/thermal/thermal_interrupt_events.c line 219

Quoted 7 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +7 -0
+	.needs_root = 1,
+	.setup = setup,
+	.supported_archs = (const char *const []) {
+		"x86",
+		"x86_64",
+		NULL
+	},

This is somehow redundant to .needs_drivers/.needs_kconfigs. OTOH it nicely defines which arch is targeted.

testcases/kernel/thermal/thermal_interrupt_events.c line 221

Quoted 2 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +2 -0
+	.tags = (const struct tst_tag[]) {
+		{"linux-git", "9635c586a559ba0e45b2bfbff79c937ddbaf1a62"},

FYI we normally use much shorter hash (12 chars), but IMHO this is good approach. IMHO we should start to use sha1 (40 chars).

Kind regards,
Petr

Quoted 4 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +4 -0
+		{}
+	},
+	.test_all = run
+};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

Hi!

Quoted 22 lines
Quoted 22 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +22 -0
+static void read_interrupts(uint64_t *interrupts, const int nproc)
+{
+	bool interrupts_found = false;
+	char line[8192];
+
+	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;
+
+				while (*ptr && !isdigit(*ptr))
+					ptr++;
+
+				errno = 0;
+
+				interrupts[i] = strtoull(ptr, &endptr, 10);
Quoted 8 lines

testcases/kernel/thermal/thermal_interrupt_events.c line 58

Quoted 6 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +6 -0
+
+				if (ptr == endptr)
+					tst_brk(TBROK, "interrupt not found");
+
+				if (errno == ERANGE)
+					tst_brk(TCONF, "interrupt out of range");

I wonder if this is expected to happen. Can be value really over LLONG_MAX?

That's just to make sure that kernel generated sane result. In tests we shouldn't blindly trust anything.

Quoted 5 lines

Because arch/x86/include/asm/hardirq.h has

unsigned int irq_thermal_count

=> if it's over the range, I'd quit with tst_brk(TBROK).

It should be TBROK indeed.

Quoted 51 lines

Also we don't have safe_strtoull() in lib/safe_macros.c (it would be trivial to add) otherwise I would just use it.

(Otherwise IMHO Cyril's request from v8 was done
https://lore.kernel.org/ltp/[email protected]/)

Quoted 11 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +11 -0
+
+				ptr = endptr;
+				tst_res(TDEBUG, "interrupts[%d]: %ld", i, interrupts[i]);
+			}
+			break;
+		}
+	}
+	SAFE_FCLOSE(fp);
+	if (!interrupts_found)
+		tst_brk(TCONF, "No Thermal event interrupts line in /proc/interrupts");
+}

...

Quoted 32 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +32 -0
+static void cleanup(void)
+{
+	if (x86_pkg_temp_tz_found)
+		SAFE_FILE_PRINTF(trip_path, "%d", trip);
+
+	free(x86_pkg_temp_tz);
+	free(interrupt_init);
+	free(interrupt_later);
+}
+
+static void run(void)
+{
+	for (int i = 0; i < tz_counter; i++) {
+		if (x86_pkg_temp_tz[i])
+			test_zone(i);
+	}
+	read_interrupts(interrupt_later, nproc);
+
+	for (int i = 0; i < nproc; i++) {
+		if (interrupt_later[i] < interrupt_init[i])
+			tst_res(TFAIL, "CPU %d interrupt counter: %ld (previous: %ld)",
+				i, interrupt_later[i], interrupt_init[i]);
+	}
+
+	if (temp <= temp_high)
+		tst_res(TFAIL, "Zone temperature is not rising as expected");
+	else
+		tst_res(TPASS, "x86 package thermal interrupt triggered");
+}
+
+static struct tst_test test = {
+	.cleanup = cleanup,
Quoted 8 lines

testcases/kernel/thermal/thermal_interrupt_events.c line 211

Quoted 5 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +5 -0
+	.forks_child = 1,
+	.needs_drivers = (const char *const []) {
+		"x86_pkg_temp_thermal",
+		NULL
+	},

nit: Alternatively instead of needs drivers we could check via .needs_kconfigs for CONFIG_X86_THERMAL_VECTOR (functionality wrapped in kernel, defined in drivers/thermal/intel/Kconfig). Cyril WDYT?

We would need to apply the kconfig patch I've send and then add hook for the CONFIG_X86_THERMAL_VECTOR. I wouldn't wait for that with this patch, we can fix it once our infrastructure is ready.

Quoted 11 lines

IMHO we slowly convert from modules.{dep,builtin} based search in lib/tst_kernel.c to kconfig related checks (functionality which come to LTP later).

testcases/kernel/thermal/thermal_interrupt_events.c line 212

Quoted 1 line
testcases/kernel/thermal/thermal_interrupt_events.c new file +1 -0
+	.min_runtime = 180,

Test is mostly super quick. I suppose we can lower down this to e.g. 5 because it depends on number of the zones.
But could we define it to 5 here and set in the setup correct value via tst_set_runtime().

Quoted 9 lines

testcases/kernel/thermal/thermal_interrupt_events.c line 219

Quoted 7 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +7 -0
+	.needs_root = 1,
+	.setup = setup,
+	.supported_archs = (const char *const []) {
+		"x86",
+		"x86_64",
+		NULL
+	},

This is somehow redundant to .needs_drivers/.needs_kconfigs. OTOH it nicely defines which arch is targeted.

That's why I requested it to be added.

Quoted 12 lines

testcases/kernel/thermal/thermal_interrupt_events.c line 221

Quoted 2 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +2 -0
+	.tags = (const struct tst_tag[]) {
+		{"linux-git", "9635c586a559ba0e45b2bfbff79c937ddbaf1a62"},

FYI we normally use much shorter hash (12 chars), but IMHO this is good approach. IMHO we should start to use sha1 (40 chars).

Kind regards,
Petr

Quoted 4 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +4 -0
+		{}
+	},
+	.test_all = run
+};
Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

Hi all,

TL;DR: no more concerns from my side.

Quoted 32 lines

Hi!

Quoted 22 lines
Quoted 22 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +22 -0
+static void read_interrupts(uint64_t *interrupts, const int nproc)
+{
+	bool interrupts_found = false;
+	char line[8192];
+
+	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;
+
+				while (*ptr && !isdigit(*ptr))
+					ptr++;
+
+				errno = 0;
+
+				interrupts[i] = strtoull(ptr, &endptr, 10);
Quoted 8 lines

testcases/kernel/thermal/thermal_interrupt_events.c line 58

Quoted 6 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +6 -0
+
+				if (ptr == endptr)
+					tst_brk(TBROK, "interrupt not found");
+
+				if (errno == ERANGE)
+					tst_brk(TCONF, "interrupt out of range");

I wonder if this is expected to happen. Can be value really over LLONG_MAX?

Quoted 2 lines

That's just to make sure that kernel generated sane result. In tests we shouldn't blindly trust anything.

Makes sense.

Quoted 68 lines
Quoted 5 lines

Because arch/x86/include/asm/hardirq.h has

unsigned int irq_thermal_count

=> if it's over the range, I'd quit with tst_brk(TBROK).

It should be TBROK indeed.

Quoted 51 lines

Also we don't have safe_strtoull() in lib/safe_macros.c (it would be trivial to add) otherwise I would just use it.

(Otherwise IMHO Cyril's request from v8 was done
https://lore.kernel.org/ltp/[email protected]/)

Quoted 11 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +11 -0
+
+				ptr = endptr;
+				tst_res(TDEBUG, "interrupts[%d]: %ld", i, interrupts[i]);
+			}
+			break;
+		}
+	}
+	SAFE_FCLOSE(fp);
+	if (!interrupts_found)
+		tst_brk(TCONF, "No Thermal event interrupts line in /proc/interrupts");
+}

...

Quoted 32 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +32 -0
+static void cleanup(void)
+{
+	if (x86_pkg_temp_tz_found)
+		SAFE_FILE_PRINTF(trip_path, "%d", trip);
+
+	free(x86_pkg_temp_tz);
+	free(interrupt_init);
+	free(interrupt_later);
+}
+
+static void run(void)
+{
+	for (int i = 0; i < tz_counter; i++) {
+		if (x86_pkg_temp_tz[i])
+			test_zone(i);
+	}
+	read_interrupts(interrupt_later, nproc);
+
+	for (int i = 0; i < nproc; i++) {
+		if (interrupt_later[i] < interrupt_init[i])
+			tst_res(TFAIL, "CPU %d interrupt counter: %ld (previous: %ld)",
+				i, interrupt_later[i], interrupt_init[i]);
+	}
+
+	if (temp <= temp_high)
+		tst_res(TFAIL, "Zone temperature is not rising as expected");
+	else
+		tst_res(TPASS, "x86 package thermal interrupt triggered");
+}
+
+static struct tst_test test = {
+	.cleanup = cleanup,
Quoted 8 lines

testcases/kernel/thermal/thermal_interrupt_events.c line 211

Quoted 5 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +5 -0
+	.forks_child = 1,
+	.needs_drivers = (const char *const []) {
+		"x86_pkg_temp_thermal",
+		NULL
+	},

nit: Alternatively instead of needs drivers we could check via .needs_kconfigs for CONFIG_X86_THERMAL_VECTOR (functionality wrapped in kernel, defined in drivers/thermal/intel/Kconfig). Cyril WDYT?

Quoted 3 lines

We would need to apply the kconfig patch I've send and then add hook for the CONFIG_X86_THERMAL_VECTOR. I wouldn't wait for that with this patch, we can fix it once our infrastructure is ready.

Ah, I haven't noticed x86_pkg_temp_thermal driver can be disabled in the runtime (otherwise there is always /sys/class/thermal/ when compiled with CONFIG_X86_THERMAL_VECTOR). But sure, let's keep it this way, I also don't want to block this effort.

Quoted 21 lines
Quoted 11 lines

IMHO we slowly convert from modules.{dep,builtin} based search in lib/tst_kernel.c to kconfig related checks (functionality which come to LTP later).

testcases/kernel/thermal/thermal_interrupt_events.c line 212

Quoted 1 line
testcases/kernel/thermal/thermal_interrupt_events.c new file +1 -0
+	.min_runtime = 180,

Test is mostly super quick. I suppose we can lower down this to e.g. 5 because it depends on number of the zones.
But could we define it to 5 here and set in the setup correct value via tst_set_runtime().

Quoted 9 lines

testcases/kernel/thermal/thermal_interrupt_events.c line 219

Quoted 7 lines
testcases/kernel/thermal/thermal_interrupt_events.c new file +7 -0
+	.needs_root = 1,
+	.setup = setup,
+	.supported_archs = (const char *const []) {
+		"x86",
+		"x86_64",
+		NULL
+	},

This is somehow redundant to .needs_drivers/.needs_kconfigs. OTOH it nicely defines which arch is targeted.

Quoted 1 line

That's why I requested it to be added.

I'm sorry, I overlooked you asked for it.

Kind regards,
Petr

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp