Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1292893 > unrolled thread
| Started by | Michael Ellerman <mpe@ellerman.id.au> |
|---|---|
| First post | 2015-12-16 12:00 +0100 |
| Last post | 2015-12-17 11:20 +0100 |
| Articles | 2 — 1 participant |
Back to article view | Back to linux.kernel
[PATCH] Partial revert of "powerpc: Individual System V IPC system calls" Michael Ellerman <mpe@ellerman.id.au> - 2015-12-16 12:00 +0100
Re: Partial revert of "powerpc: Individual System V IPC system calls" Michael Ellerman <mpe@ellerman.id.au> - 2015-12-17 11:20 +0100
| From | Michael Ellerman <mpe@ellerman.id.au> |
|---|---|
| Date | 2015-12-16 12:00 +0100 |
| Subject | [PATCH] Partial revert of "powerpc: Individual System V IPC system calls" |
| Message-ID | <qGhYl-Gy-3@gated-at.bofh.it> |
This partially reverts commit a34236155afb1cc41945e58388ac988431bcb0b8. While reviewing the glibc patch to exploit the individual IPC calls, Arnd & Andreas noticed that we were still requiring userspace to pass IPC_64 in order to get the new style IPC API. With a bit of cleanup in the kernel we can drop that requirement, and instead only provide the new style API, which will simplify things for userspace. Rather than try and sneak that patch into 4.4, instead we will drop the individual IPC calls for powerpc, and merge them again in 4.5 once the cleanup patch has gone in. Because we've already added sys_mlock2() as syscall #378, we don't do a full revert of the IPC calls. Instead we drop the __NR #defines, and send those now undefined syscall numbers to sys_ni_syscall(). This leaves a gap in the syscall numbers, but we'll reuse them when we merge the individual IPC calls. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Arnd Bergmann <arnd@arndb.de> --- arch/powerpc/include/asm/systbl.h | 24 ++++++++++++------------ arch/powerpc/include/uapi/asm/unistd.h | 12 ------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index f2b0b1b0c72a..5654ece02c0d 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h @@ -370,16 +370,16 @@ COMPAT_SYS(execveat) PPC64ONLY(switch_endian) SYSCALL_SPU(userfaultfd) SYSCALL_SPU(membarrier) -SYSCALL(semop) -SYSCALL(semget) -COMPAT_SYS(semctl) -COMPAT_SYS(semtimedop) -COMPAT_SYS(msgsnd) -COMPAT_SYS(msgrcv) -SYSCALL(msgget) -COMPAT_SYS(msgctl) -COMPAT_SYS(shmat) -SYSCALL(shmdt) -SYSCALL(shmget) -COMPAT_SYS(shmctl) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) SYSCALL(mlock2) diff --git a/arch/powerpc/include/uapi/asm/unistd.h b/arch/powerpc/include/uapi/asm/unistd.h index 1effea5193d6..12a05652377a 100644 --- a/arch/powerpc/include/uapi/asm/unistd.h +++ b/arch/powerpc/include/uapi/asm/unistd.h @@ -388,18 +388,6 @@ #define __NR_switch_endian 363 #define __NR_userfaultfd 364 #define __NR_membarrier 365 -#define __NR_semop 366 -#define __NR_semget 367 -#define __NR_semctl 368 -#define __NR_semtimedop 369 -#define __NR_msgsnd 370 -#define __NR_msgrcv 371 -#define __NR_msgget 372 -#define __NR_msgctl 373 -#define __NR_shmat 374 -#define __NR_shmdt 375 -#define __NR_shmget 376 -#define __NR_shmctl 377 #define __NR_mlock2 378 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */ -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Michael Ellerman <mpe@ellerman.id.au> |
|---|---|
| Date | 2015-12-17 11:20 +0100 |
| Subject | Re: Partial revert of "powerpc: Individual System V IPC system calls" |
| Message-ID | <qGDPc-6oE-29@gated-at.bofh.it> |
| In reply to | #1292893 |
On Wed, 2015-16-12 at 10:53:29 UTC, Michael Ellerman wrote: > This partially reverts commit a34236155afb1cc41945e58388ac988431bcb0b8. > > While reviewing the glibc patch to exploit the individual IPC calls, > Arnd & Andreas noticed that we were still requiring userspace to pass > IPC_64 in order to get the new style IPC API. > > With a bit of cleanup in the kernel we can drop that requirement, and > instead only provide the new style API, which will simplify things for > userspace. > > Rather than try and sneak that patch into 4.4, instead we will drop the > individual IPC calls for powerpc, and merge them again in 4.5 once the > cleanup patch has gone in. > > Because we've already added sys_mlock2() as syscall #378, we don't do a > full revert of the IPC calls. Instead we drop the __NR #defines, and > send those now undefined syscall numbers to sys_ni_syscall(). This > leaves a gap in the syscall numbers, but we'll reuse them when we merge > the individual IPC calls. > > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > Acked-by: Arnd Bergmann <arnd@arndb.de> Applied to powerpc fixes. https://git.kernel.org/powerpc/c/2475c362134a0fa5309c7b0f cheers -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web