Message ID | 20180721142035.21059-13-hjl.tools@gmail.com |
---|---|
State | New |
Headers | show |
Series | x86/CET: The last 12 patches to enable Intel CET | expand |
On 07/21/2018 10:20 AM, H.J. Lu wrote: > * stdlib/Makefile ((tests): Add tst-setcontext6, tst-setcontext7, > tst-setcontext8 and tst-setcontext9. > * stdlib/tst-setcontext6.c: New file. > * stdlib/tst-setcontext7.c: Likewise. > * stdlib/tst-setcontext8.c: Likewise. > * stdlib/tst-setcontext9.c: Likewise. OK for 2.28 if you use atomics instead of volatile int. Reviewed-by: Carlos O'Donell <carlos@redhat.com> > --- > stdlib/Makefile | 3 +- > stdlib/tst-setcontext6.c | 76 +++++++++++++++++++++++++++++ > stdlib/tst-setcontext7.c | 96 +++++++++++++++++++++++++++++++++++++ > stdlib/tst-setcontext8.c | 81 +++++++++++++++++++++++++++++++ > stdlib/tst-setcontext9.c | 100 +++++++++++++++++++++++++++++++++++++++ > 5 files changed, 355 insertions(+), 1 deletion(-) > create mode 100644 stdlib/tst-setcontext6.c > create mode 100644 stdlib/tst-setcontext7.c > create mode 100644 stdlib/tst-setcontext8.c > create mode 100644 stdlib/tst-setcontext9.c > > diff --git a/stdlib/Makefile b/stdlib/Makefile > index 8db4f1d35a..638306bb5c 100644 > --- a/stdlib/Makefile > +++ b/stdlib/Makefile > @@ -86,7 +86,8 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ > test-on_exit-race test-dlclose-exit-race \ > tst-makecontext-align test-bz22786 tst-strtod-nan-sign \ > tst-swapcontext1 tst-swapcontext2 tst-setcontext4 \ > - tst-setcontext5 > + tst-setcontext5 tst-setcontext6 tst-setcontext7 \ > + tst-setcontext8 tst-setcontext9 OK. > > tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ > tst-tls-atexit tst-tls-atexit-nodelete > diff --git a/stdlib/tst-setcontext6.c b/stdlib/tst-setcontext6.c > new file mode 100644 > index 0000000000..c719e2d678 > --- /dev/null > +++ b/stdlib/tst-setcontext6.c > @@ -0,0 +1,76 @@ > +/* Check getcontext and setcontext on the context from makecontext. OK. > + Copyright (C) 2018 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library 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 > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + <http://www.gnu.org/licenses/>. */ > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <ucontext.h> > +#include <unistd.h> > + > +static ucontext_t ctx[3]; > +static volatile int done; OK, but I'd prefer a way around this needing to be volatile, like using atomics. > + > +static void > +f1 (void) > +{ > + printf ("start f1\n"); > + if (!done) > + { > + if (getcontext (&ctx[2]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (done) > + exit (EXIT_SUCCESS); > + } > + done++; > + if (setcontext (&ctx[2]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > +} > + > +static int > +do_test (void) > +{ > + char st1[32768]; > + puts ("making contexts"); > + if (getcontext (&ctx[0]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (getcontext (&ctx[1]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); OK. > + } > + ctx[1].uc_stack.ss_sp = st1; > + ctx[1].uc_stack.ss_size = sizeof st1; > + ctx[1].uc_link = &ctx[0]; > + makecontext (&ctx[1], (void (*) (void)) f1, 0); > + if (setcontext (&ctx[1]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } OK. > + exit (EXIT_FAILURE); > +} > + > +#include <support/test-driver.c> > diff --git a/stdlib/tst-setcontext7.c b/stdlib/tst-setcontext7.c > new file mode 100644 > index 0000000000..e331e511ef > --- /dev/null > +++ b/stdlib/tst-setcontext7.c > @@ -0,0 +1,96 @@ > +/* Check setcontext on the context from makecontext. OK. > + Copyright (C) 2018 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library 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 > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + <http://www.gnu.org/licenses/>. */ > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <ucontext.h> > +#include <unistd.h> > + > +static ucontext_t ctx[5]; > +static volatile int done; Likewise (see above). > + > +static void > +f1 (void) > +{ > + puts ("start f1"); > + if (!done) > + { > + if (getcontext (&ctx[2]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (done) > + { > + puts ("set context in f1"); > + if (setcontext (&ctx[3]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + } OK. > + } > + done++; > + puts ("swap contexts in f1"); > + if (swapcontext (&ctx[4], &ctx[2]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + puts ("end f1"); > + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); OK. > +} > + > +static int > +do_test (void) > +{ > + char st1[32768]; > + puts ("making contexts"); > + if (getcontext (&ctx[0]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (getcontext (&ctx[1]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + ctx[1].uc_stack.ss_sp = st1; > + ctx[1].uc_stack.ss_size = sizeof st1; > + ctx[1].uc_link = &ctx[0]; > + makecontext (&ctx[1], (void (*) (void)) f1, 0); > + puts ("swap contexts"); > + if (swapcontext (&ctx[3], &ctx[1]) != 0) OK. > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (done != 1) > + exit (EXIT_FAILURE); > + done++; > + puts ("set context"); > + if (setcontext (&ctx[4]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + exit (EXIT_FAILURE); > +} > + > +#include <support/test-driver.c> > diff --git a/stdlib/tst-setcontext8.c b/stdlib/tst-setcontext8.c > new file mode 100644 > index 0000000000..a7febf6c67 > --- /dev/null > +++ b/stdlib/tst-setcontext8.c > @@ -0,0 +1,81 @@ > +/* Check getcontext and setcontext on the context from makecontext. OK. > + Copyright (C) 2018 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library 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 > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + <http://www.gnu.org/licenses/>. */ > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <ucontext.h> > +#include <unistd.h> > + > +static ucontext_t ctx[3]; > +static volatile int done; > + > +static void > +__attribute__((noinline, noclone)) > +f2 (void) > +{ > + printf ("start f2\n"); > + done++; > + if (setcontext (&ctx[2]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > +} > + > +static void > +f1 (void) > +{ > + printf ("start f1\n"); > + if (getcontext (&ctx[2]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (done) > + exit (EXIT_SUCCESS); > + f2 (); > +} > + OK. > +static int > +do_test (void) > +{ > + char st1[32768]; > + puts ("making contexts"); > + if (getcontext (&ctx[0]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (getcontext (&ctx[1]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + ctx[1].uc_stack.ss_sp = st1; > + ctx[1].uc_stack.ss_size = sizeof st1; > + ctx[1].uc_link = &ctx[0]; > + makecontext (&ctx[1], (void (*) (void)) f1, 0); OK. > + if (setcontext (&ctx[1]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + exit (EXIT_FAILURE); > +} > + > +#include <support/test-driver.c> OK. Similar to the original one. > diff --git a/stdlib/tst-setcontext9.c b/stdlib/tst-setcontext9.c > new file mode 100644 > index 0000000000..53609d4b10 > --- /dev/null > +++ b/stdlib/tst-setcontext9.c > @@ -0,0 +1,100 @@ > +/* Check setcontext on the context from makecontext. > + Copyright (C) 2018 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library 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 > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + <http://www.gnu.org/licenses/>. */ > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <ucontext.h> > +#include <unistd.h> > + > +static ucontext_t ctx[5]; > +static volatile int done; > + > +static void > +__attribute__((noinline, noclone)) > +f2 (void) > +{ > + done++; > + puts ("swap contexts in f2"); > + if (swapcontext (&ctx[4], &ctx[2]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + puts ("end f2"); > + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); > +} > + > +static void > +f1 (void) > +{ > + puts ("start f1"); > + if (getcontext (&ctx[2]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (done) OK. > + { > + puts ("set context in f1"); > + if (setcontext (&ctx[3]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + } > + f2 (); > +} > + > +static int > +do_test (void) > +{ > + char st1[32768]; > + puts ("making contexts"); > + if (getcontext (&ctx[0]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (getcontext (&ctx[1]) != 0) > + { > + printf ("%s: getcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + ctx[1].uc_stack.ss_sp = st1; > + ctx[1].uc_stack.ss_size = sizeof st1; > + ctx[1].uc_link = &ctx[0]; > + makecontext (&ctx[1], (void (*) (void)) f1, 0); > + puts ("swap contexts"); > + if (swapcontext (&ctx[3], &ctx[1]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + if (done != 1) > + exit (EXIT_FAILURE); > + done++; > + puts ("set context"); > + if (setcontext (&ctx[4]) != 0) > + { > + printf ("%s: setcontext: %m\n", __FUNCTION__); > + exit (EXIT_FAILURE); > + } > + exit (EXIT_FAILURE); > +} > + > +#include <support/test-driver.c> > OK. Cheers,Carlos.
On Tue, Jul 24, 2018 at 11:51:16PM -0400, Carlos O'Donell wrote: > On 07/21/2018 10:20 AM, H.J. Lu wrote: > > * stdlib/Makefile ((tests): Add tst-setcontext6, tst-setcontext7, > > tst-setcontext8 and tst-setcontext9. > > * stdlib/tst-setcontext6.c: New file. > > * stdlib/tst-setcontext7.c: Likewise. > > * stdlib/tst-setcontext8.c: Likewise. > > * stdlib/tst-setcontext9.c: Likewise. > > OK for 2.28 if you use atomics instead of volatile int. > > Reviewed-by: Carlos O'Donell <carlos@redhat.com> This is what I checked in. H.J. --- From 375a484459efcf2da1100e9ed228863be6665986 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" <hjl.tools@gmail.com> Date: Wed, 25 Jul 2018 05:12:59 -0700 Subject: [PATCH] Add tests for setcontext on the context from makecontext Reviewed-by: Carlos O'Donell <carlos@redhat.com> * stdlib/Makefile ((tests): Add tst-setcontext6, tst-setcontext7, tst-setcontext8 and tst-setcontext9. * stdlib/tst-setcontext6.c: New file. * stdlib/tst-setcontext7.c: Likewise. * stdlib/tst-setcontext8.c: Likewise. * stdlib/tst-setcontext9.c: Likewise. --- ChangeLog | 9 ++++ stdlib/Makefile | 4 +- stdlib/tst-setcontext6.c | 77 +++++++++++++++++++++++++++++ stdlib/tst-setcontext7.c | 97 +++++++++++++++++++++++++++++++++++++ stdlib/tst-setcontext8.c | 82 +++++++++++++++++++++++++++++++ stdlib/tst-setcontext9.c | 101 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 369 insertions(+), 1 deletion(-) create mode 100644 stdlib/tst-setcontext6.c create mode 100644 stdlib/tst-setcontext7.c create mode 100644 stdlib/tst-setcontext8.c create mode 100644 stdlib/tst-setcontext9.c diff --git a/ChangeLog b/ChangeLog index 6935bc3b09..24396a0573 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-07-25 H.J. Lu <hongjiu.lu@intel.com> + + * stdlib/Makefile ((tests): Add tst-setcontext6, tst-setcontext7, + tst-setcontext8 and tst-setcontext9. + * stdlib/tst-setcontext6.c: New file. + * stdlib/tst-setcontext7.c: Likewise. + * stdlib/tst-setcontext8.c: Likewise. + * stdlib/tst-setcontext9.c: Likewise. + 2018-07-25 H.J. Lu <hongjiu.lu@intel.com> * stdlib/Makefile ((tests): Add tst-setcontext5. diff --git a/stdlib/Makefile b/stdlib/Makefile index 403ca22f49..01194bbf7c 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -85,7 +85,9 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ test-at_quick_exit-race test-cxa_atexit-race \ test-on_exit-race test-dlclose-exit-race \ tst-makecontext-align test-bz22786 tst-strtod-nan-sign \ - tst-swapcontext1 tst-setcontext4 tst-setcontext5 + tst-swapcontext1 tst-setcontext4 tst-setcontext5 \ + tst-setcontext6 tst-setcontext7 tst-setcontext8 \ + tst-setcontext9 tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ tst-tls-atexit tst-tls-atexit-nodelete diff --git a/stdlib/tst-setcontext6.c b/stdlib/tst-setcontext6.c new file mode 100644 index 0000000000..e530154554 --- /dev/null +++ b/stdlib/tst-setcontext6.c @@ -0,0 +1,77 @@ +/* Check getcontext and setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> +#include <stdatomic.h> + +static ucontext_t ctx[3]; +static atomic_int done; + +static void +f1 (void) +{ + printf ("start f1\n"); + if (!done) + { + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + exit (EXIT_SUCCESS); + } + done++; + if (setcontext (&ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + if (setcontext (&ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c> diff --git a/stdlib/tst-setcontext7.c b/stdlib/tst-setcontext7.c new file mode 100644 index 0000000000..053819f358 --- /dev/null +++ b/stdlib/tst-setcontext7.c @@ -0,0 +1,97 @@ +/* Check setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> +#include <stdatomic.h> + +static ucontext_t ctx[5]; +static atomic_int done; + +static void +f1 (void) +{ + puts ("start f1"); + if (!done) + { + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + { + puts ("set context in f1"); + if (setcontext (&ctx[3]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + } + } + done++; + puts ("swap contexts in f1"); + if (swapcontext (&ctx[4], &ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + puts ("end f1"); + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + puts ("swap contexts"); + if (swapcontext (&ctx[3], &ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done != 1) + exit (EXIT_FAILURE); + done++; + puts ("set context"); + if (setcontext (&ctx[4]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c> diff --git a/stdlib/tst-setcontext8.c b/stdlib/tst-setcontext8.c new file mode 100644 index 0000000000..53fb2bc1dd --- /dev/null +++ b/stdlib/tst-setcontext8.c @@ -0,0 +1,82 @@ +/* Check getcontext and setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> +#include <stdatomic.h> + +static ucontext_t ctx[3]; +static atomic_int done; + +static void +__attribute__((noinline, noclone)) +f2 (void) +{ + printf ("start f2\n"); + done++; + if (setcontext (&ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } +} + +static void +f1 (void) +{ + printf ("start f1\n"); + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + exit (EXIT_SUCCESS); + f2 (); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + if (setcontext (&ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c> diff --git a/stdlib/tst-setcontext9.c b/stdlib/tst-setcontext9.c new file mode 100644 index 0000000000..4636ce9030 --- /dev/null +++ b/stdlib/tst-setcontext9.c @@ -0,0 +1,101 @@ +/* Check setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> +#include <stdatomic.h> + +static ucontext_t ctx[5]; +static atomic_int done; + +static void +__attribute__((noinline, noclone)) +f2 (void) +{ + done++; + puts ("swap contexts in f2"); + if (swapcontext (&ctx[4], &ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + puts ("end f2"); + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +static void +f1 (void) +{ + puts ("start f1"); + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + { + puts ("set context in f1"); + if (setcontext (&ctx[3]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + } + f2 (); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + puts ("swap contexts"); + if (swapcontext (&ctx[3], &ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done != 1) + exit (EXIT_FAILURE); + done++; + puts ("set context"); + if (setcontext (&ctx[4]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c>
diff --git a/stdlib/Makefile b/stdlib/Makefile index 8db4f1d35a..638306bb5c 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -86,7 +86,8 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ test-on_exit-race test-dlclose-exit-race \ tst-makecontext-align test-bz22786 tst-strtod-nan-sign \ tst-swapcontext1 tst-swapcontext2 tst-setcontext4 \ - tst-setcontext5 + tst-setcontext5 tst-setcontext6 tst-setcontext7 \ + tst-setcontext8 tst-setcontext9 tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ tst-tls-atexit tst-tls-atexit-nodelete diff --git a/stdlib/tst-setcontext6.c b/stdlib/tst-setcontext6.c new file mode 100644 index 0000000000..c719e2d678 --- /dev/null +++ b/stdlib/tst-setcontext6.c @@ -0,0 +1,76 @@ +/* Check getcontext and setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> + +static ucontext_t ctx[3]; +static volatile int done; + +static void +f1 (void) +{ + printf ("start f1\n"); + if (!done) + { + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + exit (EXIT_SUCCESS); + } + done++; + if (setcontext (&ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + if (setcontext (&ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c> diff --git a/stdlib/tst-setcontext7.c b/stdlib/tst-setcontext7.c new file mode 100644 index 0000000000..e331e511ef --- /dev/null +++ b/stdlib/tst-setcontext7.c @@ -0,0 +1,96 @@ +/* Check setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> + +static ucontext_t ctx[5]; +static volatile int done; + +static void +f1 (void) +{ + puts ("start f1"); + if (!done) + { + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + { + puts ("set context in f1"); + if (setcontext (&ctx[3]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + } + } + done++; + puts ("swap contexts in f1"); + if (swapcontext (&ctx[4], &ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + puts ("end f1"); + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + puts ("swap contexts"); + if (swapcontext (&ctx[3], &ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done != 1) + exit (EXIT_FAILURE); + done++; + puts ("set context"); + if (setcontext (&ctx[4]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c> diff --git a/stdlib/tst-setcontext8.c b/stdlib/tst-setcontext8.c new file mode 100644 index 0000000000..a7febf6c67 --- /dev/null +++ b/stdlib/tst-setcontext8.c @@ -0,0 +1,81 @@ +/* Check getcontext and setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> + +static ucontext_t ctx[3]; +static volatile int done; + +static void +__attribute__((noinline, noclone)) +f2 (void) +{ + printf ("start f2\n"); + done++; + if (setcontext (&ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } +} + +static void +f1 (void) +{ + printf ("start f1\n"); + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + exit (EXIT_SUCCESS); + f2 (); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + if (setcontext (&ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c> diff --git a/stdlib/tst-setcontext9.c b/stdlib/tst-setcontext9.c new file mode 100644 index 0000000000..53609d4b10 --- /dev/null +++ b/stdlib/tst-setcontext9.c @@ -0,0 +1,100 @@ +/* Check setcontext on the context from makecontext. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <ucontext.h> +#include <unistd.h> + +static ucontext_t ctx[5]; +static volatile int done; + +static void +__attribute__((noinline, noclone)) +f2 (void) +{ + done++; + puts ("swap contexts in f2"); + if (swapcontext (&ctx[4], &ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + puts ("end f2"); + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +static void +f1 (void) +{ + puts ("start f1"); + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + { + puts ("set context in f1"); + if (setcontext (&ctx[3]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + } + f2 (); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + puts ("swap contexts"); + if (swapcontext (&ctx[3], &ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done != 1) + exit (EXIT_FAILURE); + done++; + puts ("set context"); + if (setcontext (&ctx[4]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include <support/test-driver.c>