Skip to contentSkip to conversation

sched_setattr/sched_setattr01: Add new testcase for sched_setattr

PATCH Superseded Cui Bixuan 2 participants 5 messages Nov 6, 2015 – Dec 2, 2015

lore
Share & tools
lore

Cui Bixuan

author
#0 lore raw

PATCH 1/1 sched_setattr/sched_setattr01: Add new testcase for sched_setattr

Add new testcase for sched_setattr

---
 runtest/sched                                      |    1 +
 runtest/syscalls                                   |    1 +
 testcases/kernel/syscalls/.gitignore               |    1 +
 testcases/kernel/syscalls/sched_setattr/Makefile   |   25 ++++
 .../syscalls/sched_setattr/sched_setattr01.c       |  137 ++++++++++++++++++++
 5 files changed, 165 insertions(+), 0 deletions(-)
 create mode 100644 testcases/kernel/syscalls/sched_setattr/Makefile
 create mode 100644 testcases/kernel/syscalls/sched_setattr/sched_setattr01.c
runtest/sched +1 -0
index 4b8a1df..89398df 100644
@@ -9,6 +9,7 @@ trace_sched01		trace_sched -c 1
 hackbench01 hackbench 50 process 1000
 hackbench02 hackbench 20 thread 1000
 
+sched_setattr01 sched_setattr01
 sched_getattr01 sched_getattr01
 sched_getattr02 sched_getattr02
 
runtest/syscalls +1 -0
index 724ab66..469baee 100644
@@ -922,6 +922,7 @@ sched_yield01 sched_yield01
 sched_setaffinity01 sched_setaffinity01
 sched_getaffinity01 sched_getaffinity01
 
+sched_setattr01 sched_setattr01
 sched_getattr01 sched_getattr01
 sched_getattr02 sched_getattr02
 
testcases/kernel/syscalls/.gitignore +1 -0
index aba112b..c53f0d4 100644
@@ -752,6 +752,7 @@
 /sched_rr_get_interval/sched_rr_get_interval02
 /sched_rr_get_interval/sched_rr_get_interval03
 /sched_setaffinity/sched_setaffinity01
+/sched_setattr/sched_setattr01
 /sched_setparam/sched_setparam01
 /sched_setparam/sched_setparam02
 /sched_setparam/sched_setparam03
testcases/kernel/syscalls/sched_setattr/Makefile new file +25 -0
new file mode 100644
index 0000000..0ad382e
@@ -0,0 +1,25 @@
+#
+#  Copyright (c) International Business Machines  Corp., 2008
+#
+#  This program is free software;  you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY;  without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+CFLAGS			+= -pthread
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +137 -0

137 lines not on this page · raw message

Signature · 1 line
1.6.0.2
#1 lore raw

PATCH 1/1 sched_setattr/sched_setattr01: Add new testcase for sched_setattr

Hi!

testcases/kernel/syscalls/sched_setattr/sched_setattr01.c line 36

Quoted 2 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +2 -0
+#include "test.h"
+#include "linux_syscall_numbers.h"

This header is included from lapi/sched.h, isn't it?

So there is no need to include it here as well.

Quoted 22 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +22 -0
+#include "lapi/sched.h"
+
+char *TCID = "sched_setattr01";
+
+#define SCHED_DEADLINE	6
+#define RUNTIME_VAL 10000000
+#define PERIOD_VAL 30000000
+#define DEADLINE_VAL 30000000
+
+static pid_t pid;
+static pid_t unused_pid;
+struct sched_attr attr;
+
+static struct test_case {
+	pid_t *pid;
+	struct sched_attr *a;
+	unsigned int flags;
+	int exp_return;
+	int exp_errno;
+} test_cases[] = {
+	{&pid, &attr, 0, 0, 0},
+	{&unused_pid, &attr, 0, -1, ESRCH},

testcases/kernel/syscalls/sched_setattr/sched_setattr01.c line 68

Quoted 10 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +10 -0
+	{&pid, NULL, 0, -1, EINVAL},
+	{&pid, &attr, 1000, -1, EINVAL}
+};
+
+static void setup(void);
+static void sched_setattr_verify(const struct test_case *test);
+
+int TST_TOTAL = ARRAY_SIZE(test_cases);
+
+void *run_deadline(void *data LTP_ATTRIBUTE_UNUSED)

The function should rather be named "do_test()" or similar.

testcases/kernel/syscalls/sched_setattr/sched_setattr01.c line 80

Quoted 12 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +12 -0
+{
+	int i;
+
+	attr.size = sizeof(attr);
+	attr.sched_flags = 0;
+	attr.sched_nice = 0;
+	attr.sched_priority = 0;
+
+	attr.sched_policy = SCHED_DEADLINE;
+	attr.sched_runtime = RUNTIME_VAL;
+	attr.sched_period = PERIOD_VAL;
+	attr.sched_deadline = DEADLINE_VAL;

Well, we can initialize this structure statically as well just by:

static struct sched_attr attr = {
	.size = sizeof(attr),
	.sched_flags = 0,
	...
};

testcases/kernel/syscalls/sched_setattr/sched_setattr01.c line 90

Quoted 9 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +9 -0
+	for (i = 0; i < TST_TOTAL; i++)
+		sched_setattr_verify(&test_cases[i]);
+
+	return NULL;
+}
+
+static void sched_setattr_verify(const struct test_case *test)
+{
+	errno = 0;

No need to zero errno, the TEST() macro does that for you.

testcases/kernel/syscalls/sched_setattr/sched_setattr01.c line 95

Quoted 4 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +4 -0
+	TEST(sched_setattr(*(test->pid), test->a, test->flags));
+
+	if (TEST_RETURN != test->exp_return) {
+		tst_resm(TFAIL, "sched_getattr() return unexpectedly.");

Please print the actual return value and expected return value here.

It may be good to actually distinguish between expected failure and expected success. Then we wouldn't have to print the expected return value and just print TFAIL, "succeded unexpectedly" or TFAIL | TTERRNO, "failed with %li unexpectedly", TEST_RETURN.

testcases/kernel/syscalls/sched_setattr/sched_setattr01.c line 101

Quoted 6 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +6 -0
+		return;
+	}
+
+	if (TEST_ERRNO == test->exp_errno) {
+		tst_resm(TPASS | TTERRNO,
+			"sched_setattr() return expectedly");

^
maybe "works as expected" is a bit better

Quoted 36 lines
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +36 -0
+		return;
+	}
+
+	tst_resm(TFAIL | TTERRNO, "sched_getattr() return unexpectedly "
+		": expected: %d - %s",
+		test->exp_errno, tst_strerrno(test->exp_errno));
+}
+
+int main(int argc, char **argv)
+{
+	pthread_t thread;
+	int lc;
+
+	tst_parse_opts(argc, argv, NULL, NULL);
+
+	setup();
+
+	for (lc = 0; TEST_LOOPING(lc); lc++) {
+		pthread_create(&thread, NULL, run_deadline, NULL);
+		pthread_join(thread, NULL);
+	}
+
+	tst_exit();
+}
+
+void setup(void)
+{
+	unused_pid = tst_get_unused_pid(setup);
+
+	tst_require_root();
+
+	if ((tst_kvercmp(3, 14, 0)) < 0)
+		tst_brkm(TCONF, NULL, "EDF needs kernel 3.14 or higher");
+
+	TEST_PAUSE;
+}
Signature · 2 lines
Cyril Hrubis
[email protected]
author
#2 lore raw

PATCH v2 1/1 sched_setattr/sched_setattr01: Add new testcase for sched_setattr

Add new testcase for sched_setattr

---
V2:
* Delete #include "linux_syscall_numbers.h";
* Change run_deadline() to do_test();
* Initialize structure attr at the beginning in sched_setattr01.c;
* Delete 'errno = 0' in sched_setattr_verify();
* Change some print message

 runtest/sched                                      |    1 +
 runtest/syscalls                                   |    1 +
 testcases/kernel/syscalls/.gitignore               |    1 +
 testcases/kernel/syscalls/sched_setattr/Makefile   |   25 ++++
 .../syscalls/sched_setattr/sched_setattr01.c       |  136 ++++++++++++++++++++
 5 files changed, 164 insertions(+), 0 deletions(-)
 create mode 100644 testcases/kernel/syscalls/sched_setattr/Makefile
 create mode 100644 testcases/kernel/syscalls/sched_setattr/sched_setattr01.c
runtest/sched +1 -0
index 4b8a1df..89398df 100644
@@ -9,6 +9,7 @@ trace_sched01		trace_sched -c 1
 hackbench01 hackbench 50 process 1000
 hackbench02 hackbench 20 thread 1000
 
+sched_setattr01 sched_setattr01
 sched_getattr01 sched_getattr01
 sched_getattr02 sched_getattr02
 
runtest/syscalls +1 -0
index 724ab66..469baee 100644
@@ -922,6 +922,7 @@ sched_yield01 sched_yield01
 sched_setaffinity01 sched_setaffinity01
 sched_getaffinity01 sched_getaffinity01
 
+sched_setattr01 sched_setattr01
 sched_getattr01 sched_getattr01
 sched_getattr02 sched_getattr02
 
testcases/kernel/syscalls/.gitignore +1 -0
index aba112b..c53f0d4 100644
@@ -752,6 +752,7 @@
 /sched_rr_get_interval/sched_rr_get_interval02
 /sched_rr_get_interval/sched_rr_get_interval03
 /sched_setaffinity/sched_setaffinity01
+/sched_setattr/sched_setattr01
 /sched_setparam/sched_setparam01
 /sched_setparam/sched_setparam02
 /sched_setparam/sched_setparam03
testcases/kernel/syscalls/sched_setattr/Makefile new file +25 -0
new file mode 100644
index 0000000..30718a9
@@ -0,0 +1,25 @@
+#
+#  Copyright (c) Huawei Technologies Co., Ltd., 2015
+#
+#  This program is free software;  you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY;  without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+CFLAGS			+= -pthread
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +136 -0

136 lines not on this page · raw message

Signature · 1 line
1.6.0.2 .
author
#3 lore raw

PATCH v2 1/1 sched_setattr/sched_setattr01: Add new testcase for sched_setattr

ping~~

Quoted 230 lines · Cui Bixuan

Add new testcase for sched_setattr

---
V2:
* Delete #include "linux_syscall_numbers.h";
* Change run_deadline() to do_test();
* Initialize structure attr at the beginning in sched_setattr01.c;
* Delete 'errno = 0' in sched_setattr_verify();
* Change some print message

 runtest/sched                                      |    1 +
 runtest/syscalls                                   |    1 +
 testcases/kernel/syscalls/.gitignore               |    1 +
 testcases/kernel/syscalls/sched_setattr/Makefile   |   25 ++++
 .../syscalls/sched_setattr/sched_setattr01.c       |  136 ++++++++++++++++++++
 5 files changed, 164 insertions(+), 0 deletions(-)
 create mode 100644 testcases/kernel/syscalls/sched_setattr/Makefile
 create mode 100644 testcases/kernel/syscalls/sched_setattr/sched_setattr01.c
runtest/sched +1 -0
index 4b8a1df..89398df 100644
@@ -9,6 +9,7 @@ trace_sched01		trace_sched -c 1
 hackbench01 hackbench 50 process 1000
 hackbench02 hackbench 20 thread 1000
 
+sched_setattr01 sched_setattr01
 sched_getattr01 sched_getattr01
 sched_getattr02 sched_getattr02
 
runtest/syscalls +1 -0
index 724ab66..469baee 100644
@@ -922,6 +922,7 @@ sched_yield01 sched_yield01
 sched_setaffinity01 sched_setaffinity01
 sched_getaffinity01 sched_getaffinity01
 
+sched_setattr01 sched_setattr01
 sched_getattr01 sched_getattr01
 sched_getattr02 sched_getattr02
 
testcases/kernel/syscalls/.gitignore +1 -0
index aba112b..c53f0d4 100644
@@ -752,6 +752,7 @@
 /sched_rr_get_interval/sched_rr_get_interval02
 /sched_rr_get_interval/sched_rr_get_interval03
 /sched_setaffinity/sched_setaffinity01
+/sched_setattr/sched_setattr01
 /sched_setparam/sched_setparam01
 /sched_setparam/sched_setparam02
 /sched_setparam/sched_setparam03
testcases/kernel/syscalls/sched_setattr/Makefile new file +25 -0
new file mode 100644
index 0000000..30718a9
@@ -0,0 +1,25 @@
+#
+#  Copyright (c) Huawei Technologies Co., Ltd., 2015
+#
+#  This program is free software;  you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY;  without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+CFLAGS			+= -pthread
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/sched_setattr/sched_setattr01.c new file +136 -0
new file mode 100644
index 0000000..63cf890
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd., 2015
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+ * the GNU General Public License for more details.
+ */
+ /* Description:
+ *   Verify that:
+ *              1) sched_setattr succeed with correct parameters
+ *              2) sched_setattr fails with unused pid
+ *              3) sched_setattr fails with invalid address
+ *              4) sched_setattr fails with invalid flag
+ */
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <linux/unistd.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <sys/syscall.h>
+#include <pthread.h>
+#include <sched.h>
+#include <errno.h>
+
+#include "test.h"
+#include "lapi/sched.h"
+
+char *TCID = "sched_setattr01";
+
+#define SCHED_DEADLINE	6
+#define RUNTIME_VAL 10000000
+#define PERIOD_VAL 30000000
+#define DEADLINE_VAL 30000000
+
+static pid_t pid;
+static pid_t unused_pid;
+
+static struct sched_attr attr = {
+	.size = sizeof(struct sched_attr),
+	.sched_flags = 0,
+	.sched_nice = 0,
+	.sched_priority = 0,
+
+	.sched_policy = SCHED_DEADLINE,
+	.sched_runtime = RUNTIME_VAL,
+	.sched_period = PERIOD_VAL,
+	.sched_deadline = DEADLINE_VAL,
+};
+
+static struct test_case {
+	pid_t *pid;
+	struct sched_attr *a;
+	unsigned int flags;
+	int exp_return;
+	int exp_errno;
+} test_cases[] = {
+	{&pid, &attr, 0, 0, 0},
+	{&unused_pid, &attr, 0, -1, ESRCH},
+	{&pid, NULL, 0, -1, EINVAL},
+	{&pid, &attr, 1000, -1, EINVAL}
+};
+
+static void setup(void);
+static void sched_setattr_verify(const struct test_case *test);
+
+int TST_TOTAL = ARRAY_SIZE(test_cases);
+
+void *do_test(void *data LTP_ATTRIBUTE_UNUSED)
+{
+	int i;
+
+	for (i = 0; i < TST_TOTAL; i++)
+		sched_setattr_verify(&test_cases[i]);
+
+	return NULL;
+}
+
+static void sched_setattr_verify(const struct test_case *test)
+{
+	TEST(sched_setattr(*(test->pid), test->a, test->flags));
+
+	if (TEST_RETURN != test->exp_return) {
+		tst_resm(TFAIL | TTERRNO, "sched_setattr() return "
+			"unexpectedly: expected: %d", test->exp_return);
+		return;
+	}
+
+	if (TEST_ERRNO == test->exp_errno) {
+		tst_resm(TPASS | TTERRNO,
+			"sched_setattr() works as expected");
+		return;
+	}
+
+	tst_resm(TFAIL | TTERRNO, "sched_setattr() return unexpectedly "
+		": expected: %d - %s",
+		test->exp_errno, tst_strerrno(test->exp_errno));
+}
+
+int main(int argc, char **argv)
+{
+	pthread_t thread;
+	int lc;
+
+	tst_parse_opts(argc, argv, NULL, NULL);
+
+	setup();
+
+	for (lc = 0; TEST_LOOPING(lc); lc++) {
+		pthread_create(&thread, NULL, do_test, NULL);
+		pthread_join(thread, NULL);
+	}
+
+	tst_exit();
+}
+
+void setup(void)
+{
+	unused_pid = tst_get_unused_pid(setup);
+
+	tst_require_root();
+
+	if ((tst_kvercmp(3, 14, 0)) < 0)
+		tst_brkm(TCONF, NULL, "EDF needs kernel 3.14 or higher");
+
+	TEST_PAUSE;
+}
#4 lore raw

PATCH v2 1/1 sched_setattr/sched_setattr01: Add new testcase for sched_setattr

In reply to Cui Bixuan

Hi!
Pushed with following changes:
(To make the error reports more verbose)

@@ -90,8 +90,10 @@ static void sched_setattr_verify(const struct test_case *test)

        TEST(sched_setattr(*(test->pid), test->a, test->flags));
 
        if (TEST_RETURN != test->exp_return) {
-               tst_resm(TFAIL | TTERRNO, "sched_setattr() return "
-                       "unexpectedly: expected: %d", test->exp_return);
+               tst_resm(TFAIL | TTERRNO, "sched_setattr(%i,attr,%u) "
+                        "returned: %ld expected: %d",
+                        *(test->pid), test->flags,
+                        TEST_RETURN, test->exp_return);
                return;
        }

@@ -101,8 +103,9 @@ static void sched_setattr_verify(const struct test_case *test)

                return;
        }

- tst_resm(TFAIL | TTERRNO, "sched_setattr() return unexpectedly "
- ": expected: %d - %s",
+ tst_resm(TFAIL | TTERRNO, "sched_setattr(%i,attr,%u): "
+ "expected: %d - %s",
+ *(test->pid), test->flags,

                test->exp_errno, tst_strerrno(test->exp_errno));

}

Thanks. And sorry for the delay.

Signature · 2 lines
Cyril Hrubis
[email protected]