| Message ID | 20230203171237.1220878-3-adhemerval.zanella@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add clone3 support for multiple architectures | expand |
Ping. On 03/02/23 14:12, Adhemerval Zanella wrote: > It follows the internal signature: > > extern int clone3 (struct clone_args *__cl_args, size_t __size, > int (*__func) (void *__arg), void *__arg); > > Checked on s390x-linux-gnu. > --- > sysdeps/unix/sysv/linux/s390/s390-64/clone3.S | 81 +++++++++++++++++++ > sysdeps/unix/sysv/linux/s390/sysdep.h | 1 + > 2 files changed, 82 insertions(+) > create mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/clone3.S > > diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone3.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone3.S > new file mode 100644 > index 0000000000..417fdcb785 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone3.S > @@ -0,0 +1,81 @@ > +/* The clone3 syscall wrapper. Linux/s390x version. > + Copyright (C) 2023 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 > + <https://www.gnu.org/licenses/>. */ > + > +#include <sysdep.h> > +#define _ERRNO_H 1 > +#include <bits/errno.h> > + > +/* The userland implementation is: > + int clone3 (struct clone_args *cl_args, size_t size, > + int (*func)(void *arg), void *arg); > + > + the kernel entry is: > + int clone3 (struct clone_args *cl_args, size_t size); > + > + The parameters are passed in registers from userland: > + r2: cl_args > + r3: size > + r4: func > + r5: arg */ > + > + .text > +ENTRY(__clone3) > + stg %r6, 48(%r15) > + > + /* Sanity check args. */ > + ltgr %r2, %r2 > + je error > + ltgr %r6, %r4 > + je error > + > + /* Do the system call, the kernel expects: > + r1: system call number > + r2: cl_args > + r3: size */ > + lghi %r1, SYS_ify(clone3) > + svc 0 > + ltgr %r2,%r2 /* check return code */ > + jz thread_start > + lg %r6, 48(%r15) > + jgm SYSCALL_ERROR_LABEL > + br %r14 > +error: > + lghi %r2,-EINVAL > + jg SYSCALL_ERROR_LABEL > +PSEUDO_END (__clone3) > + > + .align 4 > + .type thread_start, %function > +thread_start: > + cfi_startproc > + /* Mark r14 as undefined in order to stop unwinding here. */ > + cfi_undefined (r14) > + > + /* func is in gpr 6, arg in gpr 5. */ > + lgr %r2, %r5 > + aghi %r15, -160 > + xc 0(8,%r15),0(%r15) > + basr %r14, %r6 > + > + DO_CALL (exit, 1) > + cfi_endproc > + .size thread_start, .-thread_start > + > +libc_hidden_def (__clone3) > +weak_alias (__clone3, clone3) > diff --git a/sysdeps/unix/sysv/linux/s390/sysdep.h b/sysdeps/unix/sysv/linux/s390/sysdep.h > index 3bde8ba19c..b099fea9c6 100644 > --- a/sysdeps/unix/sysv/linux/s390/sysdep.h > +++ b/sysdeps/unix/sysv/linux/s390/sysdep.h > @@ -72,6 +72,7 @@ > #ifdef __s390x__ > #define HAVE_CLOCK_GETRES64_VSYSCALL "__kernel_clock_getres" > #define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime" > +#define HAVE_CLONE3_WRAPPER 1 > #else > #define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" > #define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime"
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone3.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone3.S new file mode 100644 index 0000000000..417fdcb785 --- /dev/null +++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone3.S @@ -0,0 +1,81 @@ +/* The clone3 syscall wrapper. Linux/s390x version. + Copyright (C) 2023 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 + <https://www.gnu.org/licenses/>. */ + +#include <sysdep.h> +#define _ERRNO_H 1 +#include <bits/errno.h> + +/* The userland implementation is: + int clone3 (struct clone_args *cl_args, size_t size, + int (*func)(void *arg), void *arg); + + the kernel entry is: + int clone3 (struct clone_args *cl_args, size_t size); + + The parameters are passed in registers from userland: + r2: cl_args + r3: size + r4: func + r5: arg */ + + .text +ENTRY(__clone3) + stg %r6, 48(%r15) + + /* Sanity check args. */ + ltgr %r2, %r2 + je error + ltgr %r6, %r4 + je error + + /* Do the system call, the kernel expects: + r1: system call number + r2: cl_args + r3: size */ + lghi %r1, SYS_ify(clone3) + svc 0 + ltgr %r2,%r2 /* check return code */ + jz thread_start + lg %r6, 48(%r15) + jgm SYSCALL_ERROR_LABEL + br %r14 +error: + lghi %r2,-EINVAL + jg SYSCALL_ERROR_LABEL +PSEUDO_END (__clone3) + + .align 4 + .type thread_start, %function +thread_start: + cfi_startproc + /* Mark r14 as undefined in order to stop unwinding here. */ + cfi_undefined (r14) + + /* func is in gpr 6, arg in gpr 5. */ + lgr %r2, %r5 + aghi %r15, -160 + xc 0(8,%r15),0(%r15) + basr %r14, %r6 + + DO_CALL (exit, 1) + cfi_endproc + .size thread_start, .-thread_start + +libc_hidden_def (__clone3) +weak_alias (__clone3, clone3) diff --git a/sysdeps/unix/sysv/linux/s390/sysdep.h b/sysdeps/unix/sysv/linux/s390/sysdep.h index 3bde8ba19c..b099fea9c6 100644 --- a/sysdeps/unix/sysv/linux/s390/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/sysdep.h @@ -72,6 +72,7 @@ #ifdef __s390x__ #define HAVE_CLOCK_GETRES64_VSYSCALL "__kernel_clock_getres" #define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime" +#define HAVE_CLONE3_WRAPPER 1 #else #define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" #define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime"