| 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: <1328067470-5980-11-git-send-email-fweisbec@gmail.com>
Date: Wed, 1 Feb 2012 04:37:50 +0100
From: Frederic Weisbecker <fweisbec@...il.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
Tejun Heo <tj@...nel.org>, Li Zefan <lizf@...fujitsu.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
Frederic Weisbecker <fweisbec@...il.com>,
"Kirill A. Shutemov" <kirill@...temov.name>,
Paul Menage <paul@...lmenage.org>,
Johannes Weiner <hannes@...xchg.org>,
Aditya Kali <adityakali@...gle.com>,
Oleg Nesterov <oleg@...hat.com>,
Tim Hockin <thockin@...kin.org>,
Containers <containers@...ts.linux-foundation.org>,
Glauber Costa <glommer@...il.com>,
Cgroups <cgroups@...r.kernel.org>,
Daniel J Walsh <dwalsh@...hat.com>,
"Daniel P. Berrange" <berrange@...hat.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
Max Kellermann <mk@...all.com>,
Mandeep Singh Baines <msb@...omium.org>
Subject: [PATCH 10/10] selftests: Add a new task counter selftest
This is a batch of tests running against the cgroup task counter
subsystem in order to validate the expected behaviour from this
cgroup feature.
This checks the reliability of the value found in the tasks.usage file
after events like forks, exits or cgroup migration of whole processes
or individual threads.
This also check that forks or cgroup migration are either accepted or
rejected according to the value set in the tasks.limit file.
A forkbomb is also launched to test if the subsystem stops well its
propagation and kills it properly as expected.
Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>
Cc: Kirill A. Shutemov <kirill@...temov.name>
Cc: Paul Menage <paul@...lmenage.org>
Cc: Li Zefan <lizf@...fujitsu.com>
Cc: Johannes Weiner <hannes@...xchg.org>
Cc: Aditya Kali <adityakali@...gle.com>
Cc: Oleg Nesterov <oleg@...hat.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Tim Hockin <thockin@...kin.org>
Cc: Tejun Heo <tj@...nel.org>
Cc: Containers <containers@...ts.linux-foundation.org>
Cc: Glauber Costa <glommer@...il.com>
Cc: Cgroups <cgroups@...r.kernel.org>
Cc: Daniel J Walsh <dwalsh@...hat.com>
Cc: "Daniel P. Berrange" <berrange@...hat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Cc: Max Kellermann <mk@...all.com>
Cc: Mandeep Singh Baines <msb@...omium.org>
---
tools/testing/selftests/Makefile | 2 +-
tools/testing/selftests/run_tests | 2 +-
tools/testing/selftests/task_counter/Makefile | 8 +
tools/testing/selftests/task_counter/fork.c | 40 ++++
tools/testing/selftests/task_counter/forkbomb.c | 40 ++++
tools/testing/selftests/task_counter/multithread.c | 68 +++++++
tools/testing/selftests/task_counter/run_test | 198 ++++++++++++++++++++
.../selftests/task_counter/spread_thread_group.c | 82 ++++++++
8 files changed, 438 insertions(+), 2 deletions(-)
create mode 100644 tools/testing/selftests/task_counter/Makefile
create mode 100644 tools/testing/selftests/task_counter/fork.c
create mode 100644 tools/testing/selftests/task_counter/forkbomb.c
create mode 100644 tools/testing/selftests/task_counter/multithread.c
create mode 100755 tools/testing/selftests/task_counter/run_test
create mode 100644 tools/testing/selftests/task_counter/spread_thread_group.c
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 4ec8401..c697742 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -1,4 +1,4 @@
-TARGETS = breakpoints
+TARGETS = breakpoints task_counter
all:
for TARGET in $(TARGETS); do \
diff --git a/tools/testing/selftests/run_tests b/tools/testing/selftests/run_tests
index 19043d3..11d76f7 100644
--- a/tools/testing/selftests/run_tests
+++ b/tools/testing/selftests/run_tests
@@ -1,6 +1,6 @@
#!/bin/bash
-TARGETS=breakpoints
+TARGETS="breakpoints task_counter"
for TARGET in $TARGETS
do
diff --git a/tools/testing/selftests/task_counter/Makefile b/tools/testing/selftests/task_counter/Makefile
new file mode 100644
index 0000000..e314ce4
--- /dev/null
+++ b/tools/testing/selftests/task_counter/Makefile
@@ -0,0 +1,8 @@
+all:
+ gcc fork.c -o fork
+ gcc forkbomb.c -o forkbomb
+ gcc multithread.c -o multithread -lpthread
+ gcc spread_thread_group.c -o spread_thread_group -lpthread
+
+clean:
+ rm -f fork forkbomb multithread spread_thread_group *~
diff --git a/tools/testing/selftests/task_counter/fork.c b/tools/testing/selftests/task_counter/fork.c
new file mode 100644
index 0000000..20b48a9
--- /dev/null
+++ b/tools/testing/selftests/task_counter/fork.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 Red Hat, Inc., Frederic Weisbecker <fweisbec@...hat.com>
+ *
+ * Licensed under the terms of the GNU GPL License version 2
+ *
+ * Move a task to a cgroup and try to fork on it.
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+
+int main(int argc, char **argv)
+{
+ FILE *fp;
+ int pid;
+ char cpid[50];
+
+ if (argc < 2)
+ return -1;
+
+ pid = getpid();
+ fp = fopen(argv[1], "w");
+ if (!fp)
+ return -2;
+
+ sprintf(cpid, "%d\n", pid);
+
+ if (fwrite(cpid, strlen(cpid), 1, fp) != 1) {
+ perror("can't write pid\n");
+ return -3;
+ }
+ fclose(fp);
+
+ if (fork() == -1)
+ return 0;
+
+ return -4;
+}
diff --git a/tools/testing/selftests/task_counter/forkbomb.c b/tools/testing/selftests/task_counter/forkbomb.c
new file mode 100644
index 0000000..221fefb
--- /dev/null
+++ b/tools/testing/selftests/task_counter/forkbomb.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 Red Hat, Inc., Frederic Weisbecker <fweisbec@...hat.com>
+ *
+ * Licensed under the terms of the GNU GPL License version 2
+ *
+ * Move a task to a cgroup and forkbomb there.
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+
+int main(int argc, char **argv)
+{
+ FILE *fp;
+ int pid;
+ char cpid[50];
+
+ if (argc < 2)
+ return -1;
+
+ pid = getpid();
+ fp = fopen(argv[1], "w");
+ if (!fp)
+ return -2;
+
+ sprintf(cpid, "%d\n", pid);
+
+ if (fwrite(cpid, strlen(cpid), 1, fp) != 1) {
+ perror("can't write pid\n");
+ return -3;
+ }
+ fclose(fp);
+
+ for (;;)
+ fork();
+
+ return 0;
+}
diff --git a/tools/testing/selftests/task_counter/multithread.c b/tools/testing/selftests/task_counter/multithread.c
new file mode 100644
index 0000000..e566a02
--- /dev/null
+++ b/tools/testing/selftests/task_counter/multithread.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2012 Red Hat, Inc., Frederic Weisbecker <fweisbec@...hat.com>
+ *
+ * Licensed under the terms of the GNU GPL License version 2
+ *
+ * Try to move a multithread proc to a cgroup.
+ */
+
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+volatile static int thread_end;
+pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+
+
+static void *thread_start(void *unused)
+{
+ pthread_mutex_lock(&mutex);
+
+ while (!thread_end)
+ pthread_cond_wait(&cond, &mutex);
+
+ pthread_mutex_unlock(&mutex);
+
+ return NULL;
+}
+
+int main(int argc, char **argv)
+{
+ int fd;
+ int pid;
+ char cpid[50];
+ pthread_t thread;
+
+ if (argc < 2)
+ return -1;
+
+ if (pthread_create(&thread, NULL, thread_start, NULL) != 0)
+ return -2;
+
+ pid = getpid();
+ fd = open(argv[1], O_WRONLY);
+ if (fd < 0)
+ return -3;
+
+ sprintf(cpid, "%d\n", pid);
+
+ if (write(fd, cpid, strlen(cpid)) < 0)
+ return -4;
+
+ close(fd);
+
+ pthread_mutex_lock(&mutex);
+ thread_end = 1;
+ pthread_cond_signal(&cond);
+ pthread_mutex_unlock(&mutex);
+
+ pthread_join(thread, NULL);
+
+ return 0;
+}
diff --git a/tools/testing/selftests/task_counter/run_test b/tools/testing/selftests/task_counter/run_test
new file mode 100755
index 0000000..ee063aa
--- /dev/null
+++ b/tools/testing/selftests/task_counter/run_test
@@ -0,0 +1,198 @@
+#!/bin/bash
+# Copyright (C) 2012 Red Hat, Inc., Frederic Weisbecker <fweisbec@...hat.com>
+#
+# Licensed under the terms of the GNU GPL License version 2
+#
+# Validation tests for the cgroup task counter subsystem
+
+BASE=/dev/cgroup
+
+if [ $UID != 0 ]
+then
+ echo "Must be root to run task counter selftest"
+ exit 0
+fi
+
+if [ -e $BASE ]
+then
+ echo "Directory $BASE already exist"
+ echo "Can't run task counter selftest"
+ exit 0
+fi
+
+mkdir $BASE
+mount -t cgroup -o tasks cgroup $BASE
+if [ $? != 0 ]
+then
+ echo "Unable to mount cgroup filesystem"
+ echo "Can't run task counter selftest."
+ rmdir $BASE
+ exit 0
+fi
+
+sleep 1d &
+PID1=$!
+
+sleep 1d &
+PID2=$!
+
+echo 1 > $BASE/cgroup.clone_children
+mkdir $BASE/cgroup0
+
+function test_result
+{
+ # Result of the test
+ res=$1
+ # Expected result
+ expected=$2
+ # Invert test against expected result
+ # 0 = equal
+ # 1 = non equal
+ inv=$3
+ # String message
+ test_str=$4
+ passed=0
+
+ echo -n $test_str
+
+ if [ $res = $expected ]
+ then
+ passed=1
+ fi
+
+ passed=$[$passed ^ $inv]
+
+ if [ $passed = 1 ]
+ then
+ echo " [OK]"
+ else
+ echo " [FAILED]"
+ fi
+
+}
+
+# simple test limit
+echo 1 > $BASE/cgroup0/tasks.limit
+echo $PID1 > $BASE/cgroup0/cgroup.procs
+test_result $? 0 0 "Allow 1 task on limit 1"
+
+echo $PID2 > $BASE/cgroup0/cgroup.procs
+test_result $? 0 1 "Don't allow 2 tasks on limit 1"
+
+# simple test usage
+USAGE=$(cat $BASE/cgroup0/tasks.usage)
+test_result $USAGE 1 0 "Correct usage "
+
+# simple test exit
+kill $PID1
+USAGE=$(cat $BASE/cgroup0/tasks.usage)
+test_result $USAGE 0 0 "Correct usage after exit "
+
+
+sleep 1d &
+PID1=$!
+
+echo 1 > $BASE/cgroup0/tasks.limit
+echo $PID1 > $BASE/cgroup0/cgroup.procs
+test_result $? 0 0 "Correct reuse after exit "
+
+# simple move to root
+
+echo $PID1 > $BASE/cgroup.procs
+test_result $? 0 0 "Correct move to root "
+
+# propagation tests
+
+mkdir $BASE/cgroup0/cgroup1
+mkdir $BASE/cgroup0/cgroup2
+
+echo 1 > $BASE/cgroup0/cgroup1/tasks.limit
+echo $PID1 > $BASE/cgroup0/cgroup1/cgroup.procs
+USAGE=$(cat $BASE/cgroup0/tasks.usage)
+test_result $USAGE 1 0 "Correct propagated usage "
+
+echo $PID1 > $BASE/cgroup0/cgroup.procs
+test_result $? 0 0 "Correct move on parent "
+
+
+# move
+
+echo $PID1 > $BASE/cgroup0/cgroup1/cgroup.procs
+test_result $? 0 0 "Correct move on child "
+
+echo $PID1 > $BASE/cgroup0/cgroup2/cgroup.procs
+test_result $? 0 0 "Correct move on sibling "
+
+echo $PID2 > $BASE/cgroup0/cgroup1/cgroup.procs
+test_result $? 0 1 "Correct propagation limit "
+
+kill $PID1
+kill $PID2
+
+# test limit on thread group
+echo 1024 > $BASE/cgroup0/tasks.limit
+echo 0 > $BASE/cgroup0/cgroup1/tasks.limit
+
+./multithread $BASE/cgroup0/cgroup1/cgroup.procs
+test_result $? 0 1 "Correct limit on multithreaded"
+
+# test move of a thread group
+echo 2 > $BASE/cgroup0/cgroup1/tasks.limit
+
+./multithread $BASE/cgroup0/cgroup1/cgroup.procs
+test_result $? 0 0 "Correct move of multithreaded"
+
+rmdir $BASE/cgroup0/cgroup1
+rmdir $BASE/cgroup0/cgroup2
+
+# test bug on common ancestor logic
+# as described in https://lkml.org/lkml/2011/11/8/218
+
+./spread_thread_group $BASE/cgroup0/cgroup.procs $BASE/tasks
+test_result $? 0 0 "Test bug on common ancestor logic"
+
+# test fork
+
+echo 1 > $BASE/cgroup0/tasks.limit
+./fork $BASE/cgroup0/cgroup.procs
+test_result $? 0 0 "Correct fork limit "
+
+# test forkbomb
+
+echo 128 > $BASE/cgroup0/tasks.limit
+echo -n "Trying to stop forkbomb propagation..."
+./forkbomb $BASE/cgroup0/cgroup.procs &
+sleep 1
+RES=$(cat $BASE/cgroup0/tasks.usage)
+test_result $RES 128 0 ""
+
+# kill forkbomb
+
+echo -n "Trying to kill forkbomb "
+echo 0 > $BASE/cgroup0/tasks.limit
+END=false
+
+while [ $END = false ]
+do
+ NR_TASKS=$(cat $BASE/cgroup0/tasks.usage)
+ NR_KILLED=0
+
+ for TASK in $(cat $BASE/cgroup0/cgroup.procs)
+ do
+ NR_KILLED=$(($NR_KILLED+1))
+ kill -KILL $TASK
+ done
+
+ if [ "$NR_TASKS" = "$NR_KILLED" ]
+ then
+ END=true
+ fi
+done
+
+echo "[OK]"
+
+# Wait a bit for killed tasks to exit the cgroup
+sleep 1
+rmdir $BASE/cgroup0
+umount $BASE
+rmdir $BASE
\ No newline at end of file
diff --git a/tools/testing/selftests/task_counter/spread_thread_group.c b/tools/testing/selftests/task_counter/spread_thread_group.c
new file mode 100644
index 0000000..e088deb
--- /dev/null
+++ b/tools/testing/selftests/task_counter/spread_thread_group.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2012 Red Hat, Inc., Frederic Weisbecker <fweisbec@...hat.com>
+ *
+ * Licensed under the terms of the GNU GPL License version 2
+ *
+ * Try to reproduce bug on common ancestor logic as described
+ * at https://lkml.org/lkml/2011/11/8/218
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+volatile static int thread_end;
+pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+
+
+static void *thread_start(void *unused)
+{
+ pthread_mutex_lock(&mutex);
+
+ while (!thread_end)
+ pthread_cond_wait(&cond, &mutex);
+
+ pthread_mutex_unlock(&mutex);
+
+ return NULL;
+}
+
+int main(int argc, char **argv)
+{
+ int fd_root, fd;
+ int pid;
+ char cpid[50];
+ pthread_t thread;
+
+ if (argc < 3)
+ return -1;
+
+ if (pthread_create(&thread, NULL, thread_start, NULL) != 0)
+ return -2;
+
+ pid = getpid();
+ fd = open(argv[1], O_WRONLY);
+ if (fd < 0)
+ return -3;
+
+ sprintf(cpid, "%d\n", pid);
+
+ /* Move group to /dev/cgroup/cgroup0 */
+ if (write(fd, cpid, strlen(cpid)) < 0)
+ return -4;
+
+ fd_root = open(argv[2], O_WRONLY);
+ if (fd < 0)
+ return -5;
+
+ /* Move group leader to /dev/cgroup/ root */
+ if (write(fd_root, cpid, strlen(cpid)) < 0)
+ return -6;
+
+ /* Move back group to /dev/cgroup/cgroup0 */
+ if (write(fd, cpid, strlen(cpid)) < 0)
+ return -7;
+
+ close(fd_root);
+ close(fd);
+
+ pthread_mutex_lock(&mutex);
+ thread_end = 1;
+ pthread_cond_signal(&cond);
+ pthread_mutex_unlock(&mutex);
+
+ pthread_join(thread, NULL);
+
+ return 0;
+}
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists