* Re: [LTP] [PATCH v2] sched_setscheduler: test SCHED_RESET_ON_FORK
2022-11-14 22:57 [LTP] [PATCH v2] sched_setscheduler: test SCHED_RESET_ON_FORK Federico Bonfiglio via ltp
@ 2022-11-15 11:25 ` Cyril Hrubis
2022-11-15 11:43 ` Richard Palethorpe
2023-09-16 12:49 ` [LTP] [PATCH v3] sched_setscheduler04.c: Test SCHED_RESET_ON_FORK Wei Gao via ltp
2 siblings, 0 replies; 5+ messages in thread
From: Cyril Hrubis @ 2022-11-15 11:25 UTC (permalink / raw)
To: Federico Bonfiglio; +Cc: ltp
Hi!
> +/*
> + * [Description]
> + *
> + * Testcases that test if sched_setscheduler with flag
> + * SCHED_RESET_ON_FORK restores children policy to
> + * SCHED_NORMAL.
> + *
> + */
> +
> +#define _GNU_SOURCE
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <sched.h>
> +#include <linux/sched.h>
> +
> +#include "tst_test.h"
> +#include "tst_sched.h"
> +
> +struct test_c
> ase_t {
^
Looks like the patch was mangled by your email client.
> + int policy;
> + char *desc;
> +};
> +
> +static struct test_case_t cases[] = {
> + {
> + .policy = SCHED_FIFO,
> + .desc = "SCHED_FIFO"
> + },
> + {
> + .policy = SCHED_RR,
> + .desc = "SCHED_RR"
> + }
> +};
> +
> +static void test_reset_on_fork(unsigned int i)
> +{
> + struct sched_variant *tv = &sched_variants[tst_variant];
> + struct test_case_t *tc = &cases[i];
> +
> + tst_res(TINFO, "Testing %s variant", tv->desc);
> + tst_res(TINFO, "Testing %s policy", tc->desc);
Why two messages? Why not just:
tst_res(TINFO, "Testing %s variant %s policy", tv->desc, tc->desc);
> + struct sched_param param = { .sched_priority = 1 };
> +
> + tv->sched_setscheduler(getpid(), tc->policy | SCHED_RESET_ON_FORK, ¶m);
> +
> + pid_t pid = SAFE_FORK();
> +
> + if (!pid == 0) {
^
Uff, please don't.
That's just if (pid)
> + if (sched_getscheduler(pid) == SCHED_NORMAL)
> + tst_res(TPASS, "Policy reset to SCHED_NORMAL");
> + else
> + tst_res(TFAIL, "Policy NOT reset to SCHED_NORMAL");
We should check that the priority was reset to DEFAULT_PRIO as well.
> + }
> +
> + tst_reap_children();
There is no need to call this as long as the child exits normally the
test library will pick it up.
> +}
> +
> +static struct tst_test test = {
> + .forks_child = 1,
> + .caps = (struct tst_cap[]) {
> + TST_CAP(TST_CAP_REQ, CAP_SYS_NICE)
>
> + },
> + .test_variants = ARRAY_SIZE(sched_variants),
> + .tcnt = ARRAY_SIZE(cases),
> + .test = test_reset_on_fork
> +};
> +
> --
> 2.38.1
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
--
Cyril Hrubis
chrubis@suse.cz
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [LTP] [PATCH v2] sched_setscheduler: test SCHED_RESET_ON_FORK
2022-11-14 22:57 [LTP] [PATCH v2] sched_setscheduler: test SCHED_RESET_ON_FORK Federico Bonfiglio via ltp
2022-11-15 11:25 ` Cyril Hrubis
@ 2022-11-15 11:43 ` Richard Palethorpe
2023-09-16 12:49 ` [LTP] [PATCH v3] sched_setscheduler04.c: Test SCHED_RESET_ON_FORK Wei Gao via ltp
2 siblings, 0 replies; 5+ messages in thread
From: Richard Palethorpe @ 2022-11-15 11:43 UTC (permalink / raw)
To: Federico Bonfiglio; +Cc: ltp
Hello,
I still can't apply this. The problem does not seem to be the PGP
signature though.
Federico Bonfiglio via ltp <ltp@lists.linux.it> writes:
> [[PGP Signed Part:Undecided]]
> Signed-off-by: Federico Bonfiglio <federico.bonfiglio@protonmail.ch>
> ---
> runtest/syscalls | 1 +
> .../syscalls/sched_setscheduler/.gitignore | 1 +
> .../sched_setscheduler/sched_setscheduler04.c | 73 +++++++++++++++++++
> 3 files changed, 75 insertions(+)
> create mode 100644 testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
>
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 3dc6fa397..ff516af3d 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -1204,6 +1204,7 @@ sched_getscheduler02 sched_getscheduler02
> sched_setscheduler01 sched_setscheduler01
> sched_setscheduler02 sched_setscheduler02
> sched_setscheduler03 sched_setscheduler03
> +sched_setscheduler04 sched_setscheduler04
>
> sched_yield01 sched_yield01
>
> diff --git a/testcases/kernel/syscalls/sched_setscheduler/.gitignore b/testcases/kernel/syscalls/sched_setscheduler/.gitignore
> index aa8ad9695..1b8860d2c 100644
> --- a/testcases/kernel/syscalls/sched_sets
> cheduler/.gitignore
> +++ b/testcases/kernel/syscalls/sched_setscheduler/.gitignore
> @@ -1,3 +1,4 @@
> /sched_setscheduler01
> /sched_setscheduler02
> /sched_setscheduler03
> +/sched_setscheduler04
No new line at end of file or is it missing from the patch?
> diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
> new file mode 100644
> index 000000000..4a5d27f5b
> --- /dev/null
> +++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
> @@ -0,0 +1,73 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2022 Federico Bonfiglio <federico.bonfiglio@protonmail.ch>
> + */
> +
> +/*
> + * [Description]
> + *
> + * Testcases that test if sched_setscheduler with flag
> + * SCHED_RESET_ON_FORK restores children policy to
> + * SCHED_NORMAL.
> + *
> + */
> +
> +#define _GNU_SOURCE
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <sched.h>
> +#include <linux/sched.h>
> +
> +#include "tst_test.h"
> +#include "tst_sched.h"
> +
> +struct test_c
> ase_t {
Random new line in the patch, stops it from applying.
> + int policy;
> + char *desc;
> +};
> +
> +static struct test_case_t cases[] = {
> + {
> + .policy = SCHED_FIFO,
> + .desc = "SCHED_FIFO"
> + },
> + {
> + .policy = SCHED_RR,
> + .desc = "SCHED_RR"
> + }
> +};
> +
> +static void test_reset_on_fork(unsigned int i)
> +{
> + struct sched_variant *tv = &sched_variants[tst_variant];
> + struct test_case_t *tc = &cases[i];
> +
> + tst_res(TINFO, "Testing %s variant", tv->desc);
> + tst_res(TINFO, "Testing %s policy", tc->desc);
> +
> + struct sched_param param = { .sched_priority = 1 };
> +
> + tv->sched_setscheduler(getpid(), tc->policy | SCHED_RESET_ON_FORK, ¶m);
> +
> + pid_t pid = SAFE_FORK();
> +
> + if (!pid == 0) {
> + if (sched_getscheduler(pid) == SCHED_NORMAL)
> + tst_res(TPASS, "Policy reset to SCHED_NORMAL");
> + else
> + tst_res(TFAIL, "Policy NOT reset to SCHED_NORMAL");
> + }
> +
> + tst_reap_children();
> +}
> +
> +static struct tst_test test = {
> + .forks_child = 1,
> + .caps = (struct tst_cap[]) {
> + TST_CAP(TST_CAP_REQ, CAP_SYS_NICE)
>
Another random new line, cuts off the end of the patch.
> + },
> + .test_variants = ARRAY_SIZE(sched_variants),
> + .tcnt = ARRAY_SIZE(cases),
> + .test = test_reset_on_fork
> +};
> +
> --
> 2.38.1
>
> [2. application/pgp-keys; publickey - Federico Bonfiglio - e96ee84c.asc]...
>
> [[End of PGP Signed Part]]
--
Thank you,
Richard.
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 5+ messages in thread* [LTP] [PATCH v3] sched_setscheduler04.c: Test SCHED_RESET_ON_FORK
2022-11-14 22:57 [LTP] [PATCH v2] sched_setscheduler: test SCHED_RESET_ON_FORK Federico Bonfiglio via ltp
2022-11-15 11:25 ` Cyril Hrubis
2022-11-15 11:43 ` Richard Palethorpe
@ 2023-09-16 12:49 ` Wei Gao via ltp
2023-11-17 9:21 ` Richard Palethorpe
2 siblings, 1 reply; 5+ messages in thread
From: Wei Gao via ltp @ 2023-09-16 12:49 UTC (permalink / raw)
To: ltp; +Cc: Federico Bonfiglio
Signed-off-by: Federico Bonfiglio <federico.bonfiglio@protonmail.ch>
Signed-off-by: Wei Gao <wegao@suse.com>
---
include/lapi/capability.h | 4 +
runtest/syscalls | 1 +
.../syscalls/sched_setscheduler/.gitignore | 1 +
.../sched_setscheduler/sched_setscheduler04.c | 78 +++++++++++++++++++
4 files changed, 84 insertions(+)
create mode 100644 testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
diff --git a/include/lapi/capability.h b/include/lapi/capability.h
index 17ec107b1..2b593797c 100644
--- a/include/lapi/capability.h
+++ b/include/lapi/capability.h
@@ -36,6 +36,10 @@
# define CAP_SYS_ADMIN 21
#endif
+#ifndef CAP_SYS_NICE
+# define CAP_SYS_NICE 23
+#endif
+
#ifndef CAP_SYS_TIME
# define CAP_SYS_TIME 25
#endif
diff --git a/runtest/syscalls b/runtest/syscalls
index 04b758fd9..b86188013 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1228,6 +1228,7 @@ sched_getscheduler02 sched_getscheduler02
sched_setscheduler01 sched_setscheduler01
sched_setscheduler02 sched_setscheduler02
sched_setscheduler03 sched_setscheduler03
+sched_setscheduler04 sched_setscheduler04
sched_yield01 sched_yield01
diff --git a/testcases/kernel/syscalls/sched_setscheduler/.gitignore b/testcases/kernel/syscalls/sched_setscheduler/.gitignore
index aa8ad9695..1b8860d2c 100644
--- a/testcases/kernel/syscalls/sched_setscheduler/.gitignore
+++ b/testcases/kernel/syscalls/sched_setscheduler/.gitignore
@@ -1,3 +1,4 @@
/sched_setscheduler01
/sched_setscheduler02
/sched_setscheduler03
+/sched_setscheduler04
diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
new file mode 100644
index 000000000..828d1ec09
--- /dev/null
+++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2022 Federico Bonfiglio <federico.bonfiglio@protonmail.ch>
+ */
+
+/*
+ * [Description]
+ *
+ * Testcases that test if sched_setscheduler with flag
+ * SCHED_RESET_ON_FORK restores children policy to
+ * SCHED_NORMAL.
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <sched.h>
+#include <linux/sched.h>
+
+#include "tst_test.h"
+#include "tst_sched.h"
+
+struct test_case_t {
+ int policy;
+ char *desc;
+};
+
+static struct test_case_t cases[] = {
+ {
+ .policy = SCHED_FIFO,
+ .desc = "SCHED_FIFO"
+ },
+ {
+ .policy = SCHED_RR,
+ .desc = "SCHED_RR"
+ }
+};
+
+static void test_reset_on_fork(unsigned int i)
+{
+ struct sched_variant *tv = &sched_variants[tst_variant];
+ struct test_case_t *tc = &cases[i];
+
+ tst_res(TINFO, "Testing %s variant %s policy", tv->desc, tc->desc);
+
+ struct sched_param param = { .sched_priority = 10 };
+
+ tv->sched_setscheduler(getpid(), tc->policy | SCHED_RESET_ON_FORK, ¶m);
+
+ pid_t pid = SAFE_FORK();
+
+ if (pid) {
+ if (sched_getscheduler(pid) == SCHED_NORMAL)
+ tst_res(TPASS, "Policy reset to SCHED_NORMAL");
+ else
+ tst_res(TFAIL, "Policy NOT reset to SCHED_NORMAL");
+
+ sched_getparam(pid, ¶m);
+
+ /* kernel will return sched_priority 0 if task is not RT Policy */
+ if (param.sched_priority == 0)
+ tst_res(TPASS, "Priority set to 0");
+ else
+ tst_res(TFAIL, "Priority not set to 0");
+ }
+}
+
+static struct tst_test test = {
+ .forks_child = 1,
+ .caps = (struct tst_cap[]) {
+ TST_CAP(TST_CAP_REQ, CAP_SYS_NICE),
+ {}
+ },
+ .test_variants = ARRAY_SIZE(sched_variants),
+ .tcnt = ARRAY_SIZE(cases),
+ .test = test_reset_on_fork,
+};
--
2.35.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [LTP] [PATCH v3] sched_setscheduler04.c: Test SCHED_RESET_ON_FORK
2023-09-16 12:49 ` [LTP] [PATCH v3] sched_setscheduler04.c: Test SCHED_RESET_ON_FORK Wei Gao via ltp
@ 2023-11-17 9:21 ` Richard Palethorpe
0 siblings, 0 replies; 5+ messages in thread
From: Richard Palethorpe @ 2023-11-17 9:21 UTC (permalink / raw)
To: Wei Gao; +Cc: Federico Bonfiglio, ltp
Hello,
Merged, thanks!
Wei Gao via ltp <ltp@lists.linux.it> writes:
> Signed-off-by: Federico Bonfiglio <federico.bonfiglio@protonmail.ch>
> Signed-off-by: Wei Gao <wegao@suse.com>
> ---
> include/lapi/capability.h | 4 +
> runtest/syscalls | 1 +
> .../syscalls/sched_setscheduler/.gitignore | 1 +
> .../sched_setscheduler/sched_setscheduler04.c | 78 +++++++++++++++++++
> 4 files changed, 84 insertions(+)
> create mode 100644 testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
>
> diff --git a/include/lapi/capability.h b/include/lapi/capability.h
> index 17ec107b1..2b593797c 100644
> --- a/include/lapi/capability.h
> +++ b/include/lapi/capability.h
> @@ -36,6 +36,10 @@
> # define CAP_SYS_ADMIN 21
> #endif
>
> +#ifndef CAP_SYS_NICE
> +# define CAP_SYS_NICE 23
> +#endif
> +
> #ifndef CAP_SYS_TIME
> # define CAP_SYS_TIME 25
> #endif
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 04b758fd9..b86188013 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -1228,6 +1228,7 @@ sched_getscheduler02 sched_getscheduler02
> sched_setscheduler01 sched_setscheduler01
> sched_setscheduler02 sched_setscheduler02
> sched_setscheduler03 sched_setscheduler03
> +sched_setscheduler04 sched_setscheduler04
>
> sched_yield01 sched_yield01
>
> diff --git a/testcases/kernel/syscalls/sched_setscheduler/.gitignore b/testcases/kernel/syscalls/sched_setscheduler/.gitignore
> index aa8ad9695..1b8860d2c 100644
> --- a/testcases/kernel/syscalls/sched_setscheduler/.gitignore
> +++ b/testcases/kernel/syscalls/sched_setscheduler/.gitignore
> @@ -1,3 +1,4 @@
> /sched_setscheduler01
> /sched_setscheduler02
> /sched_setscheduler03
> +/sched_setscheduler04
> diff --git
> a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
> b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
> new file mode 100644
> index 000000000..828d1ec09
> --- /dev/null
> +++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler04.c
> @@ -0,0 +1,78 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2022 Federico Bonfiglio <federico.bonfiglio@protonmail.ch>
> + */
> +
> +/*
> + * [Description]
> + *
> + * Testcases that test if sched_setscheduler with flag
> + * SCHED_RESET_ON_FORK restores children policy to
> + * SCHED_NORMAL.
> + *
> + */
> +
> +#define _GNU_SOURCE
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <sched.h>
> +#include <linux/sched.h>
> +
> +#include "tst_test.h"
> +#include "tst_sched.h"
> +
> +struct test_case_t {
> + int policy;
> + char *desc;
> +};
> +
> +static struct test_case_t cases[] = {
> + {
> + .policy = SCHED_FIFO,
> + .desc = "SCHED_FIFO"
> + },
> + {
> + .policy = SCHED_RR,
> + .desc = "SCHED_RR"
> + }
> +};
> +
> +static void test_reset_on_fork(unsigned int i)
> +{
> + struct sched_variant *tv = &sched_variants[tst_variant];
> + struct test_case_t *tc = &cases[i];
> +
> + tst_res(TINFO, "Testing %s variant %s policy", tv->desc, tc->desc);
> +
> + struct sched_param param = { .sched_priority = 10 };
> +
> + tv->sched_setscheduler(getpid(), tc->policy | SCHED_RESET_ON_FORK, ¶m);
> +
> + pid_t pid = SAFE_FORK();
> +
> + if (pid) {
> + if (sched_getscheduler(pid) == SCHED_NORMAL)
> + tst_res(TPASS, "Policy reset to SCHED_NORMAL");
> + else
> + tst_res(TFAIL, "Policy NOT reset to SCHED_NORMAL");
> +
> + sched_getparam(pid, ¶m);
> +
> + /* kernel will return sched_priority 0 if task is not RT Policy */
> + if (param.sched_priority == 0)
> + tst_res(TPASS, "Priority set to 0");
> + else
> + tst_res(TFAIL, "Priority not set to 0");
> + }
> +}
> +
> +static struct tst_test test = {
> + .forks_child = 1,
> + .caps = (struct tst_cap[]) {
> + TST_CAP(TST_CAP_REQ, CAP_SYS_NICE),
> + {}
> + },
> + .test_variants = ARRAY_SIZE(sched_variants),
> + .tcnt = ARRAY_SIZE(cases),
> + .test = test_reset_on_fork,
> +};
> --
> 2.35.3
--
Thank you,
Richard.
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 5+ messages in thread