ARM: 9108/1: oabi-compat: rework epoll_wait/epoll_pwait emulation
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Aug 2021 07:30:22 +0000 (08:30 +0100)
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Fri, 20 Aug 2021 10:39:26 +0000 (11:39 +0100)
commit249dbe74d3c4b568a623fb55c56cddf19fdf0b89
treefd5589c73ebae8ca985846b0cf07508d5a82ca9a
parent4e57a4ddf6b0d9cce1cf2ffd153df1ad3c2c9cc2
ARM: 9108/1: oabi-compat: rework epoll_wait/epoll_pwait emulation

The epoll_wait() system call wrapper is one of the remaining users of
the set_fs() infrasturcture for Arm. Changing it to not require set_fs()
is rather complex unfortunately.

The approach I'm taking here is to allow architectures to override
the code that copies the output to user space, and let the oabi-compat
implementation check whether it is getting called from an EABI or OABI
system call based on the thread_info->syscall value.

The in_oabi_syscall() check here mirrors the in_compat_syscall() and
in_x32_syscall() helpers for 32-bit compat implementations on other
architectures.

Overall, the amount of code goes down, at least with the newly added
sys_oabi_epoll_pwait() helper getting removed again. The downside
is added complexity in the source code for the native implementation.
There should be no difference in runtime performance except for Arm
kernels with CONFIG_OABI_COMPAT enabled that now have to go through
an external function call to check which of the two variants to use.

Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
arch/arm/include/asm/syscall.h
arch/arm/kernel/sys_oabi-compat.c
arch/arm/tools/syscall.tbl
fs/eventpoll.c
include/linux/eventpoll.h