syscalls/ioprio: Add test cases for I/O priority
PATCH v2 1/1 syscalls/ioprio: Add test cases for I/O priority
The ioprio_get/ioprio_set syscalls are used primarily by the userspace tool "ionice" to set priority of a process, user or process group toward the I/O (block layer) scheduler.
This adds a simple iprio_get test and two more verbose tests for ioprio_set.
---
ChangeLog v1->v2:
- Use the new test fixture "tst_test.h"
- Fix up legalese in the Makefile to a simple SPDX tag.
- Test from v2.6.13 when the syscall was introduced
--- testcases/kernel/syscalls/ioprio/.gitignore | 3 + testcases/kernel/syscalls/ioprio/Makefile | 6 + testcases/kernel/syscalls/ioprio/ioprio.h | 44 ++++++ .../kernel/syscalls/ioprio/ioprio_get01.c | 48 ++++++ .../kernel/syscalls/ioprio/ioprio_set01.c | 98 ++++++++++++ .../kernel/syscalls/ioprio/ioprio_set02.c | 142 ++++++++++++++++++ 6 files changed, 341 insertions(+) create mode 100644 testcases/kernel/syscalls/ioprio/.gitignore create mode 100644 testcases/kernel/syscalls/ioprio/Makefile create mode 100644 testcases/kernel/syscalls/ioprio/ioprio.h create mode 100644 testcases/kernel/syscalls/ioprio/ioprio_get01.c create mode 100644 testcases/kernel/syscalls/ioprio/ioprio_set01.c create mode 100644 testcases/kernel/syscalls/ioprio/ioprio_set02.c
testcases/kernel/syscalls/ioprio/.gitignore new file +3 -0
@@ -0,0 +1,3 @@ +ioprio_get01 +ioprio_set01 +ioprio_set02
testcases/kernel/syscalls/ioprio/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ioprio/ioprio.h new file +44 -0
44 lines not on this page · raw message
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +48 -0
48 lines not on this page · raw message
testcases/kernel/syscalls/ioprio/ioprio_set01.c new file +98 -0
98 lines not on this page · raw message
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +142 -0
142 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 1/1 syscalls/ioprio: Add test cases for I/O priority
Hi!
Quoted 6 lines
The ioprio_get/ioprio_set syscalls are used primarily by the userspace tool "ionice" to set priority of a process, user or process group toward the I/O (block layer) scheduler.
This adds a simple
iprio_gettest and two more verbose tests forioprio_set.
Generally looks fine, some comments below.
Quoted 8 lines
Cc Anders Roxell <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
ChangeLogv1->v2:
- Use the new test fixture "tst_test.h"
- Fix up legalese in theMakefileto a simple SPDX tag.
- Test from v2.6.13 when the syscall was introduced
Quoted 14 lines
--- testcases/kernel/syscalls/ioprio/.gitignore | 3 + testcases/kernel/syscalls/ioprio/Makefile | 6 + testcases/kernel/syscalls/ioprio/ioprio.h | 44 ++++++ .../kernel/syscalls/ioprio/ioprio_get01.c | 48 ++++++ .../kernel/syscalls/ioprio/ioprio_set01.c | 98 ++++++++++++ .../kernel/syscalls/ioprio/ioprio_set02.c | 142 ++++++++++++++++++ 6 files changed, 341 insertions(+) create mode 100644 testcases/kernel/syscalls/ioprio/.gitignore create mode 100644 testcases/kernel/syscalls/ioprio/Makefile create mode 100644 testcases/kernel/syscalls/ioprio/ioprio.h create mode 100644 testcases/kernel/syscalls/ioprio/ioprio_get01.c create mode 100644 testcases/kernel/syscalls/ioprio/ioprio_set01.c create mode 100644 testcases/kernel/syscalls/ioprio/ioprio_set02.c
You are missing runtest entries here, see runtest/syscalls
Quoted 77 lines
testcases/kernel/syscalls/ioprio/.gitignore new file +3
-0@@ -0,0 +1,3 @@ +ioprio_get01 +ioprio_set01 +ioprio_set02testcases/kernel/syscalls/ioprio/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk +include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/kernel/syscalls/ioprio/ioprio.h new file +44
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linus Walleij <[email protected]> +*/ + +#ifndef LTP_IOPRIO_H +#define LTP_IOPRIO_H + +enum { +IOPRIO_CLASS_NONE =0 , +IOPRIO_CLASS_RT , +IOPRIO_CLASS_BE , +IOPRIO_CLASS_IDLE , +}; + +enum { +IOPRIO_WHO_PROCESS =1 , +IOPRIO_WHO_PGRP , +IOPRIO_WHO_USER , +}; + +#define IOPRIO_CLASS_SHIFT (13) +#define IOPRIO_PRIO_MASK ((1UL << IOPRIO_CLASS_SHIFT) - 1) + +#define IOPRIO_PRIO_CLASS (data) ((data) >> IOPRIO_CLASS_SHIFT) +#define IOPRIO_PRIO_LEVEL (data) ((data) & IOPRIO_PRIO_MASK) +#define IOPRIO_PRIO_VALUE (class, data) (((class) << IOPRIO_CLASS_SHIFT) | data) + +static const char *to_class_str[] = { + [IOPRIO_CLASS_NONE ] ="NONE" , + [IOPRIO_CLASS_RT ] ="REALTIME" , + [IOPRIO_CLASS_BE ] ="BEST-EFFORT" , + [IOPRIO_CLASS_IDLE ] ="IDLE" +}; + +/* Priority range from 0 (highest) to 7 (lowest) */ +static inline int prio_in_range (int prio) +{ +if ((prio <0 ) || (prio >7 )) +return 0 ; +return 1 ; +} + +#endif testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +0
-0
testcases/kernel/syscalls/ioprio/ioprio_get01.c line 4
Quoted 4 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +4
-0@@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linaro Limited +*/
We usually write a short comment paragraph about the test purpose here.
Given that this test is very basic it should be something as:
/*
* Basic ioprio_get() test. Gets the current process I/O priority and
* checks that the values are sane.
*/
Quoted 5 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +5
-0+#include <sys/types.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <signal.h>
testcases/kernel/syscalls/ioprio/ioprio_get01.c line 19
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +10
-0+#include <unistd.h> +#include <sys/syscall.h> + +#include "tst_test.h" +#include "ioprio.h" + +static int ioprio_get (int which,int who) +{ +return syscall (SYS_ioprio_get, which, who); +}
These wrappers should go to the ioprio.h header so that we don't have to repeat then in each test.
Quoted 9 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +9
-0+static void run (void ) +{ +int prio, class; + +/* Get the I/O priority for the current process */ +TEST (ioprio_get (IOPRIO_WHO_PROCESS ,0 )); + +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"ioprio_get failed" );
testcases/kernel/syscalls/ioprio/ioprio_get01.c line 39
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +10
-0+return ; + } + + class =IOPRIO_PRIO_CLASS (TST_RET ); + prio =IOPRIO_PRIO_LEVEL (TST_RET ); + +if (!prio_in_range (prio)) { +tst_res (TFAIL ,"ioprio out of range (%d)" , prio); +return ; + }
Shouldn't we check that the class is valid as well here?
If we got garbage in the result we still have more than half of the bits in the integer that will overflow the to_class_str array below.
Quoted 14 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +8
-0+tst_res (TPASS ,"ioprio_get returned class %s prio %d" , + to_class_str[class], prio); +} + +static struct tst_test test = { + .test_all = run, + .min_kver ="2.6.13" , +};testcases/kernel/syscalls/ioprio/ioprio_set01.c new file +0
-0
testcases/kernel/syscalls/ioprio/ioprio_set01.c line 4
Quoted 4 lines
testcases/kernel/syscalls/ioprio/ioprio_set01.c new file +4
-0@@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linus Walleij <[email protected]> +*/
Here as well, comment please.
Quoted 62 lines
testcases/kernel/syscalls/ioprio/ioprio_set01.c new file +62
-0+#include <sys/types.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <signal.h> +#include <unistd.h> +#include <sys/syscall.h> + +#include "tst_test.h" +#include "ioprio.h" + +static int ioprio_get (int which,int who) +{ +return syscall (SYS_ioprio_get, which, who); +} + +static int ioprio_set (int which,int who,int ioprio) +{ +return syscall (SYS_ioprio_set, which, who, ioprio); +} + +static void ioprio_check_setting (int class,int prio) +{ +int res; +int newclass, newprio; + + res =ioprio_get (IOPRIO_WHO_PROCESS ,0 ); +if (res ==-1 ) { +tst_res (TFAIL |TTERRNO , +"reading back prio failed" ); +return ; + } + + newclass =IOPRIO_PRIO_CLASS (res); + newprio =IOPRIO_PRIO_LEVEL (res); +if (newclass != class) +tst_res (TFAIL , +"wrong class after setting, expected %s got %s" , + to_class_str[class], + to_class_str[newclass]); +else if (newprio != prio) +tst_res (TFAIL , +"wrong prio after setting, expected %d got %d" , + prio, newprio); +else +tst_res (TPASS ,"ioprio_set new class %s, new prio %d" , + to_class_str[newclass], + newprio); +} + +static void run (void ) +{ +int class, prio; + +/* Get the I/O priority for the current process */ +TEST (ioprio_get (IOPRIO_WHO_PROCESS ,0 )); + +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"ioprio_get failed" ); +/* Try to continue anyway */ + class =IOPRIO_CLASS_NONE ; + prio =4 ;
testcases/kernel/syscalls/ioprio/ioprio_set01.c line 76
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_set01.c new file +10
-0+ }else { + class =IOPRIO_PRIO_CLASS (TST_RET ); + prio =IOPRIO_PRIO_LEVEL (TST_RET ); +tst_res (TPASS ,"ioprio_get returned class %s prio %d" , + to_class_str[class], prio); + } + +/* Bump prio to what it was + 1 */ + class =IOPRIO_CLASS_BE ; + prio++;
Looking into a documentation the default io_nice for IOPRIO_CLASS_BE is (cpu_nice + 20)/5 so the default is 4 and +1 and -1 is safe operation on default settings. But I guess that a call to prio_in_range(prio+1) to check the value wouldn't harm.
testcases/kernel/syscalls/ioprio/ioprio_set01.c line 86
Quoted 9 lines
testcases/kernel/syscalls/ioprio/ioprio_set01.c new file +9
-0+TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class, prio))); +if (TST_RET ==-1 ) +tst_res (TFAIL |TTERRNO ,"ioprio_set failed" ); +else +ioprio_check_setting (class, prio); + +/* Bump prio down two notches */ + prio -=2 ;
Here as well.
Quoted 18 lines
testcases/kernel/syscalls/ioprio/ioprio_set01.c new file +12
-0+TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class, prio))); +if (TST_RET ==-1 ) +tst_res (TFAIL |TTERRNO ,"ioprio_set failed" ); +else +ioprio_check_setting (class, prio); +} + +static struct tst_test test = { + .test_all = run, + .min_kver ="2.6.13" , +};testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +0
-0
testcases/kernel/syscalls/ioprio/ioprio_set02.c line 4
Quoted 4 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +4
-0@@ -0,0 +1,142 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linus Walleij <[email protected]> +*/
Here as well, comment please.
Quoted 39 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +39
-0+#include <sys/types.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <signal.h> +#include <unistd.h> +#include <sys/syscall.h> + +#include "tst_test.h" +#include "ioprio.h" + +static int ioprio_get (int which,int who) +{ +return syscall (SYS_ioprio_get, which, who); +} + +static int ioprio_set (int which,int who,int ioprio) +{ +return syscall (SYS_ioprio_set, which, who, ioprio); +} + +static void ioprio_check_setting (int class,int prio,int report) +{ +int res; +int newclass, newprio; + + res =ioprio_get (IOPRIO_WHO_PROCESS ,0 ); +if (res ==-1 ) { +tst_res (TFAIL |TTERRNO , +"reading back prio failed" ); +return ; + } + + newclass =IOPRIO_PRIO_CLASS (res); + newprio =IOPRIO_PRIO_LEVEL (res); +if (newclass != class) + tst_res(TFAIL, + "wrong class after setting, expected %s got %s", + to_class_str[class],
testcases/kernel/syscalls/ioprio/ioprio_set02.c line 53
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +10
-0+ to_class_str[newclass]); + else if (newprio != prio) + tst_res(TFAIL, +"wrong prio after setting, expected %d got %d" , + prio, newprio); + else if (report) + tst_res(TPASS, "ioprio_set new class %s, new prio %d", + to_class_str[newclass], + newprio); +}
This is nearly the same as in the previous test, can we put this into the hearder as well?
Quoted 9 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +9
-0+static void run (void ) +{ +int class, prio; +int fail_in_loop; + +/* Get the I/O priority for the current process */ +TEST (ioprio_get (IOPRIO_WHO_PROCESS ,0 )); + +if (TST_RET ==-1 ) {
testcases/kernel/syscalls/ioprio/ioprio_set02.c line 73
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +10
-0+tst_res (TFAIL |TTERRNO ,"ioprio_get failed" ); +/* Try to continue anyway */ + class =IOPRIO_CLASS_NONE ; + prio =4 ; + }else { + class =IOPRIO_PRIO_CLASS (TST_RET ); + prio =IOPRIO_PRIO_LEVEL (TST_RET ); +tst_res (TPASS ,"ioprio_get returned class %s prio %d" , + to_class_str[class], prio); + }
Why do we get the priority here? We set both the class and prio down there.
Quoted 5 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +5
-0+/* Bump to best effort scheduling, all 8 priorities */ + class =IOPRIO_CLASS_BE ; + + fail_in_loop =0 ; +for (prio =0 ; prio <8 ; prio++) {
testcases/kernel/syscalls/ioprio/ioprio_set02.c line 89
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +10
-0+TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class, prio))); +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"ioprio_set IOPRIO_CLASS_BE prio %d failed" , prio); + fail_in_loop =1 ; + } + } +if (!fail_in_loop) +tst_res (TPASS ,"tested all 8 prios in class %s" , + to_class_str[class]);
Just btw, we don't have to have the fail_in_loop variable here (fail_in_loop) == (prio < 8)
testcases/kernel/syscalls/ioprio/ioprio_set02.c line 101
Quoted 11 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +11
-0+/* Test to fail with prio 8, first set prio 4 */ +ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class,4 )); +TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class,8 ))); +if (TST_RET ==-1 ) { +ioprio_check_setting (class,4 ,1 ); + prio =5 ; + } +else +tst_res (TFAIL ,"ioprio_set IOPRIO_CLASS_BE prio %d should not work" , prio);
That's a GNU-style else and LTP follows LKML.
Also we usually tend to put all negative tests into a separate testcase and also assert that the errno is correct.
Quoted 24 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +24
-0+/* Bump down to idle scheduling */ + class =IOPRIO_CLASS_IDLE ; + + fail_in_loop =0 ; +for (prio =0 ; prio <8 ; prio++) { +TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class, prio))); +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"ioprio_set IOPRIO_CLASS_IDLE failed" ); + fail_in_loop =1 ; + } + } +if (!fail_in_loop) +tst_res (TPASS ,"tested all 8 prios in class %s" , + to_class_str[class]); + +/* Test NONE scheduling */ + class =IOPRIO_CLASS_NONE ; +TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class,0 ))); +if (TST_RET ==-1 ) +tst_res (TFAIL |TTERRNO ,"ioprio_set IOPRIO_CLASS_NONE failed" ); +else +ioprio_check_setting (class,0 ,1 );
testcases/kernel/syscalls/ioprio/ioprio_set02.c line 136
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +10
-0+ +/* Any other prio than 0 should not work with NONE */ + class =IOPRIO_CLASS_NONE ; +TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class,4 ))); +if (TST_RET ==-1 ) +tst_res (TPASS ,"tested illegal priority with class %s" , + to_class_str[class]); +else +tst_res (TFAIL ,"ioprio_set IOPRIO_CLASS_NONE should fail" );
Here as well, we should assert the errno as well.
Quoted 12 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +6
-0+} + +static struct tst_test test = { + .test_all = run, + .min_kver ="2.6.13" , +};Signature · 5 lines
2.21.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/1 syscalls/ioprio: Add test cases for I/O priority
Hi!
Quoted 10 lines
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +10
-0+/* Bump to best effort scheduling, all 8 priorities */ + class =IOPRIO_CLASS_BE ; + + fail_in_loop =0 ; +for (prio =0 ; prio <8 ; prio++) { +TEST (ioprio_set (IOPRIO_WHO_PROCESS ,0 , +IOPRIO_PRIO_VALUE (class, prio))); +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"ioprio_set IOPRIO_CLASS_BE prio %d failed" , prio); + fail_in_loop =1 ;
Quoted 8 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c line 89
Quoted 5 lines
testcases/kernel/syscalls/ioprio/ioprio_set02.c new file +5
-0+ } + } +if (!fail_in_loop) +tst_res (TPASS ,"tested all 8 prios in class %s" , + to_class_str[class]);Just btw, we don't have to have the
fail_in_loopvariable here (fail_in_loop) == (prio < 8)
And that only works when we have a break; on failure, which we don't have here...
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/1 syscalls/ioprio: Add test cases for I/O priority
In reply to Linus WalleijHi,
generally these tests look fine. I'd just like to add something to the things the others have already pointed out:
Quoted 7 lines · Linus Walleij
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +1
-0@@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0-or-later
testcases/kernel/syscalls/ioprio/ioprio_get01.c line 11
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +10
-0+/* +* Copyright (c) 2019 Linaro Limited +*/ +#include <sys/types.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <signal.h> +#include <unistd.h> +#include <sys/syscall.h>
Please double check if all of those includes are really necessary. It compiled fine for me using only the types.h and syscalls.h (+ the two below).
testcases/kernel/syscalls/ioprio/ioprio_get01.c line 18
Quoted 7 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +7
-0+ +#include "tst_test.h" +#include "ioprio.h" + +static int ioprio_get (int which,int who) +{ +return syscall (SYS_ioprio_get, which, who);
In LTP there is a dedicated syscall function which handles the error if the syscall-number is absent. This line should be replaced with:
"return tst_syscall(__NR_ioprio_get, which, who);"
If done like this, you don't even have to check the kernel version in the tst_test structure at the end of every test case.
Quoted 19 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +19
-0+} + +static void run (void ) +{ +int prio, class; + +/* Get the I/O priority for the current process */ +TEST (ioprio_get (IOPRIO_WHO_PROCESS ,0 )); + +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"ioprio_get failed" ); +return ; + } + + class =IOPRIO_PRIO_CLASS (TST_RET ); + prio =IOPRIO_PRIO_LEVEL (TST_RET ); + +if (!prio_in_range (prio)) { +tst_res (TFAIL ,"ioprio out of range (%d)" , prio);
testcases/kernel/syscalls/ioprio/ioprio_get01.c line 47
Quoted 10 lines
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +10
-0+return ; + } + +tst_res (TPASS ,"ioprio_get returned class %s prio %d" , + to_class_str[class], prio); +} + +static struct tst_test test = { + .test_all = run, + .min_kver ="2.6.13" ,
line can be removed, see comment above
testcases/kernel/syscalls/ioprio/ioprio_get01.c line 48
Quoted 1 line
testcases/kernel/syscalls/ioprio/ioprio_get01.c new file +1
-0+};
There are also checkpatch errors/warnings for ioprio_set02. Please check that for yourself.
Other than that, the tests look good!