AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-28 07:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipc: Refactor sysvipc internal definitions

Browse Source 
This patch refactor the internal sysvipc in two main points:

  1. Add a new __ASSUME_SYSVIPC_DEFAULT_IPC_64 to infer the __IPC_64
     value to be used along either the multiplexed __NR_ipc or wired-up
     syscall.  The defaut value assumed for __IPC_64 is also changed
     from 0x100 to 0x0, aligning with Linux generic UAPI.  The idea
     is to simplify the Linux 5.1 wire-up for sysvipc syscalls for
     some 32-bit ABIs (which expectes __IPC_64 being 0x0) and simplify
     new ports (which will no longer need to add ipc_priv.h).

  2. It also removes some duplicated internal definition used on compat
     sysvipc symbols defined at ipc_priv.h (more specifically the
     __old_ipc_perm, SEMCTL_ARG_ADDRESS, MSGRCV_ARGS, and
     SEMTIMEDOP_IPC_ARGS).  The idea is also to make it simpler to enable
     the new wire-up sysvipc syscall provided by Linux v5.1.

There is no semantic change expected on any port.  Checked with a build
against all affected ABIs.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
Adhemerval Zanella 2019-05-15 15:20:58 -03:00
parent 7d3db434f9
commit 06436acf81
22 changed files with 56 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sysdeps/unix/sysv/linux/alpha/ipc_priv.h
View File

@ -16,17 +16,6 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x100
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned int uid; /* Owner's user ID. */
unsigned int gid; /* Owner's group ID. */
unsigned int cuid; /* Creator's user ID. */
unsigned int cgid; /* Creator's group ID. */
unsigned int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
#define __OLD_IPC_ID_TYPE unsigned int
#define __OLD_IPC_MODE_TYPE unsigned int
#include <sysdeps/unix/sysv/linux/ipc_priv.h>

3
sysdeps/unix/sysv/linux/alpha/kernel-features.h
View File

@ -52,4 +52,7 @@
# undef __ASSUME_STATX
#endif
/* Alpha requires old sysvipc even being a 64-bit architecture. */
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64
#endif /* _KERNEL_FEATURES_H */

2
sysdeps/unix/sysv/linux/arm/kernel-features.h
View File

@ -54,3 +54,5 @@
#if __BYTE_ORDER == __BIG_ENDIAN
# define __ASSUME_SYSVIPC_BROKEN_MODE_T
#endif
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64

21
sysdeps/unix/sysv/linux/hppa/ipc_priv.h
View File

@ -1,21 +0,0 @@
/* Old SysV permission definition for Linux. Hppa version.
Copyright (C) 2017-2019 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 <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x0

1
sysdeps/unix/sysv/linux/i386/kernel-features.h
View File

@ -45,6 +45,7 @@
/* i686 only supports ipc syscall. */
#undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64
#undef __ASSUME_CLONE_DEFAULT
#define __ASSUME_CLONE_BACKWARDS 1

21
sysdeps/unix/sysv/linux/ia64/ipc_priv.h
View File

@ -1,21 +0,0 @@
/* Old SysV permission definition for Linux. IA64 version.
Copyright (C) 2017-2019 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 <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x0

24
sysdeps/unix/sysv/linux/ipc_priv.h
View File

@ -17,17 +17,29 @@
<https://www.gnu.org/licenses/>. */
#include <sys/ipc.h> /* For __key_t */
#include <kernel-features.h>
#define __IPC_64 0x100
#ifdef __ASSUME_SYSVIPC_DEFAULT_IPC_64
# define __IPC_64 0x0
#else
# define __IPC_64 0x100
#endif
#ifndef __OLD_IPC_ID_TYPE
# define __OLD_IPC_ID_TYPE unsigned short int
#endif
#ifndef __OLD_IPC_MODE_TYPE
# define __OLD_IPC_MODE_TYPE unsigned short int
#endif
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned short int uid; /* Owner's user ID. */
unsigned short int gid; /* Owner's group ID. */
unsigned short int cuid; /* Creator's user ID. */
unsigned short int cgid; /* Creator's group ID. */
unsigned short int mode; /* Read/write permission. */
__OLD_IPC_ID_TYPE uid; /* Owner's user ID. */
__OLD_IPC_ID_TYPE gid; /* Owner's group ID. */
__OLD_IPC_ID_TYPE cuid; /* Creator's user ID. */
__OLD_IPC_ID_TYPE cgid; /* Creator's group ID. */
__OLD_IPC_MODE_TYPE mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};

3
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -85,6 +85,9 @@
/* Support for SysV IPC through wired syscalls. All supported architectures
either support ipc syscall and/or all the ipc correspondent syscalls. */
#define __ASSUME_DIRECT_SYSVIPC_SYSCALLS 1
/* The generic default __IPC_64 value is 0x0, however some architectures
require a different value of 0x100. */
#define __ASSUME_SYSVIPC_DEFAULT_IPC_64 1
/* All supported architectures reserve a 32-bit for MODE field in sysvipc
ipc_perm. However, some kernel ABI interfaces still expect a 16-bit

1
sysdeps/unix/sysv/linux/m68k/kernel-features.h
View File

@ -53,3 +53,4 @@
/* m68k only supports ipc syscall. */
#undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
#define __ASSUME_SYSVIPC_BROKEN_MODE_T
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64

1
sysdeps/unix/sysv/linux/microblaze/kernel-features.h
View File

@ -72,3 +72,4 @@
#if __BYTE_ORDER == __BIG_ENDIAN
# define __ASSUME_SYSVIPC_BROKEN_MODE_T
#endif
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64

2
sysdeps/unix/sysv/linux/mips/kernel-features.h
View File

@ -50,3 +50,5 @@
#undef __ASSUME_CLONE_DEFAULT
#define __ASSUME_CLONE_BACKWARDS 1
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64

17
sysdeps/unix/sysv/linux/mips/mips64/ipc_priv.h
View File

@ -16,17 +16,6 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/ipc.h>
#define __IPC_64 0x100
struct __old_ipc_perm
{
__key_t __key; /* Key. */
int uid; /* Owner's user ID. */
int gid; /* Owner's group ID. */
int cuid; /* Creator's user ID. */
int cgid; /* Creator's group ID. */
int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
#define __OLD_IPC_ID_TYPE int
#define __OLD_IPC_MODE_TYPE int
#include <sysdeps/unix/sysv/linux/ipc_priv.h>

21
sysdeps/unix/sysv/linux/nios2/ipc_priv.h
View File

@ -1,21 +0,0 @@
/* Old SysV permission definition for Linux. Nios II version.
Copyright (C) 2017-2019 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 <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x0

9
sysdeps/unix/sysv/linux/csky/ipc_priv.h → sysdeps/unix/sysv/linux/nios2/kernel-features.h
View File

@ -1,5 +1,6 @@
/* Old SysV permission definition for Linux. C-SKY version.
Copyright (C) 2017-2019 Free Software Foundation, Inc.
/* Set flags signalling availability of kernel features based on given
kernel version number. NIOS2 version.
Copyright (C) 2019 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
@ -16,6 +17,6 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/ipc.h> /* For __key_t */
#include_next <kernel-features.h>
#define __IPC_64 0x0
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64

27
sysdeps/unix/sysv/linux/powerpc/ipc_priv.h
View File

@ -16,27 +16,6 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x100
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned int uid; /* Owner's user ID. */
unsigned int gid; /* Owner's group ID. */
unsigned int cuid; /* Creator's user ID. */
unsigned int cgid; /* Creator's group ID. */
unsigned int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
#define SEMCTL_ARG_ADDRESS(__arg) &__arg.array
#define MSGRCV_ARGS(__msgp, __msgtyp) \
((long int []){ (long int) __msgp, __msgtyp })
#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \
(__nsops), 0, (__sops), (__timeout)
#include <ipc_ops.h>
#define __OLD_IPC_ID_TYPE unsigned int
#define __OLD_IPC_MODE_TYPE unsigned int
#include <sysdeps/unix/sysv/linux/ipc_priv.h>

1
sysdeps/unix/sysv/linux/powerpc/kernel-features.h
View File

@ -46,6 +46,7 @@
/* powerpc only supports ipc syscall. */
#undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64
#undef __ASSUME_CLONE_DEFAULT
#define __ASSUME_CLONE_BACKWARDS 1

21
sysdeps/unix/sysv/linux/riscv/ipc_priv.h
View File

@ -1,21 +0,0 @@
/* Old SysV permission definition for Linux. RISC-V version.
Copyright (C) 2018-2019 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 <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x0

1
sysdeps/unix/sysv/linux/s390/kernel-features.h
View File

@ -50,6 +50,7 @@
#ifndef __s390x__
# define __ASSUME_SYSVIPC_BROKEN_MODE_T
#endif
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64
#undef __ASSUME_CLONE_DEFAULT
#define __ASSUME_CLONE_BACKWARDS2

1
sysdeps/unix/sysv/linux/sh/kernel-features.h
View File

@ -48,6 +48,7 @@
#if __BYTE_ORDER == __BIG_ENDIAN
# define __ASSUME_SYSVIPC_BROKEN_MODE_T
#endif
#undef __ASSUME_SYSVIPC_DEFAULT_IPC_64
/* Support for several syscalls was added in 4.8. */
#if __LINUX_KERNEL_VERSION < 0x040800

3
sysdeps/unix/sysv/linux/sparc/kernel-features.h
View File

@ -60,6 +60,9 @@
/* sparc only supports ipc syscall. */
#undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
#ifndef __arch64__
# undef __ASSUME_SYSVIPC_DEFAULT_IPC_64
#endif
/* Support for the renameat2 syscall was added in 3.16. */
#if __LINUX_KERNEL_VERSION < 0x031000

19
sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h
View File

@ -16,26 +16,17 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x0
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned int uid; /* Owner's user ID. */
unsigned int gid; /* Owner's group ID. */
unsigned int cuid; /* Creator's user ID. */
unsigned int cgid; /* Creator's group ID. */
unsigned int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
#define __OLD_IPC_ID_TYPE unsigned int
#define __OLD_IPC_MODE_TYPE unsigned int
#include <sysdeps/unix/sysv/linux/ipc_priv.h>
/* SPARC semctl multiplex syscall expects the union pointed address, not
the union address itself. */
#undef SEMCTL_ARG_ADDRESS
#define SEMCTL_ARG_ADDRESS(__arg) __arg.array
/* Also for msgrcv it does not use the kludge on final 2 arguments. */
#undef MSGRCV_ARGS
#define MSGRCV_ARGS(__msgp, __msgtyp) __msgp, __msgtyp
#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \

32
sysdeps/unix/sysv/linux/x86_64/ipc_priv.h
View File

@ -1,32 +0,0 @@
/* Old SysV permission definition for Linux. x86_64 version.
Copyright (C) 2016-2019 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 <sys/ipc.h> /* For __key_t */
#define __IPC_64 0x0
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned short uid; /* Owner's user ID. */
unsigned short gid; /* Owner's group ID. */
unsigned short cuid; /* Creator's user ID. */
unsigned short cgid; /* Creator's group ID. */
unsigned short mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};