diff mbox series

linux: Add generic syscall implementation

Message ID 20211119183316.1060792-1-adhemerval.zanella@linaro.org
State Superseded
Headers show
Series linux: Add generic syscall implementation | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Adhemerval Zanella Nov. 19, 2021, 6:33 p.m. UTC
It allows also to remove hppa specific implementation.
---
 sysdeps/unix/sysdep.h                  | 20 ++++++++
 sysdeps/unix/sysv/linux/hppa/syscall.c | 65 --------------------------
 sysdeps/unix/sysv/linux/syscall.c      | 43 +++++++++++++++++
 3 files changed, 63 insertions(+), 65 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/hppa/syscall.c
 create mode 100644 sysdeps/unix/sysv/linux/syscall.c

Comments

Stafford Horne Nov. 20, 2021, 12:22 a.m. UTC | #1
On Fri, Nov 19, 2021 at 03:33:16PM -0300, Adhemerval Zanella wrote:
> It allows also to remove hppa specific implementation.
> ---
>  sysdeps/unix/sysdep.h                  | 20 ++++++++
>  sysdeps/unix/sysv/linux/hppa/syscall.c | 65 --------------------------
>  sysdeps/unix/sysv/linux/syscall.c      | 43 +++++++++++++++++
>  3 files changed, 63 insertions(+), 65 deletions(-)
>  delete mode 100644 sysdeps/unix/sysv/linux/hppa/syscall.c
>  create mode 100644 sysdeps/unix/sysv/linux/syscall.c
> 
> diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h
> index 664d093c05..0ecc653838 100644
> --- a/sysdeps/unix/sysdep.h
> +++ b/sysdeps/unix/sysdep.h
> @@ -57,6 +57,26 @@
>  #define INTERNAL_SYSCALL_CALL(...) \
>    __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL, __VA_ARGS__)
>  
> +#define __INTERNAL_SYSCALL_NCS0(name) \
> +  INTERNAL_SYSCALL_NCS (name, 0)
> +#define __INTERNAL_SYSCALL_NCS1(name, a1) \
> +  INTERNAL_SYSCALL_NCS (name, 1, a1)
> +#define __INTERNAL_SYSCALL_NCS2(name, a1, a2) \
> +  INTERNAL_SYSCALL_NCS (name, 2, a1, a2)
> +#define __INTERNAL_SYSCALL_NCS3(name, a1, a2, a3) \
> +  INTERNAL_SYSCALL_NCS (name, 3, a1, a2, a3)
> +#define __INTERNAL_SYSCALL_NCS4(name, a1, a2, a3, a4) \
> +  INTERNAL_SYSCALL_NCS (name, 4, a1, a2, a3, a4)
> +#define __INTERNAL_SYSCALL_NCS5(name, a1, a2, a3, a4, a5) \
> +  INTERNAL_SYSCALL_NCS (name, 5, a1, a2, a3, a4, a5)
> +#define __INTERNAL_SYSCALL_NCS6(name, a1, a2, a3, a4, a5, a6) \
> +  INTERNAL_SYSCALL_NCS (name, 6, a1, a2, a3, a4, a5, a6)
> +#define __INTERNAL_SYSCALL_NCS7(name, a1, a2, a3, a4, a5, a6, a7) \
> +  INTERNAL_SYSCALL_NCS (name, 7, a1, a2, a3, a4, a5, a6, a7)
> +
> +#define INTERNAL_SYSCALL_NCS_CALL(...) \
> +  __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL_NCS, __VA_ARGS__)
> +

We can use INTERNAL_SYSCALL_NCS_CALL in sysdeps/unix/sysv/linux/riscv/syscall.c
now too.  Not sure how many places you want to make the update though.

>  #define __INLINE_SYSCALL0(name) \
>    INLINE_SYSCALL (name, 0)
>  #define __INLINE_SYSCALL1(name, a1) \
> diff --git a/sysdeps/unix/sysv/linux/hppa/syscall.c b/sysdeps/unix/sysv/linux/hppa/syscall.c
> deleted file mode 100644
> index bce8c5fa1d..0000000000
> --- a/sysdeps/unix/sysv/linux/hppa/syscall.c
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -/* Copyright (C) 1997-2021 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 <stdarg.h>
> -#include <sysdep.h>
> -#include <errno.h>
> -
> -/* HPPA implements syscall() in 'C'; the assembler version would
> -   typically be in syscall.S. Also note that we have INLINE_SYSCALL,
> -   INTERNAL_SYSCALL, and all the generated pure assembly syscall wrappers.
> -   How often the function is used is unknown. */
> -
> -long int
> -syscall (long int __sysno, ...)
> -{
> -  /* FIXME: Keep this matching INLINE_SYSCALL for hppa */
> -  va_list args;
> -  long int arg0, arg1, arg2, arg3, arg4, arg5;
> -  long int __sys_res;
> -
> -  /* Load varargs */
> -  va_start (args, __sysno);
> -  arg0 = va_arg (args, long int);
> -  arg1 = va_arg (args, long int);
> -  arg2 = va_arg (args, long int);
> -  arg3 = va_arg (args, long int);
> -  arg4 = va_arg (args, long int);
> -  arg5 = va_arg (args, long int);
> -  va_end (args);
> -
> -  {
> -    LOAD_ARGS_6 (arg0, arg1, arg2, arg3, arg4, arg5)
> -    register unsigned long int __res asm("r28");
> -    PIC_REG_DEF
> -    LOAD_REGS_6
> -    asm volatile (SAVE_ASM_PIC
> -		  "	ble  0x100(%%sr2, %%r0)	\n"
> -		  "	copy %1, %%r20		\n"
> -		  LOAD_ASM_PIC
> -		  : "=r" (__res)
> -		  : "r" (__sysno) PIC_REG_USE ASM_ARGS_6
> -		  : "memory", CALL_CLOB_REGS CLOB_ARGS_6);
> -    __sys_res = __res;

Note, I confirm after we remove this the code in INTERNAL_SYSCALL_NCS
that replaces this is the same.

> -  }
> -  if ((unsigned long int) __sys_res >= (unsigned long int) -4095)
> -    {
> -      __set_errno (-__sys_res);
> -      __sys_res = -1;
> -    }
> -  return __sys_res;
> -}
> diff --git a/sysdeps/unix/sysv/linux/syscall.c b/sysdeps/unix/sysv/linux/syscall.c
> new file mode 100644
> index 0000000000..5d87428756
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/syscall.c
> @@ -0,0 +1,43 @@
> +/* Indirect system call.  Linux generic implementation.
> +   Copyright (C) 1997-2021 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 <stdarg.h>
> +#include <sysdep.h>
> +
> +long int
> +syscall (long int number, ...)
> +{
> +  va_list args;
> +
> +  va_start (args, number);
> +  long int a0 = va_arg (args, long int);
> +  long int a1 = va_arg (args, long int);
> +  long int a2 = va_arg (args, long int);
> +  long int a3 = va_arg (args, long int);
> +  long int a4 = va_arg (args, long int);
> +  long int a5 = va_arg (args, long int);
> +  va_end (args);
> +
> +  int r = INTERNAL_SYSCALL_NCS_CALL (number, a0, a1, a2, a3, a4, a5);
> +  if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (r)))
> +    {
> +      __set_errno (-r);
> +      return -1;
> +    }
> +  return r;
> +}

FWIW this looks good to me.

-Stafford
Adhemerval Zanella Nov. 22, 2021, 1 p.m. UTC | #2
On 19/11/2021 21:22, Stafford Horne wrote:
> On Fri, Nov 19, 2021 at 03:33:16PM -0300, Adhemerval Zanella wrote:
>> It allows also to remove hppa specific implementation.
>> ---
>>  sysdeps/unix/sysdep.h                  | 20 ++++++++
>>  sysdeps/unix/sysv/linux/hppa/syscall.c | 65 --------------------------
>>  sysdeps/unix/sysv/linux/syscall.c      | 43 +++++++++++++++++
>>  3 files changed, 63 insertions(+), 65 deletions(-)
>>  delete mode 100644 sysdeps/unix/sysv/linux/hppa/syscall.c
>>  create mode 100644 sysdeps/unix/sysv/linux/syscall.c
>>
>> diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h
>> index 664d093c05..0ecc653838 100644
>> --- a/sysdeps/unix/sysdep.h
>> +++ b/sysdeps/unix/sysdep.h
>> @@ -57,6 +57,26 @@
>>  #define INTERNAL_SYSCALL_CALL(...) \
>>    __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL, __VA_ARGS__)
>>  
>> +#define __INTERNAL_SYSCALL_NCS0(name) \
>> +  INTERNAL_SYSCALL_NCS (name, 0)
>> +#define __INTERNAL_SYSCALL_NCS1(name, a1) \
>> +  INTERNAL_SYSCALL_NCS (name, 1, a1)
>> +#define __INTERNAL_SYSCALL_NCS2(name, a1, a2) \
>> +  INTERNAL_SYSCALL_NCS (name, 2, a1, a2)
>> +#define __INTERNAL_SYSCALL_NCS3(name, a1, a2, a3) \
>> +  INTERNAL_SYSCALL_NCS (name, 3, a1, a2, a3)
>> +#define __INTERNAL_SYSCALL_NCS4(name, a1, a2, a3, a4) \
>> +  INTERNAL_SYSCALL_NCS (name, 4, a1, a2, a3, a4)
>> +#define __INTERNAL_SYSCALL_NCS5(name, a1, a2, a3, a4, a5) \
>> +  INTERNAL_SYSCALL_NCS (name, 5, a1, a2, a3, a4, a5)
>> +#define __INTERNAL_SYSCALL_NCS6(name, a1, a2, a3, a4, a5, a6) \
>> +  INTERNAL_SYSCALL_NCS (name, 6, a1, a2, a3, a4, a5, a6)
>> +#define __INTERNAL_SYSCALL_NCS7(name, a1, a2, a3, a4, a5, a6, a7) \
>> +  INTERNAL_SYSCALL_NCS (name, 7, a1, a2, a3, a4, a5, a6, a7)
>> +
>> +#define INTERNAL_SYSCALL_NCS_CALL(...) \
>> +  __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL_NCS, __VA_ARGS__)
>> +
> 
> We can use INTERNAL_SYSCALL_NCS_CALL in sysdeps/unix/sysv/linux/riscv/syscall.c
> now too.  Not sure how many places you want to make the update though.

Usually for the new Linux syscall macros we let the current INLINE_SYSCALL and
INTERNAL_SYSCALL as is and use the new macros only on patches that touch old
code or newer implementations.  I will update the riscv as well since it is
also refers to the same idea.
diff mbox series

Patch

diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h
index 664d093c05..0ecc653838 100644
--- a/sysdeps/unix/sysdep.h
+++ b/sysdeps/unix/sysdep.h
@@ -57,6 +57,26 @@ 
 #define INTERNAL_SYSCALL_CALL(...) \
   __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL, __VA_ARGS__)
 
+#define __INTERNAL_SYSCALL_NCS0(name) \
+  INTERNAL_SYSCALL_NCS (name, 0)
+#define __INTERNAL_SYSCALL_NCS1(name, a1) \
+  INTERNAL_SYSCALL_NCS (name, 1, a1)
+#define __INTERNAL_SYSCALL_NCS2(name, a1, a2) \
+  INTERNAL_SYSCALL_NCS (name, 2, a1, a2)
+#define __INTERNAL_SYSCALL_NCS3(name, a1, a2, a3) \
+  INTERNAL_SYSCALL_NCS (name, 3, a1, a2, a3)
+#define __INTERNAL_SYSCALL_NCS4(name, a1, a2, a3, a4) \
+  INTERNAL_SYSCALL_NCS (name, 4, a1, a2, a3, a4)
+#define __INTERNAL_SYSCALL_NCS5(name, a1, a2, a3, a4, a5) \
+  INTERNAL_SYSCALL_NCS (name, 5, a1, a2, a3, a4, a5)
+#define __INTERNAL_SYSCALL_NCS6(name, a1, a2, a3, a4, a5, a6) \
+  INTERNAL_SYSCALL_NCS (name, 6, a1, a2, a3, a4, a5, a6)
+#define __INTERNAL_SYSCALL_NCS7(name, a1, a2, a3, a4, a5, a6, a7) \
+  INTERNAL_SYSCALL_NCS (name, 7, a1, a2, a3, a4, a5, a6, a7)
+
+#define INTERNAL_SYSCALL_NCS_CALL(...) \
+  __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL_NCS, __VA_ARGS__)
+
 #define __INLINE_SYSCALL0(name) \
   INLINE_SYSCALL (name, 0)
 #define __INLINE_SYSCALL1(name, a1) \
diff --git a/sysdeps/unix/sysv/linux/hppa/syscall.c b/sysdeps/unix/sysv/linux/hppa/syscall.c
deleted file mode 100644
index bce8c5fa1d..0000000000
--- a/sysdeps/unix/sysv/linux/hppa/syscall.c
+++ /dev/null
@@ -1,65 +0,0 @@ 
-/* Copyright (C) 1997-2021 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 <stdarg.h>
-#include <sysdep.h>
-#include <errno.h>
-
-/* HPPA implements syscall() in 'C'; the assembler version would
-   typically be in syscall.S. Also note that we have INLINE_SYSCALL,
-   INTERNAL_SYSCALL, and all the generated pure assembly syscall wrappers.
-   How often the function is used is unknown. */
-
-long int
-syscall (long int __sysno, ...)
-{
-  /* FIXME: Keep this matching INLINE_SYSCALL for hppa */
-  va_list args;
-  long int arg0, arg1, arg2, arg3, arg4, arg5;
-  long int __sys_res;
-
-  /* Load varargs */
-  va_start (args, __sysno);
-  arg0 = va_arg (args, long int);
-  arg1 = va_arg (args, long int);
-  arg2 = va_arg (args, long int);
-  arg3 = va_arg (args, long int);
-  arg4 = va_arg (args, long int);
-  arg5 = va_arg (args, long int);
-  va_end (args);
-
-  {
-    LOAD_ARGS_6 (arg0, arg1, arg2, arg3, arg4, arg5)
-    register unsigned long int __res asm("r28");
-    PIC_REG_DEF
-    LOAD_REGS_6
-    asm volatile (SAVE_ASM_PIC
-		  "	ble  0x100(%%sr2, %%r0)	\n"
-		  "	copy %1, %%r20		\n"
-		  LOAD_ASM_PIC
-		  : "=r" (__res)
-		  : "r" (__sysno) PIC_REG_USE ASM_ARGS_6
-		  : "memory", CALL_CLOB_REGS CLOB_ARGS_6);
-    __sys_res = __res;
-  }
-  if ((unsigned long int) __sys_res >= (unsigned long int) -4095)
-    {
-      __set_errno (-__sys_res);
-      __sys_res = -1;
-    }
-  return __sys_res;
-}
diff --git a/sysdeps/unix/sysv/linux/syscall.c b/sysdeps/unix/sysv/linux/syscall.c
new file mode 100644
index 0000000000..5d87428756
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/syscall.c
@@ -0,0 +1,43 @@ 
+/* Indirect system call.  Linux generic implementation.
+   Copyright (C) 1997-2021 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 <stdarg.h>
+#include <sysdep.h>
+
+long int
+syscall (long int number, ...)
+{
+  va_list args;
+
+  va_start (args, number);
+  long int a0 = va_arg (args, long int);
+  long int a1 = va_arg (args, long int);
+  long int a2 = va_arg (args, long int);
+  long int a3 = va_arg (args, long int);
+  long int a4 = va_arg (args, long int);
+  long int a5 = va_arg (args, long int);
+  va_end (args);
+
+  int r = INTERNAL_SYSCALL_NCS_CALL (number, a0, a1, a2, a3, a4, a5);
+  if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (r)))
+    {
+      __set_errno (-r);
+      return -1;
+    }
+  return r;
+}