| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220419213244.2104972-3-void@manifault.com>
Date: Tue, 19 Apr 2022 14:32:43 -0700
From: David Vernet <void@...ifault.com>
To: tj@...nel.org, lizefan.x@...edance.com, hannes@...xchg.org,
cgroups@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: kernel-team@...com
Subject: [PATCH 2/4] cgroup: Add test_cgcpu_stats() testcase to cgroup cpu selftests
test_cpu.c includes testcases that validate the cgroup cpu controller.
This patch adds a new testcase called test_cgcpu_stats() that verifies the
expected behavior of the cpu.stat interface. In doing so, we define a
new hog_cpus_timed() function which takes a cpu_hog_func_param struct
that configures how many CPUs it uses, and how long it runs. Future
patches will also spawn threads that hog CPUs, so this function will
eventually serve those use-cases as well.
Signed-off-by: David Vernet <void@...ifault.com>
---
tools/testing/selftests/cgroup/cgroup_util.h | 3 +
tools/testing/selftests/cgroup/test_cpu.c | 105 +++++++++++++++++++
2 files changed, 108 insertions(+)
diff --git a/tools/testing/selftests/cgroup/cgroup_util.h b/tools/testing/selftests/cgroup/cgroup_util.h
index 4f66d10626d2..1df13dc8b8aa 100644
--- a/tools/testing/selftests/cgroup/cgroup_util.h
+++ b/tools/testing/selftests/cgroup/cgroup_util.h
@@ -8,6 +8,9 @@
#define MB(x) (x << 20)
+#define USEC_PER_SEC 1000000L
+#define NSEC_PER_SEC 1000000000L
+
/*
* Checks if two given values differ by less than err% of their sum.
*/
diff --git a/tools/testing/selftests/cgroup/test_cpu.c b/tools/testing/selftests/cgroup/test_cpu.c
index 4faa279bbab3..57f6308b1ef4 100644
--- a/tools/testing/selftests/cgroup/test_cpu.c
+++ b/tools/testing/selftests/cgroup/test_cpu.c
@@ -2,11 +2,19 @@
#define _GNU_SOURCE
#include <linux/limits.h>
+#include <errno.h>
+#include <pthread.h>
#include <stdio.h>
+#include <time.h>
#include "../kselftest.h"
#include "cgroup_util.h"
+struct cpu_hog_func_param {
+ int nprocs;
+ long runtime_nsec;
+};
+
/*
* This test creates two nested cgroups with and without enabling
* the cpu controller.
@@ -70,12 +78,109 @@ static int test_cgcpu_subtree_control(const char *root)
return ret;
}
+static void *hog_cpu_thread_func(void *arg)
+{
+ while (1)
+ ;
+
+ return NULL;
+}
+
+static int hog_cpus_timed(const char *cgroup, void *arg)
+{
+ const struct cpu_hog_func_param *param =
+ (struct cpu_hog_func_param *)arg;
+ long nsecs_remaining = param->runtime_nsec;
+ int i, ret;
+
+ for (i = 0; i < param->nprocs; i++) {
+ pthread_t tid;
+
+ ret = pthread_create(&tid, NULL, &hog_cpu_thread_func, NULL);
+ if (ret != 0)
+ return ret;
+ }
+
+ while (nsecs_remaining > 0) {
+ long nsecs_so_far;
+ struct timespec ts = {
+ .tv_sec = nsecs_remaining / NSEC_PER_SEC,
+ .tv_nsec = nsecs_remaining % NSEC_PER_SEC,
+ };
+
+ ret = nanosleep(&ts, NULL);
+ if (ret && errno != EINTR)
+ return ret;
+
+ ret = clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts);
+ if (ret != 0)
+ return ret;
+
+ nsecs_so_far = ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec;
+ nsecs_remaining = nsecs_so_far > param->runtime_nsec
+ ? 0
+ : param->runtime_nsec - nsecs_so_far;
+ }
+
+ return 0;
+}
+
+/*
+ * Creates a cpu cgroup, burns a CPU for a few quanta, and verifies that
+ * cpu.stats shows the expected output.
+ */
+static int test_cgcpu_stats(const char *root)
+{
+ int ret = KSFT_FAIL;
+ long usage_usec, user_usec, system_usec;
+ long usage_seconds = 2;
+ long expected_usage_usec = usage_seconds * USEC_PER_SEC;
+ char *cgcpu;
+
+ cgcpu = cg_name(root, "cgcpu_test");
+ if (!cgcpu)
+ goto cleanup;
+
+ if (cg_create(cgcpu))
+ goto cleanup;
+
+ usage_usec = cg_read_key_long(cgcpu, "cpu.stat", "usage_usec");
+ user_usec = cg_read_key_long(cgcpu, "cpu.stat", "user_usec");
+ system_usec = cg_read_key_long(cgcpu, "cpu.stat", "system_usec");
+ if (usage_usec != 0 || user_usec != 0 || system_usec != 0)
+ goto cleanup;
+
+ struct cpu_hog_func_param param = {
+ .nprocs = 1,
+ .runtime_nsec = usage_seconds * NSEC_PER_SEC,
+ };
+ if (cg_run(cgcpu, hog_cpus_timed, (void *)¶m))
+ goto cleanup;
+
+ usage_usec = cg_read_key_long(cgcpu, "cpu.stat", "usage_usec");
+ user_usec = cg_read_key_long(cgcpu, "cpu.stat", "user_usec");
+ if (user_usec <= 0)
+ goto cleanup;
+
+ if (!values_close(usage_usec, expected_usage_usec, 1))
+ goto cleanup;
+
+ ret = KSFT_PASS;
+
+cleanup:
+ cg_destroy(cgcpu);
+ free(cgcpu);
+
+ return ret;
+}
+
#define T(x) { x, #x }
struct cgcpu_test {
int (*fn)(const char *root);
const char *name;
} tests[] = {
T(test_cgcpu_subtree_control),
+ T(test_cgcpu_stats),
};
#undef T
--
2.30.2
Powered by blists - more mailing lists