* [LTP] [PATCH] signal: add new testcase signal06.c
@ 2015-11-07 12:28 Li Wang
2015-11-09 13:29 ` Jan Stancek
0 siblings, 1 reply; 3+ messages in thread
From: Li Wang @ 2015-11-07 12:28 UTC (permalink / raw)
To: ltp
Regression test for kernel commit:
commit df24fb859a4e200d9324e2974229fbb7adf00aef
Author: Oleg Nesterov <oleg@redhat.com>
Date: Tue Sep 2 19:57:17 2014 +0200
commit 66463db4fc5605d51c7bb81d009d5bf30a783a2c
Author: Oleg Nesterov <oleg@redhat.com>
Date: Tue Sep 2 19:57:13 2014 +0200
Signed-off-by: Li Wang <liwang@redhat.com>
---
runtest/ltplite | 1 +
runtest/stress.part3 | 1 +
runtest/syscalls | 1 +
testcases/kernel/syscalls/signal/Makefile | 2 +
testcases/kernel/syscalls/signal/signal06.c | 148 ++++++++++++++++++++++++++++
5 files changed, 153 insertions(+)
create mode 100644 testcases/kernel/syscalls/signal/signal06.c
diff --git a/runtest/ltplite b/runtest/ltplite
index aaa5c73..f2c9dcf 100644
--- a/runtest/ltplite
+++ b/runtest/ltplite
@@ -840,6 +840,7 @@ signal02 signal02
signal03 signal03
signal04 signal04
signal05 signal05
+signal06 signal06
sigpending02 sigpending02
diff --git a/runtest/stress.part3 b/runtest/stress.part3
index 63505ec..36bb16f 100644
--- a/runtest/stress.part3
+++ b/runtest/stress.part3
@@ -744,6 +744,7 @@ signal02 signal02
signal03 signal03
signal04 signal04
signal05 signal05
+signal06 signal06
sigpending02 sigpending02
diff --git a/runtest/syscalls b/runtest/syscalls
index 958f66e..cfbcbea 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1143,6 +1143,7 @@ signal02 signal02
signal03 signal03
signal04 signal04
signal05 signal05
+signal06 signal06
signalfd01 signalfd01
diff --git a/testcases/kernel/syscalls/signal/Makefile b/testcases/kernel/syscalls/signal/Makefile
index bd617d8..46885db 100644
--- a/testcases/kernel/syscalls/signal/Makefile
+++ b/testcases/kernel/syscalls/signal/Makefile
@@ -21,3 +21,5 @@ top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
include $(top_srcdir)/include/mk/generic_leaf_target.mk
+
+signal06: CFLAGS+=-O2 -lpthread
diff --git a/testcases/kernel/syscalls/signal/signal06.c b/testcases/kernel/syscalls/signal/signal06.c
new file mode 100644
index 0000000..166d33c
--- /dev/null
+++ b/testcases/kernel/syscalls/signal/signal06.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2015 Author: Oleg Nesterov <oleg@redhat.com>
+ * Modify: Li Wang <liwang@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * you should have received a copy of the GNU General Public License along
+ * with this program; if not, write the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Description:
+ * These below commits fix the issue on v3.17-rc3-3 stable kernel:
+ *
+ * commit df24fb859a4e200d9324e2974229fbb7adf00aef
+ * Author: Oleg Nesterov <oleg@redhat.com>
+ * Date: Tue Sep 2 19:57:17 2014 +0200
+ *
+ * commit 66463db4fc5605d51c7bb81d009d5bf30a783a2c
+ * Author: Oleg Nesterov <oleg@redhat.com>
+ * Date: Tue Sep 2 19:57:13 2014 +0200
+ *
+ * Reproduce:
+ * Test-case (needs -O2).
+ */
+
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/mman.h>
+#include <pthread.h>
+#include <assert.h>
+
+#include "test.h"
+
+char *TCID = "signal06";
+int TST_TOTAL = 5;
+
+#if __x86_64__
+
+volatile double D;
+int FLAGE;
+
+char altstack[4096 * 10] __attribute__((aligned(4096)));
+
+void test(double d)
+{
+ int loop = 1;
+ int pid = getpid();
+
+ D = d;
+ while (D == d && loop < 10000) {
+ /* sys_tkill(pid, SIGHUP); asm to avoid save/reload
+ * fp regs around c call */
+ asm ("" : : "a"(200), "D"(pid), "S"(1));
+ asm ("syscall" : : : "ax");
+
+ loop++;
+ }
+
+ FLAGE = 1;
+ tst_resm(TINFO, "loop = %d", loop);
+
+ if (loop == 10000) {
+ tst_resm(TPASS, "%s call succeeded", TCID);
+ } else {
+ tst_resm(TFAIL, "Bug Reproduced!");
+ exit(-1);
+ }
+}
+
+void sigh(int sig LTP_ATTRIBUTE_UNUSED)
+{
+}
+
+void *tfunc(void *arg LTP_ATTRIBUTE_UNUSED)
+{
+ FLAGE = 0;
+
+ for (; ;) {
+ mprotect(altstack, sizeof(altstack), PROT_READ);
+ mprotect(altstack, sizeof(altstack), PROT_READ|PROT_WRITE);
+
+ if (FLAGE == 1)
+ return NULL;
+ }
+}
+
+int main(int ac, char **av)
+{
+ int i, lc, res;
+ pthread_t pt;
+
+ stack_t st = {
+ .ss_sp = altstack,
+ .ss_size = sizeof(altstack),
+ .ss_flags = SS_ONSTACK,
+ };
+
+ struct sigaction sa = {
+ .sa_handler = sigh,
+ };
+
+ tst_parse_opts(ac, av, NULL, NULL);
+
+ for (lc = 0; TEST_LOOPING(lc); lc++) {
+ tst_count = 0;
+
+ for (i = 0; i < TST_TOTAL; i++) {
+
+ sigaction(SIGSEGV, &sa, NULL);
+ sigaltstack(&st, NULL);
+ sa.sa_flags = SA_ONSTACK;
+ sigaction(SIGHUP, &sa, NULL);
+
+ res = pthread_create(&pt, NULL, tfunc, NULL);
+ if (res) {
+ tst_brkm(TBROK, NULL, "pthread_create(): %s",
+ tst_strerrno(res));
+ }
+
+ test(123.456);
+
+ res = pthread_join(pt, NULL);
+ if (res)
+ tst_brkm(TBROK, NULL, "pthread_join(): %s",
+ tst_strerrno(res));
+
+ }
+ }
+
+ tst_exit();
+}
+
+#else
+int main(void)
+{
+ tst_brkm(TCONF, NULL, "Only test on x86_64.");
+}
+#endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [LTP] [PATCH] signal: add new testcase signal06.c
2015-11-07 12:28 [LTP] [PATCH] signal: add new testcase signal06.c Li Wang
@ 2015-11-09 13:29 ` Jan Stancek
2015-11-10 9:19 ` Li Wang
0 siblings, 1 reply; 3+ messages in thread
From: Jan Stancek @ 2015-11-09 13:29 UTC (permalink / raw)
To: ltp
----- Original Message -----
> From: "Li Wang" <liwang@redhat.com>
> To: ltp@lists.linux.it
> Sent: Saturday, 7 November, 2015 1:28:17 PM
> Subject: [LTP] [PATCH] signal: add new testcase signal06.c
Hi,
>
> Regression test for kernel commit:
> commit df24fb859a4e200d9324e2974229fbb7adf00aef
> Author: Oleg Nesterov <oleg@redhat.com>
> Date: Tue Sep 2 19:57:17 2014 +0200
>
> commit 66463db4fc5605d51c7bb81d009d5bf30a783a2c
> Author: Oleg Nesterov <oleg@redhat.com>
> Date: Tue Sep 2 19:57:13 2014 +0200
Short summary what the problem is would be appreciated here.
>
> Signed-off-by: Li Wang <liwang@redhat.com>
> ---
> runtest/ltplite | 1 +
> runtest/stress.part3 | 1 +
> runtest/syscalls | 1 +
> testcases/kernel/syscalls/signal/Makefile | 2 +
> testcases/kernel/syscalls/signal/signal06.c | 148
> ++++++++++++++++++++++++++++
> 5 files changed, 153 insertions(+)
> create mode 100644 testcases/kernel/syscalls/signal/signal06.c
>
> diff --git a/runtest/ltplite b/runtest/ltplite
> index aaa5c73..f2c9dcf 100644
> --- a/runtest/ltplite
> +++ b/runtest/ltplite
> @@ -840,6 +840,7 @@ signal02 signal02
> signal03 signal03
> signal04 signal04
> signal05 signal05
> +signal06 signal06
>
> sigpending02 sigpending02
>
> diff --git a/runtest/stress.part3 b/runtest/stress.part3
> index 63505ec..36bb16f 100644
> --- a/runtest/stress.part3
> +++ b/runtest/stress.part3
> @@ -744,6 +744,7 @@ signal02 signal02
> signal03 signal03
> signal04 signal04
> signal05 signal05
> +signal06 signal06
>
> sigpending02 sigpending02
>
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 958f66e..cfbcbea 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -1143,6 +1143,7 @@ signal02 signal02
> signal03 signal03
> signal04 signal04
> signal05 signal05
> +signal06 signal06
>
> signalfd01 signalfd01
>
> diff --git a/testcases/kernel/syscalls/signal/Makefile
> b/testcases/kernel/syscalls/signal/Makefile
> index bd617d8..46885db 100644
> --- a/testcases/kernel/syscalls/signal/Makefile
> +++ b/testcases/kernel/syscalls/signal/Makefile
> @@ -21,3 +21,5 @@ top_srcdir ?= ../../../..
> include $(top_srcdir)/include/mk/testcases.mk
>
> include $(top_srcdir)/include/mk/generic_leaf_target.mk
> +
> +signal06: CFLAGS+=-O2 -lpthread
just "-pthread"
> diff --git a/testcases/kernel/syscalls/signal/signal06.c
> b/testcases/kernel/syscalls/signal/signal06.c
> new file mode 100644
> index 0000000..166d33c
> --- /dev/null
> +++ b/testcases/kernel/syscalls/signal/signal06.c
> @@ -0,0 +1,148 @@
> +/*
> + * Copyright (c) 2015 Author: Oleg Nesterov <oleg@redhat.com>
> + * Modify: Li Wang <liwang@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> + *
> + * you should have received a copy of the GNU General Public License along
> + * with this program; if not, write the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + */
> +
> +/*
> + * Description:
> + * These below commits fix the issue on v3.17-rc3-3 stable kernel:
Here as well - short description what is the "issue".
> + *
> + * commit df24fb859a4e200d9324e2974229fbb7adf00aef
> + * Author: Oleg Nesterov <oleg@redhat.com>
> + * Date: Tue Sep 2 19:57:17 2014 +0200
> + *
> + * commit 66463db4fc5605d51c7bb81d009d5bf30a783a2c
> + * Author: Oleg Nesterov <oleg@redhat.com>
> + * Date: Tue Sep 2 19:57:13 2014 +0200
> + *
> + * Reproduce:
> + * Test-case (needs -O2).
> + */
> +
> +#include <stdio.h>
> +#include <signal.h>
> +#include <unistd.h>
> +#include <sys/syscall.h>
> +#include <sys/mman.h>
> +#include <pthread.h>
> +#include <assert.h>
> +
> +#include "test.h"
> +
> +char *TCID = "signal06";
> +int TST_TOTAL = 5;
> +
> +#if __x86_64__
> +
> +volatile double D;
> +int FLAGE;
FLAGE looks like it should be volatile too.
> +
> +char altstack[4096 * 10] __attribute__((aligned(4096)));
> +
> +void test(double d)
> +{
> + int loop = 1;
> + int pid = getpid();
> +
> + D = d;
> + while (D == d && loop < 10000) {
make "10000" DEFINE or@least a variable
> + /* sys_tkill(pid, SIGHUP); asm to avoid save/reload
> + * fp regs around c call */
> + asm ("" : : "a"(200), "D"(pid), "S"(1));
If you include linux_syscall_numbers.h, you can be sure that __NR_tkill
will be defined.
> + asm ("syscall" : : : "ax");
> +
> + loop++;
> + }
> +
> + FLAGE = 1;
> + tst_resm(TINFO, "loop = %d", loop);
> +
> + if (loop == 10000) {
> + tst_resm(TPASS, "%s call succeeded", TCID);
> + } else {
> + tst_resm(TFAIL, "Bug Reproduced!");
> + exit(-1);
Why not tst_exit()?
> + }
> +}
> +
> +void sigh(int sig LTP_ATTRIBUTE_UNUSED)
> +{
> +}
> +
> +void *tfunc(void *arg LTP_ATTRIBUTE_UNUSED)
> +{
> + FLAGE = 0;
> +
> + for (; ;) {
> + mprotect(altstack, sizeof(altstack), PROT_READ);
> + mprotect(altstack, sizeof(altstack), PROT_READ|PROT_WRITE);
> +
> + if (FLAGE == 1)
> + return NULL;
> + }
> +}
> +
> +int main(int ac, char **av)
> +{
> + int i, lc, res;
> + pthread_t pt;
> +
> + stack_t st = {
> + .ss_sp = altstack,
> + .ss_size = sizeof(altstack),
> + .ss_flags = SS_ONSTACK,
> + };
> +
> + struct sigaction sa = {
> + .sa_handler = sigh,
> + };
> +
> + tst_parse_opts(ac, av, NULL, NULL);
> +
> + for (lc = 0; TEST_LOOPING(lc); lc++) {
> + tst_count = 0;
> +
> + for (i = 0; i < TST_TOTAL; i++) {
> +
> + sigaction(SIGSEGV, &sa, NULL);
> + sigaltstack(&st, NULL);
> + sa.sa_flags = SA_ONSTACK;
> + sigaction(SIGHUP, &sa, NULL);
Signal handler setup looks like it can be moved outside both loops.
> +
> + res = pthread_create(&pt, NULL, tfunc, NULL);
> + if (res) {
> + tst_brkm(TBROK, NULL, "pthread_create(): %s",
> + tst_strerrno(res));
If you use TEST(), then TRERRNO will print errno stored in TEST_RETURN.
Regards,
Jan
> + }
> +
> + test(123.456);
> +
> + res = pthread_join(pt, NULL);
> + if (res)
> + tst_brkm(TBROK, NULL, "pthread_join(): %s",
> + tst_strerrno(res));
> +
> + }
> + }
> +
> + tst_exit();
> +}
> +
> +#else
> +int main(void)
> +{
> + tst_brkm(TCONF, NULL, "Only test on x86_64.");
> +}
> +#endif
> --
> 1.8.3.1
>
>
> --
> Mailing list info: http://lists.linux.it/listinfo/ltp
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [LTP] [PATCH] signal: add new testcase signal06.c
2015-11-09 13:29 ` Jan Stancek
@ 2015-11-10 9:19 ` Li Wang
0 siblings, 0 replies; 3+ messages in thread
From: Li Wang @ 2015-11-10 9:19 UTC (permalink / raw)
To: ltp
Hi,
On Mon, Nov 9, 2015 at 9:29 PM, Jan Stancek <jstancek@redhat.com> wrote:
>
>
>
> Short summary what the problem is would be appreciated here.
>
ok, l will try.
>
> > +
> > +signal06: CFLAGS+=-O2 -lpthread
>
> just "-pthread"
>
ok.
>
> > + * Description:
> > + * These below commits fix the issue on v3.17-rc3-3 stable kernel:
>
> Here as well - short description what is the "issue".
>
ok.
>
> > + *
> > +#include "test.h"
> > +
> > +char *TCID = "signal06";
> > +int TST_TOTAL = 5;
> > +
> > +#if __x86_64__
> > +
> > +volatile double D;
> > +int FLAGE;
>
> FLAGE looks like it should be volatile too.
>
yeah, no problem.
>
> > +
> > +char altstack[4096 * 10] __attribute__((aligned(4096)));
> > +
> > +void test(double d)
> > +{
> > + int loop = 1;
> > + int pid = getpid();
> > +
> > + D = d;
> > + while (D == d && loop < 10000) {
>
> make "10000" DEFINE or at least a variable
>
yes.
>
> > + /* sys_tkill(pid, SIGHUP); asm to avoid save/reload
> > + * fp regs around c call */
> > + asm ("" : : "a"(200), "D"(pid), "S"(1));
>
> If you include linux_syscall_numbers.h, you can be sure that __NR_tkill
> will be defined.
>
ok, sounds good.
> > + } else {
> > + tst_resm(TFAIL, "Bug Reproduced!");
> > + exit(-1);
>
> Why not tst_exit()?
>
ok, good.
>
> > + tst_count = 0;
> > +
> > + for (i = 0; i < TST_TOTAL; i++) {
> > +
> > + sigaction(SIGSEGV, &sa, NULL);
> > + sigaltstack(&st, NULL);
> > + sa.sa_flags = SA_ONSTACK;
> > + sigaction(SIGHUP, &sa, NULL);
>
> Signal handler setup looks like it can be moved outside both loops.
>
yes, that's would be great.
>
> > +
> > + res = pthread_create(&pt, NULL, tfunc, NULL);
> > + if (res) {
> > + tst_brkm(TBROK, NULL, "pthread_create():
> %s",
> > + tst_strerrno(res));
>
> If you use TEST(), then TRERRNO will print errno stored in TEST_RETURN.
>
yes.
>
> Regards,
> Jan
>
>
Thanks for reviewing this patch. and then will sent V2.
--
Regards,
Li Wang
Email: liwang@redhat.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20151110/319d7071/attachment.html>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-10 9:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-07 12:28 [LTP] [PATCH] signal: add new testcase signal06.c Li Wang
2015-11-09 13:29 ` Jan Stancek
2015-11-10 9:19 ` Li Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.