[11/12] Add a test for multiple setcontext calls

Message ID 20180721142035.21059-12-hjl.tools@gmail.com
State New
Headers show
Series
  • x86/CET: The last 12 patches to enable Intel CET
Related show

Commit Message

H.J. Lu July 21, 2018, 2:20 p.m.
Check multiple setcontext calls.

	* stdlib/Makefile ((tests): Add tst-setcontext5.
	* stdlib/tst-setcontext5.c: New file.
---
 stdlib/Makefile          |  3 +-
 stdlib/tst-setcontext5.c | 88 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 stdlib/tst-setcontext5.c

-- 
2.17.1

Comments

Carlos O'Donell July 25, 2018, 3:38 a.m. | #1
On 07/21/2018 10:20 AM, H.J. Lu wrote:
> Check multiple setcontext calls.

> 

> 	* stdlib/Makefile ((tests): Add tst-setcontext5.

> 	* stdlib/tst-setcontext5.c: New file.


OK for 2.28.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>.



> ---

>  stdlib/Makefile          |  3 +-

>  stdlib/tst-setcontext5.c | 88 ++++++++++++++++++++++++++++++++++++++++

>  2 files changed, 90 insertions(+), 1 deletion(-)

>  create mode 100644 stdlib/tst-setcontext5.c

> 

> diff --git a/stdlib/Makefile b/stdlib/Makefile

> index 73d0e7c2a2..8db4f1d35a 100644

> --- a/stdlib/Makefile

> +++ b/stdlib/Makefile

> @@ -85,7 +85,8 @@ 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-swapcontext2 tst-setcontext4

> +		   tst-swapcontext1 tst-swapcontext2 tst-setcontext4 \

> +		   tst-setcontext5


OK.

>  

>  tests-internal	:= tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \

>  		   tst-tls-atexit tst-tls-atexit-nodelete

> diff --git a/stdlib/tst-setcontext5.c b/stdlib/tst-setcontext5.c

> new file mode 100644

> index 0000000000..7dcc15cb8e

> --- /dev/null

> +++ b/stdlib/tst-setcontext5.c

> @@ -0,0 +1,88 @@

> +/* Check multiple setcontext calls.


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[2];

> +static volatile int done;

> +

> +static void f2 (void);

> +

> +static void

> +__attribute__ ((noinline, noclone))

> +f1 (void)

> +{

> +  printf ("start f1\n");

> +  f2 ();

> +}


OK.

> +

> +static void

> +__attribute__ ((noinline, noclone))

> +f2 (void)

> +{

> +  printf ("start f2\n");

> +  if (setcontext (&ctx[1]) != 0)

> +    {

> +      printf ("%s: setcontext: %m\n", __FUNCTION__);

> +      exit (EXIT_FAILURE);

> +    }

> +}


OK.

> +

> +static void

> +f3 (void)

> +{

> +  printf ("start f3\n");

> +  if (done)

> +    exit (EXIT_SUCCESS);

> +  done = 1;

> +  if (setcontext (&ctx[0]) != 0)

> +    {

> +      printf ("%s: setcontext: %m\n", __FUNCTION__);

> +      exit (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)) f3, 0);

> +  f1 ();

> +  puts ("FAIL: returned from f1 ()");

> +  exit (EXIT_FAILURE);

> +}

> +

> +#include <support/test-driver.c>


OK.

>

Patch

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 73d0e7c2a2..8db4f1d35a 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -85,7 +85,8 @@  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-swapcontext2 tst-setcontext4
+		   tst-swapcontext1 tst-swapcontext2 tst-setcontext4 \
+		   tst-setcontext5
 
 tests-internal	:= tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \
 		   tst-tls-atexit tst-tls-atexit-nodelete
diff --git a/stdlib/tst-setcontext5.c b/stdlib/tst-setcontext5.c
new file mode 100644
index 0000000000..7dcc15cb8e
--- /dev/null
+++ b/stdlib/tst-setcontext5.c
@@ -0,0 +1,88 @@ 
+/* Check multiple setcontext calls.
+   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[2];
+static volatile int done;
+
+static void f2 (void);
+
+static void
+__attribute__ ((noinline, noclone))
+f1 (void)
+{
+  printf ("start f1\n");
+  f2 ();
+}
+
+static void
+__attribute__ ((noinline, noclone))
+f2 (void)
+{
+  printf ("start f2\n");
+  if (setcontext (&ctx[1]) != 0)
+    {
+      printf ("%s: setcontext: %m\n", __FUNCTION__);
+      exit (EXIT_FAILURE);
+    }
+}
+
+static void
+f3 (void)
+{
+  printf ("start f3\n");
+  if (done)
+    exit (EXIT_SUCCESS);
+  done = 1;
+  if (setcontext (&ctx[0]) != 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)) f3, 0);
+  f1 ();
+  puts ("FAIL: returned from f1 ()");
+  exit (EXIT_FAILURE);
+}
+
+#include <support/test-driver.c>